Merge branch 'release/0.4.10'

etsy/__init__.py

@@ -2,7 +2,7 @@ from _v2 import EtsyV2 as Etsy  # noqa
 from etsy_env import EtsyEnvProduction  # noqa
 
 
-__version__ = '0.4.9'
+__version__ = '0.4.10'
 __author__ = 'Dan McKinley & Fulfil.IO Inc.'
 __copyright__ = 'Copyright 2010 Etsy Inc.; 2016-2017 Fulfil.IO Inc'
 __license__ = 'GPL v3'

etsy/_core.py

@@ -9,6 +9,8 @@ import tempfile
 import time
 from _multipartformdataencode import encode_multipart_formdata
 
+from .exceptions import EtsyConcurrencyError, EtsyAPILimitError
+
 
 missing = object()
 
@@ -314,6 +316,10 @@ class API(object):
         try:
             self.data = self.decode(data)
         except json.JSONDecodeError:
+            if 'being edited by another process' in data:
+                raise EtsyConcurrencyError(data)
+            if 'exceeded your quota' in data:
+                raise EtsyAPILimitError(data)
             raise ValueError(
                 'Could not decode response from Etsy as JSON: %r' % data)
 

etsy/exceptions.py

+class EtsyConcurrencyError(Exception):
+    pass
+
+
+class EtsyAPILimitError(Exception):
+    pass

etsy/test_v2.py

@@ -30,6 +30,7 @@ def write_config_file(oauth_token):
         config_file.write("oauth_token_key = %r\n" % oauth_token.key)
         config_file.write("oauth_token_secret = %r\n" % oauth_token.secret)
 
+
 try:
     import config
 except ImportError:
@@ -94,4 +95,5 @@ def testCreateListing():
 
     print "Result of uploading image: %r" % result
 
+
 testCreateListing()

setup.cfg

 [bumpversion]
-current_version = 0.4.9
+current_version = 0.4.10
 commit = True
 tag = True
 

setup.py

@@ -19,7 +19,7 @@ test_requirements = [
 
 setup(
     name='pyetsy',
-    version='0.4.9',
+    version='0.4.10',
     author='Dan McKinley & Fulfil.IO Inc.',
     author_email='dan@etsy.com,support@fulfil.io',
     description='Python access to the Etsy API',