[python] Cleanup ThreadPool with atexit rather than __del__

modules/swagger-codegen/src/main/resources/python/api_client.mustache

@@ -4,6 +4,7 @@ from __future__ import absolute_import
 
 import datetime
 import json
+import atexit
 import mimetypes
 from multiprocessing.pool import ThreadPool
 import os
@@ -70,14 +71,16 @@ class ApiClient(object):
         # Set default User-Agent.
         self.user_agent = '{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{packageVersion}}}/python{{/httpUserAgent}}'
 
-    def __del__(self):
+    def close(self):
         if self._pool is not None:
             self._pool.close()
             self._pool.join()
+            self._pool = None
 
     @property
     def pool(self):
         if self._pool is None:
+            atexit.register(self.close)
             self._pool = ThreadPool()
         return self._pool
 

modules/swagger-codegen/src/main/resources/python/configuration.mustache

@@ -199,7 +199,7 @@ class Configuration(object):
 
         if self.refresh_api_key_hook:
             self.refresh_api_key_hook(self)
-        
+
         key = self.api_key.get(identifier)
         if key:
             prefix = self.api_key_prefix.get(identifier)

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

@@ -1 +1 @@
-2.4.9-SNAPSHOT
+2.4.13-SNAPSHOT

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

@@ -13,6 +13,7 @@
 
 import datetime
 import json
+import atexit
 import mimetypes
 from multiprocessing.pool import ThreadPool
 import os
@@ -76,14 +77,16 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
         # Set default User-Agent.
         self.user_agent = 'Swagger-Codegen/1.0.0/python'
 
-    def __del__(self):
+    def close(self):
         if self._pool is not None:
             self._pool.close()
             self._pool.join()
+            self._pool = None
 
     @property
     def pool(self):
         if self._pool is None:
+            atexit.register(self.close)
             self._pool = ThreadPool()
         return self._pool
 

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

@@ -49,6 +49,8 @@ def __init__(self):
         self.api_key = {}
         # dict to store API prefix (e.g. Bearer)
         self.api_key_prefix = {}
+        # function to refresh API key if expired
+        self.refresh_api_key_hook = None
         # Username for HTTP basic authentication
         self.username = ""
         # Password for HTTP basic authentication
@@ -203,11 +205,17 @@ def get_api_key_with_prefix(self, identifier):
         :param identifier: The identifier of apiKey.
         :return: The token for api key authentication.
         """
-        if (self.api_key.get(identifier) and
-                self.api_key_prefix.get(identifier)):
-            return self.api_key_prefix[identifier] + ' ' + self.api_key[identifier]  # noqa: E501
-        elif self.api_key.get(identifier):
-            return self.api_key[identifier]
+
+        if self.refresh_api_key_hook:
+            self.refresh_api_key_hook(self)
+
+        key = self.api_key.get(identifier)
+        if key:
+            prefix = self.api_key_prefix.get(identifier)
+            if prefix:
+                return "%s %s" % (prefix, key)
+            else:
+                return key
 
     def get_basic_auth_token(self):
         """Gets HTTP basic authentication header (string).

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

@@ -1 +1 @@
-2.4.9-SNAPSHOT
+2.4.13-SNAPSHOT

samples/client/petstore/python/petstore_api/api_client.py

@@ -13,6 +13,7 @@
 
 import datetime
 import json
+import atexit
 import mimetypes
 from multiprocessing.pool import ThreadPool
 import os
@@ -76,14 +77,16 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
         # Set default User-Agent.
         self.user_agent = 'Swagger-Codegen/1.0.0/python'
 
-    def __del__(self):
+    def close(self):
         if self._pool is not None:
             self._pool.close()
             self._pool.join()
+            self._pool = None
 
     @property
     def pool(self):
         if self._pool is None:
+            atexit.register(self.close)
             self._pool = ThreadPool()
         return self._pool