checking for dom.encoding == None

temporary fix for wxPyAssertion from XRC library

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/tools/XRCed/xrced.py b/wxPython/wx/tools/XRCed/xrced.py
index 4a7ef0bc37ab55c158a2a7549bc079f19c0b8990..11d1ffde18bf5e1438885cf965162e6b7c1ecf35 100644 (file)
--- a/wxPython/wx/tools/XRCed/xrced.py
+++ b/wxPython/wx/tools/XRCed/xrced.py
@@ -875,7 +875,7 @@ Homepage: http://xrced.sourceforge.net\
             dom = minidom.parse(f)
             f.close()
             # Set encoding global variable
             dom = minidom.parse(f)
             f.close()
             # Set encoding global variable

-            g.currentEncoding = dom.encoding
+            if dom.encoding: g.currentEncoding = dom.encoding

             # Change dir
             dir = os.path.dirname(path)
             if dir: os.chdir(dir)
             # Change dir
             dir = os.path.dirname(path)
             if dir: os.chdir(dir)


@@ -1010,7 +1010,11 @@ class App(wxApp):
         frame.Show(True)
         # Load resources from XRC file (!!! should be transformed to .py later?)
         frame.res = wxXmlResource('')
         frame.Show(True)
         # Load resources from XRC file (!!! should be transformed to .py later?)
         frame.res = wxXmlResource('')

-        frame.res.Load(os.path.join(basePath, 'xrced.xrc'))
+        # !!! Temporary blocking of assert failure occuring in unicode build
+        try:
+            frame.res.Load(os.path.join(basePath, 'xrced.xrc'))
+        except wx._core.PyAssertionError:
+            pass

 
         # Load file after showing
         if args:
 
         # Load file after showing
         if args: