diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-10-19 11:06:26 +0300 |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-10-19 11:06:26 +0300 |
commit | 2b4338c5e090fa94a32d5cd7154aef5dfe25e6da (patch) | |
tree | 665a409563a70f93da9fb962f7a7da81aee8b93f /Lib/logging/config.py | |
parent | 0ab6fc6fe33837bc950d2cb0a5cf2a25579f8f3e (diff) | |
parent | 22388c044ed1680554f5c8b1ef9dc1deaa84ad08 (diff) | |
download | cpython-2b4338c5e090fa94a32d5cd7154aef5dfe25e6da.tar.gz |
Merge with 3.2.
Diffstat (limited to 'Lib/logging/config.py')
-rw-r--r-- | Lib/logging/config.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/logging/config.py b/Lib/logging/config.py index c7359cabe9..7daa2df8f4 100644 --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -30,7 +30,7 @@ import types, io try: import _thread as thread import threading -except ImportError: +except ImportError: #pragma: no cover thread = None from socketserver import ThreadingTCPServer, StreamRequestHandler @@ -786,7 +786,7 @@ def listen(port=DEFAULT_LOGGING_CONFIG_PORT): and which you can join() when appropriate. To stop the server, call stopListening(). """ - if not thread: + if not thread: #pragma: no cover raise NotImplementedError("listen() needs threading to work") class ConfigStreamHandler(StreamRequestHandler): @@ -825,7 +825,7 @@ def listen(port=DEFAULT_LOGGING_CONFIG_PORT): file = io.StringIO(chunk) try: fileConfig(file) - except (KeyboardInterrupt, SystemExit): + except (KeyboardInterrupt, SystemExit): #pragma: no cover raise except: traceback.print_exc() |