python 3 compatibility

mredolatti · mredolatti · commit 9612015de2ca · 2017-06-09T02:28:42.000-03:00
diff --git a/identify/http_clients/base_client.py b/identify/http_clients/base_client.py
@@ -1,15 +1,16 @@
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
 import abc
 import re
+import six
 from identify.util.exceptions import MissingParametersException
 
-class BaseHttpClient:
+class BaseHttpClient(six.with_metaclass(abc.ABCMeta)):
     '''
     Abstrac class providing an interface and generic methods of the HTTP client
     responsible for interacting with the Identify APIs
     '''
 
-    __metaclass__ = abc.ABCMeta
-
     def __init__(self, baseurl, auth_token):
         '''
         Class constructor. Sotores basic connection information.
diff --git a/identify/http_clients/sync_client.py b/identify/http_clients/sync_client.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
 import json
 from functools import partial
 import requests
diff --git a/identify/main/identify_client.py b/identify/main/identify_client.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
 import abc
 
 
diff --git a/identify/main/identify_sync_client.py b/identify/main/identify_sync_client.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
 from identify.main.identify_client import BaseIdentifyClient
 from identify.http_clients.sync_client import SyncHttpClient
 from identify.resources.traffic_type import TrafficType
diff --git a/identify/resources/attribute.py b/identify/resources/attribute.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
 from identify.resources.base_resource import BaseResource
 from identify.util.logger import LOGGER
 from identify.util.exceptions import HTTPResponseError, \
diff --git a/identify/resources/base_resource.py b/identify/resources/base_resource.py
@@ -1,20 +1,20 @@
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
 import abc
 import six
 from identify.util import validation
 from identify.util.logger import LOGGER
-from identify.util.abstract_extra import classabstract_v2
+from identify.util.abstract_extra import classabstract, staticabstract
 from identify.util import camelcase
 from identify.util.exceptions import HTTPResponseError, \
     EndpointNotImplemented, UnknownIdentifyClientError
 
 
-class BaseResource:
+class BaseResource(six.with_metaclass(abc.ABCMeta)):
     '''
     Abstract class to handle resources uniformely.
     '''
 
-    __metaclass__ = abc.ABCMeta
-
     def __init__(self, client, id):
         '''
         Constructs (a child) resource instance (called via super or __init__,
@@ -52,7 +52,7 @@ def _process_all_response(cls, client, response):
             for item in response
         ]
 
