From df848965fbdec930c3d5471766181248b428a236 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 6 Sep 2019 15:51:46 +0200 Subject: [PATCH] showbase: *Global.py modules should not export 'sys' module --- direct/src/showbase/ShowBaseGlobal.py | 1 + direct/src/showbase/TkGlobal.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/direct/src/showbase/ShowBaseGlobal.py b/direct/src/showbase/ShowBaseGlobal.py index 845e1cccdc..dc5f4596fc 100644 --- a/direct/src/showbase/ShowBaseGlobal.py +++ b/direct/src/showbase/ShowBaseGlobal.py @@ -47,6 +47,7 @@ if sys.version_info >= (3, 0): else: import __builtin__ as builtins builtins.inspect = inspect +del sys # this also appears in AIBaseGlobal if (not __debug__) and __dev__: diff --git a/direct/src/showbase/TkGlobal.py b/direct/src/showbase/TkGlobal.py index 673d337e3c..e6cf9b7f84 100644 --- a/direct/src/showbase/TkGlobal.py +++ b/direct/src/showbase/TkGlobal.py @@ -12,6 +12,9 @@ else: if '_Pmw' in sys.modules: sys.modules['_Pmw'].__name__ = '_Pmw' +# Don't export this from the module. +del sys + # Hack to workaround broken Pmw.NoteBook in Python 3 def bordercolors(root, colorName): lightRGB = []