[LIB-566] python3.4 support added; check if old circle tets will pass for python 2.7.5

opalczynski · opalczynski · commit 0b987565e102 · 2016-03-14T17:16:57.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,5 @@ junit
 reports
 run_it.py
 syncano.egg-info
+.tox/*
+test
diff --git a/.isort.cfg b/.isort.cfg
@@ -2,4 +2,4 @@
 line_length=120
 multi_line_output=3
 default_section=THIRDPARTY
-skip=base.py
+skip=base.py,.tox
diff --git a/requirements.txt b/requirements.txt
@@ -13,4 +13,3 @@ python-slugify==0.1.0
 requests==2.7.0
 six==1.9.0
 validictory==1.0.0
-wsgiref==0.1.2
diff --git a/syncano/connection.py b/syncano/connection.py
@@ -236,9 +236,9 @@ def make_request(self, method_name, path, **kwargs):
         files = data.pop('files', None)
 
         if files is None:
-            files = {k: v for k, v in data.iteritems() if isinstance(v, file)}
+            files = {k: v for k, v in six.iteritems(data) if hasattr(v, 'read')}
             if data:
-                kwargs['data'] = data = {k: v for k, v in data.iteritems() if k not in files}
+                kwargs['data'] = {k: v for k, v in six.iteritems(data) if k not in files}
 
         params = self.build_params(kwargs)
         method = getattr(self.session, method_name.lower(), None)
diff --git a/syncano/models/accounts.py b/syncano/models/accounts.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+
 
 from . import fields
 from .base import Model
diff --git a/syncano/models/archetypes.py b/syncano/models/archetypes.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+
 
 import inspect
 
@@ -39,7 +39,7 @@ def __new__(cls, name, bases, attrs):
             new_class.add_to_class(n, v)
 
         for abstract in abstracts:
-            for n, v in abstract.__dict__.iteritems():
+            for n, v in six.iteritems(abstract.__dict__):
                 if isinstance(v, fields.Field) or n in ['LINKS']:  # extend this condition if required;
                     new_class.add_to_class(n, v)
 
diff --git a/syncano/models/billing.py b/syncano/models/billing.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+
 
 from . import fields
 from .base import Model
diff --git a/syncano/models/bulk.py b/syncano/models/bulk.py
@@ -12,7 +12,6 @@ class BaseBulkCreate(object):
         instances = ObjectBulkCreate(objects, manager).process()
     """
     __metaclass__ = ABCMeta
-
     MAX_BATCH_SIZE = 50
 
     @abstractmethod
diff --git a/syncano/models/classes.py b/syncano/models/classes.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+
 
 from copy import deepcopy
 
@@ -146,7 +146,7 @@ def __new__(cls, **kwargs):
             raise SyncanoValidationError('Field "class_name" is required.')
 
         model = cls.get_subclass_model(instance_name, class_name)
-        return model(**kwargs)
+        return model()
 
     @classmethod
     def _set_up_object_class(cls, model):
@@ -165,6 +165,7 @@ def create_subclass(cls, name, schema):
         attrs = {
             'Meta': deepcopy(Object._meta),
             '__new__': Model.__new__,  # We don't want to have maximum recursion depth exceeded error
+            '__init__': Model.__init__,
         }
 
         for field in schema:
diff --git a/syncano/models/data_views.py b/syncano/models/data_views.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+
 
 from . import fields
 from .base import Model
diff --git a/syncano/models/fields.py b/syncano/models/fields.py
@@ -60,6 +60,8 @@ def __eq__(self, other):
     def __lt__(self, other):
         if isinstance(other, Field):
             return self.creation_counter < other.creation_counter
+        if isinstance(other, int):
+            return self.creation_counter < other
         return NotImplemented
 
     def __hash__(self):  # pragma: no cover
diff --git a/syncano/models/incentives.py b/syncano/models/incentives.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+
 
 import json
 
diff --git a/syncano/models/instances.py b/syncano/models/instances.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+
 
 from . import fields
 from .base import Model
diff --git a/syncano/models/manager.py b/syncano/models/manager.py
@@ -82,9 +82,6 @@ def __bool__(self):  # pragma: no cover
         except IndexError:
             return False
 
-    def __nonzero__(self):  # pragma: no cover
-        return type(self).__bool__(self)
-
     def __getitem__(self, k):
         """
         Retrieves an item or slice from the set of results.
@@ -496,7 +493,7 @@ def old_update(self, *args, **kwargs):
 
         serialized = model.to_native()
 
-        serialized = {k: v for k, v in serialized.iteritems()
+        serialized = {k: v for k, v in six.iteritems(serialized)
                       if k in self.data}
 
         self.data.update(serialized)
@@ -686,7 +683,7 @@ def contribute_to_class(self, model, name):  # pragma: no cover
     def _get_serialized_data(self):
         model = self.serialize(self.data, self.model)
         serialized = model.to_native()
-        serialized = {k: v for k, v in serialized.iteritems()
+        serialized = {k: v for k, v in six.iteritems(serialized)
                       if k in self.data}
         self.data.update(serialized)
         return serialized
diff --git a/syncano/models/registry.py b/syncano/models/registry.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+
 
 import re
 
@@ -21,7 +21,7 @@ def __str__(self):
         return 'Registry: {0}'.format(', '.join(self.models))
 
     def __unicode__(self):
-        return unicode(str(self))
+        return str(str(self))
 
     def __iter__(self):
         for name, model in six.iteritems(self.models):
diff --git a/syncano/models/traces.py b/syncano/models/traces.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+
 
 from . import fields
 from .base import Model
diff --git a/syncano/release_utils.py b/syncano/release_utils.py
@@ -21,7 +21,7 @@ def new_func(*args, **kwargs):
                     self.removed_in_version
                 ),
                 category=DeprecationWarning,
-                filename=original_func.func_code.co_filename,
-                lineno=original_func.func_code.co_firstlineno + self.lineno)
+                filename=original_func.__code__.co_filename,
+                lineno=original_func.__code__.co_firstlineno + self.lineno)
             return original_func(*args, **kwargs)
         return new_func
diff --git a/tests/integration_test.py b/tests/integration_test.py
@@ -188,7 +188,7 @@ def test_update(self):
         )
         cls.description = 'dummy'
 
-        for i in xrange(3):
+        for i in range(3):
             try:
                 cls.save()
             except SyncanoRequestError as e:
@@ -367,7 +367,7 @@ def test_source_run(self):
             trace.reload()
 
         self.assertEquals(trace.status, 'success')
-        self.assertDictEqual(trace.result, {u'stderr': u'', u'stdout': u'IntegrationTest'})
+        self.assertDictEqual(trace.result, {'stderr': '', 'stdout': 'IntegrationTest'})
 
         script.delete()
 
@@ -447,7 +447,7 @@ def test_script_run(self):
 
         trace = script_endpoint.run()
         self.assertEquals(trace.status, 'success')
-        self.assertDictEqual(trace.result, {u'stderr': u'', u'stdout': u'IntegrationTest'})
+        self.assertDictEqual(trace.result, {'stderr': '', 'stdout': 'IntegrationTest'})
         script_endpoint.delete()
 
     def test_custom_script_run(self):
diff --git a/tests/integration_test_accounts.py b/tests/integration_test_accounts.py
@@ -1,8 +1,9 @@
 import os
 
-from integration_test import IntegrationTest
 from syncano.connection import Connection
 
+from .integration_test import IntegrationTest
+
 
 class LoginTest(IntegrationTest):
 
diff --git a/tests/integration_test_batch.py b/tests/integration_test_batch.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import six
 from syncano.models import Class, Object, User
 from tests.integration_test import InstanceMixin, IntegrationTest
 
@@ -111,7 +112,7 @@ def test_in_bulk_get(self):
         # test object bulk;
         bulk_res = self.klass.objects.in_bulk([self.update1.id, self.update2.id, self.update3.id])
 
-        for res_id, res in bulk_res.iteritems():
+        for res_id, res in six.iteritems(bulk_res):
             self.assertEqual(res_id, res.id)
 
         self.assertEqual(bulk_res[self.update1.id].title, self.update1.title)
diff --git a/tests/test_channels.py b/tests/test_channels.py
@@ -114,5 +114,5 @@ def test_publish(self, connection_mock):
         connection_mock.request.assert_called_once_with(
             'POST',
             '/v1.1/instances/None/channels/None/publish/',
-            data={'room': u'1', 'payload': '{"a": 1}'}
+            data={'room': '1', 'payload': '{"a": 1}'}
         )
diff --git a/tests/test_connection.py b/tests/test_connection.py
@@ -1,12 +1,18 @@
+import json
 import tempfile
 import unittest
-from urlparse import urljoin
 
+import six
 from syncano import connect
 from syncano.connection import Connection, ConnectionMixin
 from syncano.exceptions import SyncanoRequestError, SyncanoValueError
 from syncano.models.registry import registry
 
+if six.PY3:
+    from urllib.parse import urljoin
+else:
+    from urlparse import urljoin
+
 try:
     from unittest import mock
 except ImportError:
@@ -251,14 +257,15 @@ def test_invalid_credentials(self, post_mock):
 
         self.assertTrue(post_mock.called)
         self.assertIsNone(self.connection.api_key)
+        call_args = post_mock.call_args[0]
+        call_kwargs = post_mock.call_args[1]
+        call_kwargs['data'] = json.loads(call_kwargs['data'])
 
-        post_mock.assert_called_once_with(
-            urljoin(self.connection.host, '{0}/'.format(self.connection.AUTH_SUFFIX)),
-            headers={'content-type': self.connection.CONTENT_TYPE},
-            data='{"password": "dummy", "email": "dummy"}',
-            timeout=30,
-            verify=True
-        )
+        self.assertEqual(call_args[0], urljoin(self.connection.host, '{0}/'.format(self.connection.AUTH_SUFFIX)))
+        self.assertEqual(call_kwargs['headers'], {'content-type': self.connection.CONTENT_TYPE})
+        self.assertEqual(call_kwargs['timeout'], 30)
+        self.assertTrue(call_kwargs['verify'])
+        self.assertDictEqual(call_kwargs['data'], {"password": "dummy", "email": "dummy"})
 
     @mock.patch('syncano.connection.Connection.make_request')
     def test_successful_authentication(self, make_request):
@@ -274,8 +281,8 @@ def test_successful_authentication(self, make_request):
 
     @mock.patch('syncano.connection.Connection.make_request')
     def test_get_account_info(self, make_request):
-        info = {u'first_name': u'', u'last_name': u'', u'is_active': True,
-                u'id': 1, u'has_password': True, u'email': u'dummy'}
+        info = {'first_name': '', 'last_name': '', 'is_active': True,
+                'id': 1, 'has_password': True, 'email': 'dummy'}
         self.test_successful_authentication()
         make_request.return_value = info
         self.assertFalse(make_request.called)
@@ -286,8 +293,8 @@ def test_get_account_info(self, make_request):
 
     @mock.patch('syncano.connection.Connection.make_request')
     def test_get_account_info_with_api_key(self, make_request):
-        info = {u'first_name': u'', u'last_name': u'', u'is_active': True,
-                u'id': 1, u'has_password': True, u'email': u'dummy'}
+        info = {'first_name': '', 'last_name': '', 'is_active': True,
+                'id': 1, 'has_password': True, 'email': 'dummy'}
         make_request.return_value = info
         self.assertFalse(make_request.called)
         self.assertIsNone(self.connection.api_key)
@@ -305,7 +312,7 @@ def test_get_account_info_invalid_key(self, make_request):
         try:
             self.connection.get_account_info(api_key='invalid')
             self.assertTrue(False)
-        except SyncanoRequestError, e:
+        except SyncanoRequestError as e:
             self.assertIsNotNone(self.connection.api_key)
             self.assertTrue(make_request.called)
             self.assertEqual(e, err)
@@ -317,14 +324,13 @@ def test_get_account_info_missing_key(self, make_request):
         try:
             self.connection.get_account_info()
             self.assertTrue(False)
-        except SyncanoValueError, e:
+        except SyncanoValueError:
             self.assertIsNone(self.connection.api_key)
             self.assertFalse(make_request.called)
-            self.assertIn('api_key', e.message)
 
     @mock.patch('syncano.connection.Connection.make_request')
     def test_get_user_info(self, make_request_mock):
-        info = {u'profile': {}}
+        info = {'profile': {}}
         make_request_mock.return_value = info
         self.assertFalse(make_request_mock.called)
         self.connection.api_key = 'Ala has a cat'
@@ -336,7 +342,7 @@ def test_get_user_info(self, make_request_mock):
 
     @mock.patch('syncano.connection.Connection.make_request')
     def test_get_user_info_without_instance(self, make_request_mock):
-        info = {u'profile': {}}
+        info = {'profile': {}}
         make_request_mock.return_value = info
         self.assertFalse(make_request_mock.called)
         self.connection.api_key = 'Ala has a cat'
@@ -347,7 +353,7 @@ def test_get_user_info_without_instance(self, make_request_mock):
 
     @mock.patch('syncano.connection.Connection.make_request')
     def test_get_user_info_without_auth_keys(self, make_request_mock):
-        info = {u'profile': {}}
+        info = {'profile': {}}
         make_request_mock.return_value = info
         self.assertFalse(make_request_mock.called)
 
diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -1,3 +1,4 @@
+import json
 import unittest
 from datetime import datetime
 from functools import wraps
@@ -105,11 +106,11 @@ def test_field_str(self):
 
     @skip_base_class
     def test_field_unicode(self):
-        expected = u'<{0}: {1}>'.format(
+        expected = '<{0}: {1}>'.format(
             self.field.__class__.__name__,
             self.field_name
         )
-        out = unicode(self.field)
+        out = str(self.field)
         self.assertEqual(out, expected)
 
     @skip_base_class
@@ -248,11 +249,11 @@ class StringFieldTestCase(BaseTestCase):
     def test_to_python(self):
         self.assertEqual(self.field.to_python(None), None)
         self.assertEqual(self.field.to_python('test'), 'test')
-        self.assertEqual(self.field.to_python(10), u'10')
-        self.assertEqual(self.field.to_python(10.0), u'10.0')
-        self.assertEqual(self.field.to_python(True), u'True')
-        self.assertEqual(self.field.to_python({'a': 1}), u"{'a': 1}")
-        self.assertEqual(self.field.to_python([1, 2]), u"[1, 2]")
+        self.assertEqual(self.field.to_python(10), '10')
+        self.assertEqual(self.field.to_python(10.0), '10.0')
+        self.assertEqual(self.field.to_python(True), 'True')
+        self.assertEqual(self.field.to_python({'a': 1}), "{'a': 1}")
+        self.assertEqual(self.field.to_python([1, 2]), "[1, 2]")
 
 
 class IntegerFieldTestCase(BaseTestCase):
@@ -524,5 +525,5 @@ def test_to_native(self):
 
         schema = SchemaManager(value)
         self.assertEqual(self.field.to_native(None), None)
-        self.assertEqual(self.field.to_native(schema), '[{"type": "string", "name": "username"}]')
-        self.assertEqual(self.field.to_native(value), '[{"type": "string", "name": "username"}]')
+        self.assertListEqual(json.loads(self.field.to_native(schema)), [{"type": "string", "name": "username"}])
+        self.assertListEqual(json.loads(self.field.to_native(value)), [{"type": "string", "name": "username"}])
diff --git a/tests/test_incentives.py b/tests/test_incentives.py
diff --git a/tests/test_manager.py b/tests/test_manager.py
diff --git a/tests/test_models.py b/tests/test_models.py
diff --git a/tests/test_push.py b/tests/test_push.py
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from __future__ import unicode_literals`
	`1`	`+`
`2`	`2`
`3`	`3`	`from . import fields`
`4`	`4`	`from .base import Model`