Merge pull request #29 from ScalaInc/python-2.6-support

Python 2.6 support

Author: adamgallowayscala

README.md

@@ -96,7 +96,7 @@ Raised when an error or timeout occurs when attempting to listen on the network.
 
  **`exp_sdk.ApiError`**
 
- Raised when an API call fails. Has properties `message` and `code`.
+ Raised when an API call fails. Has properties `message`, `code`, and `payload`. `payload` is the parsed JSON document received from the API.
 
 
 ## Authentication Payload

exp_sdk/api.py

@@ -66,13 +66,13 @@ def _get_channel_name (self):
     return self.uuid
 
   def _get_resource_path (self):
-    return '{}/{}'.format(self._collection_path, self.uuid)
+    return '{0}/{1}'.format(self._collection_path, self.uuid)
 
   @classmethod
   def get (cls, uuid, sdk):
     if not uuid or not isinstance(uuid, basestring):
       return None
-    path = '{}/{}'.format(cls._collection_path, uuid)
+    path = '{0}/{1}'.format(cls._collection_path, uuid)
     try:
       remote_document = sdk.api.get(path)
     except sdk.exceptions.ApiError as exception:
@@ -292,11 +292,11 @@ def value(self, value):
     self.document['value'] = value
 
   def _get_resource_path(self):
-    return '{}/{}/{}'.format(self._collection_path, self.group, self.key)
+    return '{0}/{1}/{2}'.format(self._collection_path, self.group, self.key)
 
   @classmethod
   def get (cls, group, key, sdk):
-    path = '{}/{}/{}'.format(cls._collection_path, group, key)
+    path = '{0}/{1}/{2}'.format(cls._collection_path, group, key)
     try:
       document = sdk.api.get(path)
     except sdk.exceptions.ApiError as exception:
@@ -307,7 +307,7 @@ def get (cls, group, key, sdk):
 
   @classmethod
   def create (cls, group, key, value, sdk):
-    path = '{}/{}/{}'.format(cls._collection_path, group, key)
+    path = '{0}/{1}/{2}'.format(cls._collection_path, group, key)
     document = sdk.api.put(path, value)
     data = cls(document, sdk)
     return data
@@ -316,7 +316,7 @@ def save (self):
     self._document = self._sdk.api.put(self._get_resource_path(), self.value)
 
   def _get_channel_name (self):
-    return 'data:{}:{}'.format(self.group, self.key)
+    return 'data:{0}:{1}'.format(self.group, self.key)
 
 
 
@@ -339,9 +339,9 @@ def get_children (self, params=None):
 
   def _get_delivery_url (self):
     auth = self._sdk.authenticator.get_auth()
-    base = '{}/api/delivery'.format(auth['api']['host'])
+    base = '{0}/api/delivery'.format(auth['api']['host'])
     encoded_path = urllib.quote(self.document.get('path'))
-    return '{}/{}?_rt={}'.format(base, encoded_path, auth['restrictedToken'])
+    return '{0}/{1}?_rt={2}'.format(base, encoded_path, auth['restrictedToken'])
 
   def get_url (self):
     if self.subtype == 'scala:content:file':
@@ -352,7 +352,7 @@ def get_url (self):
       return self.document.get('url')
 
   def get_variant_url (self, name):
-    return '{}&variant='.format(self._get_delivery_url(), name)
+    return '{0}&variant='.format(self._get_delivery_url(), name)
 
   def has_variant (self, name):
     return name in [variant['name'] for variant in self.document.get('variants', [])]
@@ -388,7 +388,7 @@ def _on_error(self, exception):
         self._sdk.logger.debug('API call encountered an unexpected error: %s' % traceback.format_exc())
         raise self._sdk.exceptions.UnexpectedError('API call encountered an unexpected error.')
       else:
-        raise self._sdk.exceptions.ApiError(code=payload.get('code'), message=payload.get('message'), status_code=exception.response.status_code)
+        raise self._sdk.exceptions.ApiError(code=payload.get('code'), message=payload.get('message'), status_code=exception.response.status_code, payload=payload)
     else:
       self._sdk.logger.warn('API call encountered an unexpected error.')
       self._sdk.logger.debug('API call encountered an unexpected error: %s' % traceback.format_exc())

exp_sdk/exceptions.py

@@ -36,13 +36,14 @@ def __str__ (self):
 
 class ApiError(ExpError):
 
-  def __init__(self, code=None, message=None, status_code=None):
+  def __init__(self, code=None, message=None, status_code=None, payload=None):
     self.message = message or 'An unknown error has occurred.'
     self.code = code or 'unknown.error'
     self.status_code = status_code
+    self.payload = payload
 
   def __str__(self):
-    return '%s: %s' % (self.code, self.message)
+    return '%s: %s \n %s' % (self.code, self.message, self.payload)
 
 
-class NetworkError(ExpError): pass
+class NetworkError(ExpError): pass

setup.py

@@ -3,7 +3,7 @@
 setup(
   name='exp-sdk',
   packages= ['exp_sdk'],
-  version='1.0.6',
+  version='1.0.7',
   description='EXP Python SDK',
   author='Scala',
   author_email='[email protected]',

tests/test_feeds.py

@@ -11,7 +11,7 @@ class Test(utils.Device, utils.CommonResourceBase):
   class_ = utils.api.Feed
 
   def generate_valid_document (self):
-    return { 'subtype': 'scala:feed:weather', 'searchValue': '19713', 'name': self.generate_name() }
+    return { 'subtype': 'scala:feed:weather', 'dataType': 'static', 'searchValue': '19713', 'name': self.generate_name() }
 
   def test_get_data (self):
     feed = self.create_valid()
@@ -20,7 +20,7 @@ def test_get_data (self):
       raise Exception
 
   def test_dynamic (self):
-    feed = self.exp.create_feed({ 'subtype': 'scala:feed:weather', 'searchValue': '', 'metadata': { 'type': 'dynamic' }, 'name': self.generate_name() })
+    feed = self.exp.create_feed({ 'subtype': 'scala:feed:weather', 'searchValue': '', 'dataType': 'dynamic', 'name': self.generate_name() })
     data = feed.get_data(searchValue='19713')
     if data['search']['search'] != '19713':
       raise Exception