Py3 fix for v1 client: Use BytesIO instead of StringIO.

Author: braincore

docs/conf.py

@@ -59,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.39'
+version = '3.40'
 # The full version, including alpha/beta/rc tags.
-release = '3.39'
+release = '3.40'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

dropbox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: dropbox
-Version: 3.29
+Version: 3.40
 Summary: Official Dropbox API Client
 Home-page: http://www.dropbox.com/developers
 Author: Dropbox

dropbox.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ README.rst
 ez_setup.py
 setup.py
 dropbox/__init__.py
+dropbox/async.py
 dropbox/babel_serializers.py
 dropbox/babel_validators.py
 dropbox/base.py
@@ -15,6 +16,7 @@ dropbox/oauth.py
 dropbox/rest.py
 dropbox/session.py
 dropbox/sharing.py
+dropbox/team.py
 dropbox/trusted-certs.crt
 dropbox/users.py
 dropbox.egg-info/PKG-INFO

dropbox.egg-info/requires.txt

@@ -1,3 +1,3 @@
 urllib3
 requests>=2.5.1
-six>=1.3.0
+six>=1.3.0

dropbox/client.py

@@ -5,19 +5,17 @@
 from __future__ import absolute_import
 
 import base64
-import re
+from io import BytesIO
 import os
+import re
 import six
-import sys
 import urllib
 import warnings
 
 if six.PY3:
-    from io import StringIO
     basestring = str
     url_path_quote = urllib.parse.quote
 else:
-    from StringIO import StringIO
     url_path_quote = urllib.quote
 
 try:
@@ -1181,7 +1179,7 @@ def upload_chunked(self, chunk_size = 4 * 1024 * 1024):
 
             try:
                 (self.offset, self.upload_id) = self.client.upload_chunk(
-                    StringIO(self.last_block), next_chunk_size, self.offset, self.upload_id)
+                    BytesIO(self.last_block), next_chunk_size, self.offset, self.upload_id)
                 self.last_block = None
             except ErrorResponse as e:
                 # Handle the case where the server tells us our offset is wrong.

dropbox/dropbox.py

@@ -3,7 +3,7 @@
 ]
 
 # TODO(kelkabany): We need to auto populate this as done in the v1 SDK.
-__version__ = '3.39'
+__version__ = '3.40'
 
 import contextlib
 import json

dropbox/rest.py

@@ -31,7 +31,7 @@
 else:
     url_encode = urllib.urlencode
 
-SDK_VERSION = "3.39"
+SDK_VERSION = "3.40"
 
 TRUSTED_CERT_FILE = pkg_resources.resource_filename(__name__, 'trusted-certs.crt')
 
@@ -204,9 +204,9 @@ def request(self, method, url, post_params=None, body=None, headers=None, raw_re
                 body = params_to_urlencoded(post_params)
                 headers["Content-type"] = "application/x-www-form-urlencoded"
 
-        # Handle StringIO instances, because urllib3 doesn't.
+        # Handle StringIO/BytesIO instances, because urllib3 doesn't.
         if hasattr(body, 'getvalue'):
-            body = str(body.getvalue())
+            body = body.getvalue()
 
         # Reject any headers containing newlines; the error from the server isn't pretty.
         for key, value in headers.items():

setup.py

@@ -25,7 +25,7 @@
 
 dist = setup(
     name='dropbox',
-    version='3.39',
+    version='3.40',
     description='Official Dropbox API Client',
     author='Dropbox',
     author_email='dev-platform@dropbox.com',

test/test_dropbox.py

@@ -73,33 +73,15 @@ def test_upload_download(self):
         self.dbx.files_delete('/Test/%s' % timestamp)
 
 
-from dropbox import client
-
-class TestV1DropboxClient(unittest.TestCase):
-
-    def setUp(self):
-        pass
-
-    def test_upload(self):
-        print("Hello!")
-
-
-import json
+from io import BytesIO
 import os
 import posixpath
-import six
 import sys
 import threading
-from uuid import UUID
 
-from dropbox import session, client
+from dropbox import client
 from dropbox.rest import ErrorResponse
 
-if six.PY3:
-    from io import StringIO
-else:
-    from StringIO import StringIO
-
 try:
     import json
 except ImportError:
@@ -174,7 +156,7 @@ def test_put_file_overwrite(self):
         """Tests if put_file with overwrite=true returns the expected metadata"""
         path = posixpath.join(self.test_dir, "foo_overwrite.txt")
         self.upload_file(self.foo, path)
-        f = StringIO("This Overwrites")
+        f = BytesIO(b"This Overwrites")
         metadata = self.client.put_file(path, f, overwrite=True)
         self.dict_has(metadata,
             size = "15 bytes",
@@ -427,17 +409,17 @@ def test_copy_ref(self):
         self.assertEqual(copied_foo, local_foo)
 
 
-    def test_chunked_upload(self):
+    def test_chunked_upload2(self):
         target_path = posixpath.join(self.test_dir, 'chunked_upload_file.txt')
         chunk_size = 4 * 1024
         random_string1, random_data1 = make_random_data(chunk_size)
         random_string2, random_data2 = make_random_data(chunk_size)
 
-        new_offset, upload_id = self.client.upload_chunk(StringIO(random_string1), 0)
+        new_offset, upload_id = self.client.upload_chunk(BytesIO(random_data1), 0)
         self.assertEquals(new_offset, chunk_size)
         self.assertIsNotNone(upload_id)
 
-        new_offset, upload_id2 = self.client.upload_chunk(StringIO(random_string2), 0,
+        new_offset, upload_id2 = self.client.upload_chunk(BytesIO(random_data2), 0,
                                                           new_offset, upload_id)
         self.assertEquals(new_offset, chunk_size * 2)
         self.assertEquals(upload_id2, upload_id)
@@ -456,7 +438,7 @@ def test_chunked_uploader(self):
         size = 10 * 1024 * 1024
         chunk_size = 4 * 1024 * 1102
         random_string, random_data = make_random_data(size)
-        uploader = self.client.get_chunked_uploader(StringIO(random_string), len(random_string))
+        uploader = self.client.get_chunked_uploader(BytesIO(random_data), len(random_data))
         error_count = 0
         while uploader.offset < size and error_count < 5:
             try:

tox.ini

@@ -3,4 +3,4 @@ envlist = py27,py34
 [testenv]
 passenv = DROPBOX_TOKEN 
 deps = pytest
-commands = py.test
+commands = py.test {posargs}