Merge pull request #74 from rowillia/support_python3

Support Python 3 and generate Python 3 compatible code

Author: jizhouli

.travis.yml

@@ -1,6 +1,7 @@
 language: python
 python:
     - "2.7"
+    - "3.5"
 install:
     - python setup.py install
 before_script:

setup.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import re
 import ast
 from setuptools import setup
@@ -23,11 +24,12 @@
             'swagger_py_codegen=swagger_py_codegen:generate'
         ]
     },
-    install_requires=['PyYAML', 'click', 'jinja2', 'dpath'],
+    install_requires=['PyYAML', 'click', 'jinja2', 'dpath', 'six'],
     tests_require=['pytest'],
     classifiers=[
         'Development Status :: 3 - Alpha',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
     ],
 )

swagger_py_codegen/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from .command import generate
 
-__version__ = '0.1.20'
+__version__ = '0.2.00'

swagger_py_codegen/__main__.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from .command import generate
 
 generate()

swagger_py_codegen/base.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import os
 
 from jinja2 import Environment, FileSystemLoader

swagger_py_codegen/command.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import codecs
 try:
     import simplejson as json

swagger_py_codegen/flask.py

@@ -1,8 +1,10 @@
+from __future__ import absolute_import
 import re
 from collections import OrderedDict
 
 from .base import Code, CodeGenerator
 from .jsonschema import Schema, SchemaGenerator, build_default
+import six
 
 SUPPORT_METHODS = ['get', 'post', 'put', 'delete', 'patch', 'options', 'head']
 
@@ -94,13 +96,21 @@ def _type(parameters):
 
     return url, params
 
+if six.PY3:
+    def _remove_characters(text, deletechars):
+        return text.translate({ord(x): None for x in deletechars})
+else:
+    def _remove_characters(text, deletechars):
+        return text.translate(None, deletechars)
 
 def _path_to_endpoint(swagger_path):
-    return swagger_path.strip('/').replace('/', '_').replace('-', '_').translate(None, '{}')
+    return _remove_characters(
+        swagger_path.strip('/').replace('/', '_').replace('-', '_'),
+        '{}')
 
 
 def _path_to_resource_name(swagger_path):
-    return swagger_path.title().translate(None, '{}/_-')
+    return _remove_characters(swagger_path.title(), '{}/_-')
 
 
 def _location(swagger_location):
@@ -130,18 +140,18 @@ def _dependence_callback(self, code):
         # use flask endpoint to replace default validator's key,
         # example: `('some_path_param', 'method')`
         validators = OrderedDict()
-        for k, v in schemas.data['validators'].iteritems():
-            locations = {_location(loc): val for loc, val in v.iteritems()}
+        for k, v in six.iteritems(schemas.data['validators']):
+            locations = {_location(loc): val for loc, val in six.iteritems(v)}
             validators[(_path_to_endpoint(k[0]), k[1])] = locations
 
         # filters
         filters = OrderedDict()
-        for k, v in schemas.data['filters'].iteritems():
+        for k, v in six.iteritems(schemas.data['filters']):
             filters[(_path_to_endpoint(k[0]), k[1])] = v
 
         # scopes
         scopes = OrderedDict()
-        for k, v in schemas.data['scopes'].iteritems():
+        for k, v in six.iteritems(schemas.data['scopes']):
             scopes[(_path_to_endpoint(k[0]), k[1])] = v
 
         schemas.data['validators'] = validators
@@ -169,9 +179,9 @@ def _process_data(self):
                 methods[method] = {}
                 validator = self.validators.get((endpoint, method.upper()))
                 if validator:
-                    methods[method]['requests'] = validator.keys()
+                    methods[method]['requests'] = list(validator.keys())
 
-                for status, res_data in data[method].get('responses', {}).iteritems():
+                for status, res_data in six.iteritems(data[method].get('responses', {})):
                     if isinstance(status, int) or status.isdigit():
                         example = res_data.get('examples', {}).get('application/json')
 

swagger_py_codegen/jsonschema.py

@@ -1,8 +1,10 @@
+from __future__ import absolute_import
 from collections import OrderedDict
 from inspect import getsource
 
 from .base import Code, CodeGenerator
 from .parser import schema_var_name
+import six
 
 
 class Schema(Code):
@@ -74,7 +76,7 @@ def build_data(swagger):
             responses = data.get('responses')
             if responses:
                 filter = {}
-                for status, res_data in responses.iteritems():
+                for status, res_data in six.iteritems(responses):
                     if isinstance(status, int) or status.isdigit():
                         filter[int(status)] = dict(
                             headers=res_data.get('headers'),
@@ -84,7 +86,7 @@ def build_data(swagger):
 
             # scopes
             for security in data.get('security', []):
-                scopes[(endpoint, method)] = security.values().pop()
+                scopes[(endpoint, method)] = list(security.values()).pop()
                 break
 
     schemas = OrderedDict([(schema_var_name(path), swagger.get(path)) for path in swagger.definitions])
@@ -150,8 +152,8 @@ def has(self, key):
 
         def keys(self):
             if isinstance(self.data, dict):
-                return self.data.keys()
-            return vars(self.data).keys()
+                return list(self.data.keys())
+            return list(vars(self.data).keys())
 
         def get_check(self, key, default=None):
             if isinstance(self.data, dict):
@@ -172,7 +174,7 @@ def _normalize_dict(schema, data):
         if not isinstance(data, DataWrapper):
             data = DataWrapper(data)
 
-        for key, _schema in schema.get('properties', {}).iteritems():
+        for key, _schema in six.iteritems(schema.get('properties', {})):
             # set default
             type_ = _schema.get('type', 'object')
 

swagger_py_codegen/parser.py

@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import
 import string
 import copy
 import dpath.util
+import six
+from six.moves import map
 
 
 def schema_var_name(path):
-    return ''.join(map(string.capitalize, path))
+    return ''.join(map(str.capitalize, path))
 
 
 class RefNode(dict):
@@ -51,7 +54,7 @@ def get_definition_refs():
                 ref = ref.lstrip('#/').split('/')
                 ref = tuple(ref)
 
-                if schema in definition_refs.keys():
+                if schema in list(definition_refs.keys()):
                     definition_refs[schema].add(ref)
                 else:
                     definition_refs[schema] = set([ref])
@@ -61,13 +64,13 @@ def get_definition_refs():
 
         definition_refs = get_definition_refs()
         while definition_refs:
-            ready = {definition for definition, refs in definition_refs.iteritems() if not refs}
+            ready = {definition for definition, refs in six.iteritems(definition_refs) if not refs}
             if not ready:
                 msg = '$ref circular references found!\n'
                 raise ValueError(msg)
             for definition in ready:
                 del definition_refs[definition]
-            for refs in definition_refs.itervalues():
+            for refs in six.itervalues(definition_refs):
                 refs.difference_update(ready)
 
             self._definitions += ready
@@ -89,7 +92,7 @@ def definitions(self):
     @property
     def scopes_supported(self):
         for _, data in self.search(['securityDefinitions', '*', 'scopes']):
-            return data.keys()
+            return list(data.keys())
         return []
 
     @property

swagger_py_codegen/templates/flask/api.tpl

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import
+
 import flask_restful as restful
 
 from ..validators import request_validate, response_filter