Ticket #5897: runtime.py.diff
| File runtime.py.diff, 1.5 KB (added by meissenPlate, 9 months ago) |
|---|
-
.py
old new 10 10 import imp 11 11 12 12 13 14 13 def shortPythonVersion(): 15 14 """ 16 15 Returns the Python version as a dot-separated string. … … 73 72 def isWinNT(self): 74 73 """Are we running in Windows NT?""" 75 74 if self.getType() == 'win32': 76 import _winreg 75 # Python 3.x changed this name. 76 winreg = None 77 if sys.version_info[0] == 2: 78 winreg = __import__('_winreg') 79 else: 80 winreg = __import__('winreg') 77 81 try: 78 k = _winreg.OpenKeyEx(79 _winreg.HKEY_LOCAL_MACHINE,82 k = winreg.OpenKeyEx( 83 winreg.HKEY_LOCAL_MACHINE, 80 84 r'Software\Microsoft\Windows NT\CurrentVersion') 81 _winreg.QueryValueEx(k, 'SystemRoot')85 winreg.QueryValueEx(k, 'SystemRoot') 82 86 return 1 83 87 except WindowsError: 84 88 return 0 … … 117 121 """Can threads be created? 118 122 """ 119 123 try: 120 return imp.find_module('thread')[0] is None 124 # Python 3.x changed this name. 125 if sys.version_info[0] == 2: 126 return imp.find_module('thread')[0] is None 127 else: 128 return imp.find_module('_thread')[0] is None 121 129 except ImportError: 122 130 return False 123 131