loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Revert "[Python] Fix issue in python client"

Browse Source
This commit is contained in:
wing328
2015-09-24 09:30:49 +08:00
parent e8d40a146c
commit c59e2b88b1
4 changed files with 60 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@ from .rest import ApiException
import os
import re
import sys
import urllib
import json
import mimetypes

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

@@ -15,7 +15,7 @@ Copyright 2015 SmartBear Software
See the License for the specific language governing permissions and
limitations under the License.
ref: https://github.com/swagger-api/swagger-codegen
ref: https://github.com/swagger-api/swagger-codegen
"""
from __future__ import absolute_import
@@ -27,11 +27,10 @@ try:
except ImportError:
# for python3
import http.client as httplib
import sys
import logging
from six import iteritems
def singleton(cls, *args, **kw):
instances = {}
@@ -73,23 +72,36 @@ class Configuration(object):
self.password = ""
# Logging Settings
self.logger = {}
self.logger["package_logger"] = logging.getLogger("{{packageName}}")
self.logger["urllib3_logger"] = logging.getLogger("urllib3")
# Log format
self.logging_format = '%(asctime)s %(levelname)s %(message)s'
# Debug file location
self.logging_stream_handler = None
self.logging_file_handler = None
self.logging_file = None
self.__logging_file = None
# Debug switch
self.debug = False
self.__debug = False
self.init_logger()
# SSL/TLS verification
# Set this to false to skip verifying SSL certificate when calling API from https server.
self.verify_ssl = True
# Set this to customize the certificate file to verify the peer.
self.ssl_ca_cert = None
def init_logger(self):
"""
Initializes logger settings.
"""
self.logger = logging.getLogger()
formatter = logging.Formatter(self.logging_format)
stream_handler = logging.StreamHandler()
stream_handler.setFormatter(formatter)
self.logger.addHandler(stream_handler)
if self.__debug:
self.logger.setLevel(logging.DEBUG)
else:
self.logger.setLevel(logging.WARNING)
if self.__logging_file:
file_handler = logging.FileHandler(self.__logging_file)
file_handler.setFormatter(formatter)
self.logger.addFilter(file_handler)
@property
def logging_file(self):
@@ -99,23 +111,10 @@ class Configuration(object):
def logging_file(self, value):
self.__logging_file = value
if self.__logging_file:
# If set logging file,
# then add file handler and remove stream handler.
self.logging_file_handler = logging.FileHandler(self.__logging_file)
self.logging_file_handler.setFormatter(self.logging_formatter)
for _, logger in iteritems(self.logger):
logger.addHandler(self.logging_file_handler)
if self.logging_stream_handler:
logger.removeHandler(self.logging_stream_handler)
else:
# If not set logging file,
# then add stream handler and remove file handler.
self.logging_stream_handler = logging.StreamHandler()
self.logging_stream_handler.setFormatter(self.logging_formatter)
for _, logger in iteritems(self.logger):
logger.addHandler(self.logging_stream_handler)
if self.logging_file_handler:
logger.removeHandler(self.logging_file_handler)
formater = logging.Formatter(self.logging_format)
file_handler = logging.FileHandler(self.__logging_file)
file_handler.setFormatter(formater)
self.logger.addHandler(file_handler)
@property
def debug(self):
@@ -126,26 +125,13 @@ class Configuration(object):
self.__debug = value
if self.__debug:
# if debug status is True, turn on debug logging
for _, logger in iteritems(self.logger):
logger.setLevel(logging.DEBUG)
self.logger.setLevel(logging.DEBUG)
# turn on httplib debug
httplib.HTTPConnection.debuglevel = 1
else:
# if debug status is False, turn off debug logging,
# setting log level to default `logging.WARNING`
for _, logger in iteritems(self.logger):
logger.setLevel(logging.WARNING)
# turn off httplib debug
httplib.HTTPConnection.debuglevel = 0
@property
def logging_format(self):
return self.__logging_format
@logging_format.setter
def logging_format(self, value):
self.__logging_format = value
self.logging_formatter = logging.Formatter(self.__logging_format)
self.logger.setLevel(logging.WARNING)
def get_api_key_with_prefix(self, identifier):
"""