Browse Source

showbase: *Global.py modules should not export 'sys' module

rdb 6 years ago
parent
commit
df848965fb
2 changed files with 4 additions and 0 deletions
  1. 1 0
      direct/src/showbase/ShowBaseGlobal.py
  2. 3 0
      direct/src/showbase/TkGlobal.py

+ 1 - 0
direct/src/showbase/ShowBaseGlobal.py

@@ -47,6 +47,7 @@ if sys.version_info >= (3, 0):
 else:
 else:
     import __builtin__ as builtins
     import __builtin__ as builtins
 builtins.inspect = inspect
 builtins.inspect = inspect
+del sys
 
 
 # this also appears in AIBaseGlobal
 # this also appears in AIBaseGlobal
 if (not __debug__) and __dev__:
 if (not __debug__) and __dev__:

+ 3 - 0
direct/src/showbase/TkGlobal.py

@@ -12,6 +12,9 @@ else:
 if '_Pmw' in sys.modules:
 if '_Pmw' in sys.modules:
     sys.modules['_Pmw'].__name__ = '_Pmw'
     sys.modules['_Pmw'].__name__ = '_Pmw'
 
 
+# Don't export this from the module.
+del sys
+
 # Hack to workaround broken Pmw.NoteBook in Python 3
 # Hack to workaround broken Pmw.NoteBook in Python 3
 def bordercolors(root, colorName):
 def bordercolors(root, colorName):
     lightRGB = []
     lightRGB = []