moving to travis from circleci

tschellenbach · tschellenbach · commit 592ca4697153 · 2014-11-10T12:52:24.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,11 @@
+language: python
+python:
+	- 2.6
+  - 2.7
+  - 3.3
+  - 3.4
+notifications:
+  email:
+    - thierryschellenbach@gmail.com
+after_success:
+  - coveralls
diff --git a/circle.yml b/circle.yml
diff --git a/setup.py b/setup.py
@@ -28,6 +28,7 @@
 
 install_requires = [
     'requests>=2.3.0',
+    'six>=1.8.0'
 ]
 
 
@@ -68,8 +69,11 @@ def run_tests(self):
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Natural Language :: English',
-        'Programming Language :: Python',
-        'Topic :: Scientific/Engineering :: Mathematics',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
 )
diff --git a/stream/client.py b/stream/client.py
@@ -93,7 +93,7 @@ def _make_request(self, method, relative_url, signature, params=None, data=None)
                           params=default_params, timeout=self.timeout)
         logger.debug('stream api call %s, headers %s data %s',
                      response.url, headers, data)
-        result = serializer.loads(response.content)
+        result = serializer.loads(response.text)
         if result.get('exception'):
             self.raise_exception(result, status_code=response.status_code)
         return result
diff --git a/stream/serializer.py b/stream/serializer.py
@@ -5,6 +5,7 @@
 Adds the ability to send date and datetime objects to the API
 The date and datetime formats from the API are automatically supported and parsed
 '''
+import six
 
 
 def _datetime_encoder(obj):
@@ -13,15 +14,15 @@ def _datetime_encoder(obj):
 
 
 def _datetime_decoder(dict_):
-    for key, value in dict_.iteritems():
+    for key, value in dict_.items():
         # The built-in `json` library will `unicode` strings, except for empty
         # strings which are of type `str`. `jsondate` patches this for
         # consistency so that `unicode` is always returned.
         if value == '':
             dict_[key] = u''
             continue
 
-        if value is not None and isinstance(value, basestring):
+        if value is not None and isinstance(value, six.string_types):
             try:
                 # The api always returns times like this
                 # 2014-07-25T09:12:24.735
