Ticket #3413: nasty-hacks.diff

twisted/python/reflect.py

@@ -288 +288 @@
 
 def qual(clazz):
     """Return full import path of a class."""
-    return clazz.__module__ + '.' + clazz.__name__
+    if hasattr(clazz, '__module__'):
+        return clazz.__module__ + '.' + clazz.__name__
+    else:
+        return clazz.__name__
 
 def getcurrent(clazz):
     assert type(clazz) == types.ClassType, 'must be a class...'

twisted/python/lockfile.py

@@ -24 +24 @@
     from os import remove as rmlink
     _windows = False
 except:
+    import traceback
+    traceback.print_exc()
     _windows = True
-    from win32api import OpenProcess
-    import pywintypes
 
     ERROR_ACCESS_DENIED = 5
     ERROR_INVALID_PARAMETER = 87
@@ -34 +34 @@
     _open = file
 
     def kill(pid, signal):
+        import pywintypes
+        from win32api import OpenProcess
         try:
             OpenProcess(0, 0, pid)
         except pywintypes.error, e:

twisted/python/win32.py

@@ -31 +31 @@
     """
     return getattr(exceptions, 'WindowsError', FakeWindowsError)
 
-class FakeWindowsError(OSError):
+class FakeWindowsError(Exception):
     """
     Stand-in for sometimes-builtin exception on platforms for which it
     is missing.

twisted/application/app.py

@@ -2 +2 @@
 # Copyright (c) 2001-2008 Twisted Matrix Laboratories.
 # See LICENSE for details.
 
-import sys, os, pdb, getpass, traceback, signal, warnings
+import sys, os, pdb, getpass, traceback, warnings
 
 from twisted.python import runtime, log, usage, failure, util, logfile
 from twisted.python.versions import Version