Skip to content

Commit d5c5474

Browse files
author
Qingping Hou
committed
[Python] avoid unnecessary dictionary lookup in get_api_key method
1 parent 0d372e5 commit d5c5474

File tree

7 files changed

+31
-23
lines changed

7 files changed

+31
-23
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,13 @@ class Configuration(object):
194194
:param identifier: The identifier of apiKey.
195195
:return: The token for api key authentication.
196196
"""
197-
if (self.api_key.get(identifier) and
198-
self.api_key_prefix.get(identifier)):
199-
return self.api_key_prefix[identifier] + ' ' + self.api_key[identifier] # noqa: E501
200-
elif self.api_key.get(identifier):
201-
return self.api_key[identifier]
197+
key = self.api_key.get(identifier)
198+
if key:
199+
prefix = self.api_key_prefix.get(identifier)
200+
if prefix:
201+
return "%s %s" % (prefix, key)
202+
else:
203+
return key
202204

203205
def get_basic_auth_token(self):
204206
"""Gets HTTP basic authentication header (string).
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.3-SNAPSHOT
1+
2.4.8-SNAPSHOT

samples/client/petstore/python-asyncio/petstore_api/configuration.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,13 @@ def get_api_key_with_prefix(self, identifier):
203203
:param identifier: The identifier of apiKey.
204204
:return: The token for api key authentication.
205205
"""
206-
if (self.api_key.get(identifier) and
207-
self.api_key_prefix.get(identifier)):
208-
return self.api_key_prefix[identifier] + ' ' + self.api_key[identifier] # noqa: E501
209-
elif self.api_key.get(identifier):
210-
return self.api_key[identifier]
206+
key = self.api_key.get(identifier)
207+
if key:
208+
prefix = self.api_key_prefix.get(identifier)
209+
if prefix:
210+
return "%s %s" % (prefix, key)
211+
else:
212+
return key
211213

212214
def get_basic_auth_token(self):
213215
"""Gets HTTP basic authentication header (string).
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.3-SNAPSHOT
1+
2.4.8-SNAPSHOT

samples/client/petstore/python-tornado/petstore_api/configuration.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,13 @@ def get_api_key_with_prefix(self, identifier):
203203
:param identifier: The identifier of apiKey.
204204
:return: The token for api key authentication.
205205
"""
206-
if (self.api_key.get(identifier) and
207-
self.api_key_prefix.get(identifier)):
208-
return self.api_key_prefix[identifier] + ' ' + self.api_key[identifier] # noqa: E501
209-
elif self.api_key.get(identifier):
210-
return self.api_key[identifier]
206+
key = self.api_key.get(identifier)
207+
if key:
208+
prefix = self.api_key_prefix.get(identifier)
209+
if prefix:
210+
return "%s %s" % (prefix, key)
211+
else:
212+
return key
211213

212214
def get_basic_auth_token(self):
213215
"""Gets HTTP basic authentication header (string).
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.3-SNAPSHOT
1+
2.4.8-SNAPSHOT

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,13 @@ def get_api_key_with_prefix(self, identifier):
203203
:param identifier: The identifier of apiKey.
204204
:return: The token for api key authentication.
205205
"""
206-
if (self.api_key.get(identifier) and
207-
self.api_key_prefix.get(identifier)):
208-
return self.api_key_prefix[identifier] + ' ' + self.api_key[identifier] # noqa: E501
209-
elif self.api_key.get(identifier):
210-
return self.api_key[identifier]
206+
key = self.api_key.get(identifier)
207+
if key:
208+
prefix = self.api_key_prefix.get(identifier)
209+
if prefix:
210+
return "%s %s" % (prefix, key)
211+
else:
212+
return key
211213

212214
def get_basic_auth_token(self):
213215
"""Gets HTTP basic authentication header (string).

0 commit comments

Comments
 (0)