From 210032dc4f6f3fb7012bc9a901262058b29c58d4 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Mon, 19 Mar 2007 18:03:19 +0000
Subject: [PATCH] Use import xxx instead of sys.modules['xxx']

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/wx/tools/XRCed/xrced.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/wxPython/wx/tools/XRCed/xrced.py b/wxPython/wx/tools/XRCed/xrced.py
index 7f077f8dff..f4eaee78ab 100644
--- a/wxPython/wx/tools/XRCed/xrced.py
+++ b/wxPython/wx/tools/XRCed/xrced.py
@@ -1594,7 +1594,8 @@ class PrefsDialog(wx.Dialog):
         self.PostCreate(pre)
         self.checkControls = {} # map of check IDs to (control,dict,param)
 
-        xxx = sys.modules['xxx']
+        ##xxx = sys.modules['xxx']
+        import xxx
         d = xxx.xxxSizerItem.defaults_panel
 
         self.check_proportion_panel = xrc.XRCCTRL(self, 'check_proportion_panel')
@@ -1718,12 +1719,15 @@ Please upgrade wxWidgets to %d.%d.%d or higher.''' % MinWxVersion)
         # Preferences
         conf.allowExec = conf.Read('Prefs/allowExec', 'ask')
         p = 'Prefs/sizeritem_defaults_panel'
+        import xxx
         if conf.HasEntry(p):
-            sys.modules['xxx'].xxxSizerItem.defaults_panel = ReadDictFromString(conf.Read(p))
+            ##sys.modules['xxx'].xxxSizerItem.defaults_panel = ReadDictFromString(conf.Read(p))
+            xxx.xxxSizerItem.defaults_panel = ReadDictFromString(conf.Read(p))
         p = 'Prefs/sizeritem_defaults_control'
         if conf.HasEntry(p):
-            sys.modules['xxx'].xxxSizerItem.defaults_control = ReadDictFromString(conf.Read(p))
-
+            ##sys.modules['xxx'].xxxSizerItem.defaults_control = ReadDictFromString(conf.Read(p))
+            xxx.xxxSizerItem.defaults_control = ReadDictFromString(conf.Read(p))
+            
         # Add handlers
         wx.FileSystem.AddHandler(wx.MemoryFSHandler())
         # Create main frame
@@ -1785,9 +1789,12 @@ Please upgrade wxWidgets to %d.%d.%d or higher.''' % MinWxVersion)
         # Preferences
         wc.DeleteGroup('Prefs')
         wc.Write('Prefs/allowExec', conf.allowExec)
-        v = sys.modules['xxx'].xxxSizerItem.defaults_panel
+        import xxx
+        ##v = sys.modules['xxx'].xxxSizerItem.defaults_panel
+        v = xxx.xxxSizerItem.defaults_panel
         if v: wc.Write('Prefs/sizeritem_defaults_panel', DictToString(v))
-        v = sys.modules['xxx'].xxxSizerItem.defaults_control
+        ###v = sys.modules['xxx'].xxxSizerItem.defaults_control
+        v = xxx.xxxSizerItem.defaults_control
         if v: wc.Write('Prefs/sizeritem_defaults_control', DictToString(v))
         
         wc.Flush()