Merge pull request #9755 from slash-arun/add-missing-reserved-words

[Python] Add missing reserved words

Author: frantuma

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java

@@ -111,7 +111,7 @@ public PythonClientCodegen() {
                     "assert", "else", "if", "pass", "yield", "break", "except", "import",
                     "print", "class", "exec", "in", "raise", "continue", "finally", "is",
                     "return", "def", "for", "lambda", "try", "self", "nonlocal", "None", "True", "nonlocal",
-                    "float", "int", "str", "date", "datetime"));
+                    "float", "int", "str", "date", "datetime", "False", "await", "async"));
 
         regexModifiers = new HashMap<Character, String>();
         regexModifiers.put('i', "IGNORECASE");

samples/client/petstore-security-test/python/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.4.0-SNAPSHOT
+2.4.9-SNAPSHOT

samples/client/petstore-security-test/python/petstore_api/api_client.py

@@ -66,7 +66,8 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             configuration = Configuration()
         self.configuration = configuration
 
-        self.pool = ThreadPool()
+        # Use the pool property to lazily initialize the ThreadPool.
+        self._pool = None
         self.rest_client = rest.RESTClientObject(configuration)
         self.default_headers = {}
         if header_name is not None:
@@ -76,8 +77,15 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
         self.user_agent = 'Swagger-Codegen/1.0.0/python'
 
     def __del__(self):
-        self.pool.close()
-        self.pool.join()
+        if self._pool is not None:
+            self._pool.close()
+            self._pool.join()
+
+    @property
+    def pool(self):
+        if self._pool is None:
+            self._pool = ThreadPool()
+        return self._pool
 
     @property
     def user_agent(self):
@@ -592,7 +600,7 @@ def __deserialize_datatime(self, string):
             )
 
     def __hasattr(self, object, name):
-            return name in object.__class__.__dict__
+        return name in object.__class__.__dict__
 
     def __deserialize_model(self, data, klass):
         """Deserializes list or dict to model.
@@ -602,8 +610,8 @@ def __deserialize_model(self, data, klass):
         :return: model object.
         """
 
-        if not klass.swagger_types and not \
-                self.__hasattr(klass, 'get_real_child_model'):
+        if (not klass.swagger_types and
+                not self.__hasattr(klass, 'get_real_child_model')):
             return data
 
         kwargs = {}

samples/client/petstore-security-test/python/setup.py

@@ -22,7 +22,13 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["urllib3 >= 1.15", "six >= 1.10", "certifi", "python-dateutil"]
+REQUIRES = [
+    "certifi>=2017.4.17",
+    "python-dateutil>=2.1",
+    "six>=1.10",
+    "urllib3>=1.23"
+]
+    
 
 setup(
     name=NAME,