-    @classabstract_v2
+    @classabstract
     def _build_single_from_collection_response(cls, client, response):
         '''
         Abstract Class method to construct a resource instance from a single
diff --git a/identify/resources/environment.py b/identify/resources/environment.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
 from identify.resources.base_resource import BaseResource
 from identify.util.logger import LOGGER
 
diff --git a/identify/resources/identity.py b/identify/resources/identity.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
 from identify.resources.base_resource import BaseResource
 from identify.util.exceptions import HTTPResponseError, MethodNotApplicable, \
     UnknownIdentifyClientError
diff --git a/identify/resources/traffic_type.py b/identify/resources/traffic_type.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
 from identify.resources.base_resource import BaseResource
 from identify.resources.attribute import Attribute
 from identify.util.logger import LOGGER
diff --git a/identify/tests/e2e/e2etests.py b/identify/tests/e2e/e2etests.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
 import subprocess
 import time
 import os
diff --git a/identify/tests/e2e/identify_backend/handlers.py b/identify/tests/e2e/identify_backend/handlers.py
@@ -1,29 +1,30 @@
 import json
 import tornado.web
 import tornado.escape
-from types import MethodType
 from identify_backend import responses
 
 
-def auth(self):
-    if not self.request.headers.get('Authorization') == 'Bearer Admin':
-        self.set_status(401)
-        self.finish()
+class BaseHandler(tornado.web.RequestHandler):
+    def auth(self):
+        if not self.request.headers.get('Authorization') == 'Bearer Admin':
+            self.set_status(401)
+            self.finish()
+            return False
+        return True
 
 
-class TrafficTypesHandler(tornado.web.RequestHandler):
+class TrafficTypesHandler(BaseHandler):
     def get(self):
-        bound_auth = MethodType(auth, self, TrafficTypesHandler)
-        bound_auth()
-        self.write(json.dumps(responses.traffic_types_all))
+        if self.auth():
+            self.write(json.dumps(responses.traffic_types_all))
 
 
-class EnvironmentsHandler(tornado.web.RequestHandler):
+class EnvironmentsHandler(BaseHandler):
     def get(self):
         self.write(json.dumps(responses.environments_all))
 
 
-class TrafficTypeAttributesHandler(tornado.web.RequestHandler):
+class TrafficTypeAttributesHandler(BaseHandler):
     def get(self, traffic_type_id):
         attrs = responses.traffic_type_attributes.get(traffic_type_id)
         if attrs:
@@ -63,7 +64,7 @@ def delete(self, traffic_type_id, attribute_id):
             self.finish()
 
 
-class IdentityHandler(tornado.web.RequestHandler):
+class IdentityHandler(BaseHandler):
     '''
     '''
     def put(self, traffic_type_id, environment_id, key):
@@ -106,7 +107,7 @@ def delete(self, traffic_type_id, environment_id, key):
         self.finish()
 
 
-class MultiIdentityHandler(tornado.web.RequestHandler):
+class MultiIdentityHandler(BaseHandler):
     '''
     '''
     def put(self, traffic_type_id, environment_id):
diff --git a/identify/tests/e2e/server.py b/identify/tests/e2e/server.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
 import tornado.ioloop
 import tornado.web
 from identify_backend.handlers import EnvironmentsHandler, IdentityHandler, \
diff --git a/identify/tests/http_clients/test_base_http_client.py b/identify/tests/http_clients/test_base_http_client.py
@@ -28,8 +28,8 @@ def test_get_params_from_url_template(self):
 
         for case in cases:
             assert (
-                BaseHttpClient.get_params_from_url_template(case['url']) ==
-                case['params']
+                set(BaseHttpClient.get_params_from_url_template(case['url'])) ==
+                set(case['params'])
             )
 
     def test_process_single_header(self):
diff --git a/identify/util/abstract_extra.py b/identify/util/abstract_extra.py
@@ -1,4 +1,10 @@
-class staticabstract_v2(staticmethod):
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
+import sys
+import abc
+
+
+class StaticAbstractV2(staticmethod):
     '''
     TODO
     '''
@@ -13,7 +19,7 @@ def __init__(self, fn):
         fn.__isabstractmethod__ = True
 
 
-class classabstract_v2(classmethod):
+class ClassAbstractV2(classmethod):
     '''
     TODO
     '''
@@ -26,3 +32,11 @@ def __init__(self, fn):
         '''
         classmethod.__init__(self, fn)
         fn.__isabstractmethod__ = True
+
+
+if sys.version_info <= (3, 0):
+    staticabstract = StaticAbstractV2
+    classabstract = ClassAbstractV2
+else:
+    staticabstract = abc.abstractstaticmethod
+    classabstract = abc.abstractclassmethod
diff --git a/identify/util/exceptions.py b/identify/util/exceptions.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
+
+
 class IdentifyException(Exception):
     '''
     Identify Base Exception class that can be used to catch all identify-related
diff --git a/identify/util/logger.py b/identify/util/logger.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
 import logging
 import colorlog
 
diff --git a/identify/util/validation.py b/identify/util/validation.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
 import six
 from identify.util.logger import LOGGER
 
diff --git a/setup.py b/setup.py
@@ -80,11 +80,10 @@ def run(self):
 
 # Project requirements
 install_requires = [
-    'argparse>=1.2.1',
+    'argparse>=1.1',
     'colorlog>=2.10.0',
     'requests>=2.14.2',
     'six>=1.10.0',
-    'wsgiref>=0.1.2',
 ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import absolute_import, division, print_function, \`
	`2`	`+ unicode_literals`
`1`	`3`	`import json`
`2`	`4`	`from functools import partial`
`3`	`5`	`import requests`