Ticket #5897: twisted_python_runtime_3x_compatibility.diff

twisted/python/runtime.py

@@ -9 +9 @@
 import time
 import imp
 
+from twisted.python import compat
+
 
 
 def shortPythonVersion():
@@ -73 +75 @@
     def isWinNT(self):
         """Are we running in Windows NT?"""
         if self.getType() == 'win32':
-            import _winreg
+            # Python 3.x changed this module's name. 
+            winreg = None
+            if compat._PY3:
+                import winreg as winreg
+            else:
+                import _winreg as winreg
             try:
-                k = _winreg.OpenKeyEx(
-                        _winreg.HKEY_LOCAL_MACHINE,
+                k = winreg.OpenKeyEx(
+                        winreg.HKEY_LOCAL_MACHINE,
                         r'Software\Microsoft\Windows NT\CurrentVersion')
-                _winreg.QueryValueEx(k, 'SystemRoot')
-                return 1
+                winreg.QueryValueEx(k, 'SystemRoot')
+                return True
             except WindowsError:
-                return 0
+                return False
         # not windows NT
-        return 0
+        return False
 
 
     def isWindows(self):
@@ -117 +124 @@
         """Can threads be created?
         """
         try:
-            return imp.find_module('thread')[0] is None
+            # Python 3.x changed this module's name. 
+            if compat._PY3:
+                return imp.find_module('_thread')[0] is None
+            else:
+                return imp.find_module('thread')[0] is None
         except ImportError:
             return False
 

twisted/python/test/test_runtime.py

@@ -6 +6 @@
 """
 
 import sys
+from unittest import TestCase
 
 from twisted.python.runtime import Platform, shortPythonVersion
-from twisted.trial.unittest import TestCase
+## from twisted.trial.unittest import TestCase
+
+# TODO: Once trial is ported to Python 3.x these tests should start using it 
+# again. Until then, use the standard Python unittesting framework.
+# To do this, uncomment the line above that imports TestCase from trial, and 
+# delete the line that imports TestCase from unittest.
+# Ticket #5919
 
 
 
@@ -64 +71 @@
             self.assertTrue(sys.platform.startswith("linux"))
 
 
+    def test_isWinNT(self): 
+        """ 
+        L{Platform.isWinNT}'s can return only C{True} or C{False}.
+        """ 
+        platform = Platform() 
+        self.assertIn(platform.isWinNT(), (True, False))
+
+
 
 class ForeignPlatformTests(TestCase):
     """