chore(python): support for python3 only

Author: rande

ioc/component.py

@@ -108,7 +108,7 @@ def is_frozen(self):
 
 class ParameterResolver(object):
     def __init__(self, logger=None):
-        self.re = re.compile("%%|%([^%\s]+)%")
+        self.re = re.compile(r"%%|%([^%\s]+)%")
         self.logger = logger
         self.stack = []
 

ioc/extra/tornado/handler.py

@@ -103,14 +103,14 @@ def dispatch(self):
             if self.is_finish():
                 return
 
-        except RequestRedirect, e:
+        except RequestRedirect as e:
             if self.logger:
                 self.logger.debug("%s: redirect: %s" % (__name__, e.new_url))
 
             self.redirect(e.new_url, True, 301)
             return
 
-        except NotFound, e:
+        except NotFound as e:
             if self.logger:
                 self.logger.critical("%s: NotFound: %s" % (__name__, self.request.uri))
 
@@ -121,7 +121,7 @@ def dispatch(self):
                 'request': self.request,
                 'exception': e,
             })
-        except Exception, e:
+        except Exception as e:
             self.set_status(500)
 
             import traceback

ioc/helper.py

@@ -102,7 +102,7 @@ def walk(data):
             if not isinstance(data, dict):
                 return data
 
-            for v, d in data.iteritems():
+            for v, d in data.items():
                 if isinstance(d, Dict):
                     all[v] = d.all()
                 else:
@@ -116,7 +116,7 @@ def walk(data):
         return walk(self.data)
 
     def iteritems(self):
-        return self.data.iteritems()
+        return self.data.items()
 
     def __iter__(self):
         return iter(self.data)

requirements_python2.txt

@@ -28,4 +28,18 @@
     packages = find_packages(),
     install_requires=["pyyaml"],
     platforms='any',
+    python_requires='>=3.6',
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+    ],
 )

requirements_python3.txt

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import unittest2 as unittest
+import unittest
 import ioc.component, ioc.exceptions
 import tests.ioc.service
 

setup.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import unittest2 as unittest
+import unittest
 import ioc.event
 
 class EventTest(unittest.TestCase):

tests/ioc/test_component.py

@@ -15,7 +15,7 @@
 
 import ioc
 import os
-import unittest2 as unittest
+import unittest
 import yaml
 
 current_dir = os.path.dirname(os.path.realpath(__file__))

tests/ioc/test_event.py

@@ -15,7 +15,7 @@
 
 import os
 import ioc.loader, ioc.component
-import unittest2 as unittest
+import unittest
 
 current_dir = os.path.dirname(os.path.realpath(__file__))