diff options
| -rw-r--r-- | allow_client_apps_to_configure_loggers.patch | 29 | ||||
| -rw-r--r-- | urllib2_kerberos.py | 13 |
2 files changed, 3 insertions, 39 deletions
diff --git a/allow_client_apps_to_configure_loggers.patch b/allow_client_apps_to_configure_loggers.patch deleted file mode 100644 index 92ce752..0000000 --- a/allow_client_apps_to_configure_loggers.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/urllib2_kerberos.py -+++ b/urllib2_kerberos.py -@@ -24,15 +24,7 @@ import urllib2 as u2 - - import kerberos as k - --def getLogger(): -- log = logging.getLogger("http_kerberos_auth_handler") -- handler = logging.StreamHandler() -- formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s') -- handler.setFormatter(formatter) -- log.addHandler(handler) -- return log -- --log = getLogger() -+log = logging.getLogger("http_kerberos_auth_handler") - - class AbstractKerberosAuthHandler: - """auth handler for urllib2 that does Kerberos HTTP Negotiate Authentication -@@ -179,7 +171,8 @@ class HTTPKerberosAuthHandler(u2.BaseHan - return retry - - def test(): -- log.setLevel(logging.DEBUG) -+ logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', -+ level=logging.DEBUG) - log.info("starting test") - opener = u2.build_opener() - opener.add_handler(HTTPKerberosAuthHandler()) diff --git a/urllib2_kerberos.py b/urllib2_kerberos.py index 6c2c418..2af1afb 100644 --- a/urllib2_kerberos.py +++ b/urllib2_kerberos.py @@ -24,15 +24,7 @@ import urllib2 as u2 import kerberos as k -def getLogger(): - log = logging.getLogger("http_kerberos_auth_handler") - handler = logging.StreamHandler() - formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s') - handler.setFormatter(formatter) - log.addHandler(handler) - return log - -log = getLogger() +log = logging.getLogger("http_kerberos_auth_handler") class AbstractKerberosAuthHandler: """auth handler for urllib2 that does Kerberos HTTP Negotiate Authentication @@ -179,7 +171,8 @@ class HTTPKerberosAuthHandler(u2.BaseHandler, AbstractKerberosAuthHandler): return retry def test(): - log.setLevel(logging.DEBUG) + logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', + level=logging.DEBUG) log.info("starting test") opener = u2.build_opener() opener.add_handler(HTTPKerberosAuthHandler()) |