Lines 1-52
Link Here
|
1 |
Index: twext/trunk/twext/python/log.py |
|
|
2 |
=================================================================== |
3 |
--- twext/python/log.py.orig 2013-09-17 23:08:55.000000000 +0000 |
4 |
+++ twext/python/log.py 2014-01-22 09:29:56.000000000 +0000 |
5 |
@@ -932,24 +932,29 @@ |
6 |
# Don't patch this module |
7 |
if moduleName is __name__: |
8 |
continue |
9 |
- |
10 |
- for name, obj in module.__dict__.iteritems(): |
11 |
- newLogger = Logger(namespace=module.__name__) |
12 |
- legacyLogger = LegacyLogger(logger=newLogger) |
13 |
- |
14 |
- if obj is twisted.python.log: |
15 |
- log.info("Replacing Twisted log module object {0} in {1}" |
16 |
- .format(name, module.__name__)) |
17 |
- setattr(module, name, legacyLogger) |
18 |
- elif obj is twisted.python.log.msg: |
19 |
- log.info("Replacing Twisted log.msg object {0} in {1}" |
20 |
- .format(name, module.__name__)) |
21 |
- setattr(module, name, legacyLogger.msg) |
22 |
- elif obj is twisted.python.log.err: |
23 |
- log.info("Replacing Twisted log.err object {0} in {1}" |
24 |
- .format(name, module.__name__)) |
25 |
- setattr(module, name, legacyLogger.err) |
26 |
- |
27 |
+ |
28 |
+ try: |
29 |
+ for name, obj in module.__dict__.iteritems(): |
30 |
+ newLogger = Logger(namespace=module.__name__) |
31 |
+ legacyLogger = LegacyLogger(logger=newLogger) |
32 |
+ |
33 |
+ if obj is twisted.python.log: |
34 |
+ log.info("Replacing Twisted log module object {0} in {1}" |
35 |
+ .format(name, module.__name__)) |
36 |
+ setattr(module, name, legacyLogger) |
37 |
+ elif obj is twisted.python.log.msg: |
38 |
+ log.info("Replacing Twisted log.msg object {0} in {1}" |
39 |
+ .format(name, module.__name__)) |
40 |
+ setattr(module, name, legacyLogger.msg) |
41 |
+ elif obj is twisted.python.log.err: |
42 |
+ log.info("Replacing Twisted log.err object {0} in {1}" |
43 |
+ .format(name, module.__name__)) |
44 |
+ setattr(module, name, legacyLogger.err) |
45 |
+ except (AttributeError, RuntimeError,): |
46 |
+ # Can't look up __name__. A hack in the "six" module causes |
47 |
+ # this. Skip the module. |
48 |
+ # See https://trac.calendarserver.org/ticket/832 |
49 |
+ continue |
50 |
|
51 |
|
52 |
###################################################################### |