diff options
| author | Guido van Rossum <guido@python.org> | 2007-06-07 23:15:56 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-06-07 23:15:56 (GMT) |
| commit | 1325790b932c4bab4f8f94f5a36c09f4036ed9f8 (patch) | |
| tree | 5f4c1d854783a4d082c5867094ec345f4772bf35 /Lib/logging/config.py | |
| parent | 7b955bd125951db694f19a1b8648b806b14bd61f (diff) | |
| download | cpython-1325790b932c4bab4f8f94f5a36c09f4036ed9f8.zip cpython-1325790b932c4bab4f8f94f5a36c09f4036ed9f8.tar.gz cpython-1325790b932c4bab4f8f94f5a36c09f4036ed9f8.tar.bz2 | |
Merged revisions 55795-55816 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r55797 | neal.norwitz | 2007-06-07 00:00:57 -0700 (Thu, 07 Jun 2007) | 3 lines
Get rid of some remnants of classic classes. types.ClassType == type.
Also get rid of almost all uses of the types module and use the builtin name.
........
r55798 | neal.norwitz | 2007-06-07 00:12:36 -0700 (Thu, 07 Jun 2007) | 1 line
Remove a use of types, verify commit hook works
........
r55809 | guido.van.rossum | 2007-06-07 11:11:29 -0700 (Thu, 07 Jun 2007) | 2 lines
Fix syntax error introduced by Neal in last checkin.
........
Diffstat (limited to 'Lib/logging/config.py')
| -rw-r--r-- | Lib/logging/config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/logging/config.py b/Lib/logging/config.py index 8b28153..0bf79a5 100644 --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -27,7 +27,7 @@ Copyright (C) 2001-2004 Vinay Sajip. All Rights Reserved. To use, simply 'import logging' and log away! """ -import sys, logging, logging.handlers, socket, struct, os, traceback, types +import sys, logging, logging.handlers, socket, struct, os, traceback try: import thread @@ -289,7 +289,7 @@ def listen(port=DEFAULT_LOGGING_CONFIG_PORT): traceback.print_exc() os.remove(file) except socket.error as e: - if type(e.args) != types.TupleType: + if not isinstancetype(e.args, tuple): raise else: errcode = e.args[0] |