Pull request dropbox#19.

ewjoachim · braincore · commit 37c85e4ba3a7 · 2015-09-25T17:54:33.000-07:00
- Remove forgotten debug print statement.
- Make tests launchable from anywhere.
- Fix tests after "reason"/"error" refactoring.
diff --git a/docs/conf.py b/docs/conf.py
@@ -59,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.33'
+version = '3.34'
 # The full version, including alpha/beta/rc tags.
-release = '3.33'
+release = '3.34'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
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.33'
+__version__ = '3.34'
 
 import contextlib
 import json
@@ -193,7 +193,6 @@ def request(self,
 
         deserialized_result = babel_serializers.json_compat_obj_decode(
             returned_data_type, obj, strict=False)
-        print(deserialized_result)
 
         if isinstance(res, RouteErrorResult):
             raise ApiError(deserialized_result,
diff --git a/dropbox/rest.py b/dropbox/rest.py
@@ -31,7 +31,7 @@
 else:
     url_encode = urllib.urlencode
 
-SDK_VERSION = "3.33"
+SDK_VERSION = "3.34"
 
 TRUSTED_CERT_FILE = pkg_resources.resource_filename(__name__, 'trusted-certs.crt')
 
diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@
 
 dist = setup(
     name='dropbox',
-    version='3.33',
+    version='3.34',
     description='Official Dropbox API Client',
     author='Dropbox',
     author_email='dev-platform@dropbox.com',
diff --git a/test/test_dropbox.py b/test/test_dropbox.py
@@ -44,7 +44,7 @@ def test_bad_auth(self):
         invalid_token_dbx = Dropbox(INVALID_TOKEN)
         with self.assertRaises(AuthError) as cm:
             invalid_token_dbx.files_list_folder('')
-        self.assertEqual(cm.exception.reason['error']['.tag'],
+        self.assertEqual(cm.exception.error['error']['.tag'],
                          'invalid_access_token')
 
     def test_rpc(self):
@@ -55,7 +55,7 @@ def test_rpc(self):
                              ''.join(random.sample(string.ascii_letters, 15))
         with self.assertRaises(ApiError) as cm:
             self.dbx.files_list_folder(random_folder_path)
-        self.assertIsInstance(cm.exception.reason, ListFolderError)
+        self.assertIsInstance(cm.exception.error, ListFolderError)
 
     def test_upload_download(self):
         # Upload file
@@ -115,9 +115,10 @@ def setUp(self):
 
         self.test_dir = "/Test/%s" % str(datetime.datetime.utcnow())
 
-        self.foo = 'foo.txt'
-        self.frog = 'Costa Rican Frog.jpg'
-        self.song = 'dropbox_song.mp3'
+        local_test_dir = os.path.dirname(__file__)
+        self.foo = os.path.join(local_test_dir, 'foo.txt')
+        self.frog = os.path.join(local_test_dir, 'Costa Rican Frog.jpg')
+        self.song = os.path.join(local_test_dir, 'dropbox_song.mp3')
 
     def tearDown(self):
         try:
