Bumped to 3.22.

braincore · braincore · commit 018ee87021e0 · 2015-08-27T17:44:03.000-07:00
- Added tests
- Fixed PY3
- Expanded API error status codes to 403, 404, and 409.
diff --git a/docs/conf.py b/docs/conf.py
@@ -59,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.21'
+version = '3.22'
 # The full version, including alpha/beta/rc tags.
-release = '3.21'
+release = '3.22'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/dropbox/client.py b/dropbox/client.py
@@ -42,7 +42,7 @@ def format_path(path):
     path = re.sub(r'/+', '/', path)
 
     if path == '/':
-        return (u"" if isinstance(path, unicode) else "")
+        return ''
     else:
         return '/' + path.strip('/')
 
@@ -481,7 +481,7 @@ def __parse_metadata_as_dict(dropbox_raw_response):
         # Parses file metadata from a raw dropbox HTTP response, raising a
         # dropbox.rest.ErrorResponse if parsing fails.
         metadata = None
-        for header, header_val in dropbox_raw_response.getheaders().iteritems():
+        for header, header_val in dropbox_raw_response.getheaders().items():
             if header.lower() == 'x-dropbox-metadata':
                 try:
                     metadata = json.loads(header_val)
@@ -1291,7 +1291,7 @@ def build_path(self, target, params=None):
         Returns
             The path and parameters components of an API URL.
         """
-        if sys.version_info < (3,) and type(target) == unicode:
+        if six.PY2 and isinstance(target, six.text_type):
             target = target.encode("utf8")
 
         target_path = url_path_quote(target)
diff --git a/dropbox/dropbox.py b/dropbox/dropbox.py
@@ -3,7 +3,7 @@
 ]
 
 # TODO(kelkabany): We need to auto populate this as done in the v1 SDK.
-__version__ = '3.21'
+__version__ = '3.22'
 
 import json
 import logging
@@ -320,7 +320,7 @@ def request_json_string(self,
                 return RouteResult(raw_resp, r)
             else:
                 return RouteResult(raw_resp)
-        elif r.status_code == 409:
+        elif r.status_code in (403, 404, 409):
             raw_resp = r.content.decode('utf-8')
             return RouteErrorResult(raw_resp)
         else:
diff --git a/dropbox/rest.py b/dropbox/rest.py
@@ -31,7 +31,7 @@
 else:
     url_encode = urllib.urlencode
 
-SDK_VERSION = "3.21"
+SDK_VERSION = "3.22"
 
 TRUSTED_CERT_FILE = pkg_resources.resource_filename(__name__, 'trusted-certs.crt')
 
diff --git a/dropbox/session.py b/dropbox/session.py
@@ -124,7 +124,7 @@ def build_path(self, target, params=None):
         Returns:
             - The path and parameters components of an API URL.
         """
-        if sys.version_info < (3,) and type(target) == unicode:
+        if six.PY2 and isinstance(target, six.text_type):
             target = target.encode("utf8")
 
         target_path = url_path_quote(target)
diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@
 
 dist = setup(
     name='dropbox',
-    version='3.21',
+    version='3.22',
     description='Official Dropbox API Client',
     author='Dropbox',
     author_email='dev-platform@dropbox.com',
diff --git a/test/Costa Rican Frog.jpg b/test/Costa Rican Frog.jpg
diff --git a/test/dropbox_song.mp3 b/test/dropbox_song.mp3
diff --git a/test/foo.txt b/test/foo.txt
@@ -0,0 +1 @@
+abcdefghijklmnopqrstuvwxyz
diff --git a/test/run_tests.sh b/test/run_tests.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# If a test suite returns an error, do not continue to the next one.
+set -e
+
+echo "Running tests for dropbox package"
+PYTHONPATH=.. python2.7 -m pytest
+
+echo
+echo "Running tests for dropbox package using Python 3"
+PYTHONPATH=.. python3 -m pytest
+
diff --git a/test/test_dropbox.py b/test/test_dropbox.py
