Commits

Anthony Tuininga  committed afb82e0

The fix didn't occur until Python 2.6.5 so enable the workaround up until that
version.

  • Participants
  • Parent commits 721f8b6

Comments (0)

Files changed (3)

File initscripts/Console.py

 code = importer.get_code(moduleName)
 exec code in m.__dict__
 
-if sys.version_info[:2] == (2, 5):
+versionInfo = sys.version_info[:3]
+if versionInfo >= (2, 5, 0) and versionInfo <= (2, 6, 4):
     module = sys.modules.get("threading")
     if module is not None:
         module._shutdown()

File initscripts/ConsoleKeepPath.py

 code = importer.get_code(m.__name__)
 exec code in m.__dict__
 
-if sys.version_info[:2] == (2, 5):
+versionInfo = sys.version_info[:3]
+if versionInfo >= (2, 5, 0) and versionInfo <= (2, 6, 4):
     module = sys.modules.get("threading")
     if module is not None:
         module._shutdown()

File initscripts/ConsoleSetLibPath.py

 code = importer.get_code(m.__name__)
 exec code in m.__dict__
 
-if sys.version_info[:2] == (2, 5):
+versionInfo = sys.version_info[:3]
+if versionInfo >= (2, 5, 0) and versionInfo <= (2, 6, 4):
     module = sys.modules.get("threading")
     if module is not None:
         module._shutdown()