Skip to content

Commit dbb6a74

Browse files
committed
Update python-petstore sample
1 parent f2fea33 commit dbb6a74

File tree

3 files changed

+7
-19
lines changed

3 files changed

+7
-19
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.33-SNAPSHOT
1+
2.4.49-SNAPSHOT

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

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ def __init__(self):
6565
self.logger["urllib3_logger"] = logging.getLogger("urllib3")
6666
# Log format
6767
self.logger_format = '%(asctime)s %(levelname)s %(message)s'
68-
# Log stream handler
69-
self.logger_stream_handler = None
7068
# Log file handler
7169
self.logger_file_handler = None
7270
# Debug file location
@@ -110,9 +108,6 @@ def set_default(cls, default):
110108
def logger_file(self):
111109
"""The logger file.
112110
113-
If the logger_file is None, then add stream handler and remove file
114-
handler. Otherwise, add file handler and remove stream handler.
115-
116111
:param value: The logger_file path.
117112
:type: str
118113
"""
@@ -122,29 +117,22 @@ def logger_file(self):
122117
def logger_file(self, value):
123118
"""The logger file.
124119
125-
If the logger_file is None, then add stream handler and remove file
126-
handler. Otherwise, add file handler and remove stream handler.
120+
If the logger_file is None, then remove file
121+
handler. Otherwise, add file handler.
127122
128123
:param value: The logger_file path.
129124
:type: str
130125
"""
131126
self.__logger_file = value
132127
if self.__logger_file:
133-
# If set logging file,
134-
# then add file handler and remove stream handler.
128+
# If set logging file, then add file handler.
135129
self.logger_file_handler = logging.FileHandler(self.__logger_file)
136130
self.logger_file_handler.setFormatter(self.logger_formatter)
137131
for _, logger in six.iteritems(self.logger):
138132
logger.addHandler(self.logger_file_handler)
139-
if self.logger_stream_handler:
140-
logger.removeHandler(self.logger_stream_handler)
141133
else:
142-
# If not set logging file,
143-
# then add stream handler and remove file handler.
144-
self.logger_stream_handler = logging.StreamHandler()
145-
self.logger_stream_handler.setFormatter(self.logger_formatter)
134+
# If not, remove file handler.
146135
for _, logger in six.iteritems(self.logger):
147-
logger.addHandler(self.logger_stream_handler)
148136
if self.logger_file_handler:
149137
logger.removeHandler(self.logger_file_handler)
150138

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ def __init__(self, resp):
4343

4444
def getheaders(self):
4545
"""Returns a dictionary of the response headers."""
46-
return self.urllib3_response.getheaders()
46+
return self.urllib3_response.headers
4747

4848
def getheader(self, name, default=None):
4949
"""Returns a given response header."""
50-
return self.urllib3_response.getheader(name, default)
50+
return self.urllib3_response.headers.get(name, default)
5151

5252

5353
class RESTClientObject(object):

0 commit comments

Comments
 (0)