Merged wxPython 2.2.2 over to the main branch

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

wxPython/demo/XMLtreeview.py

@@ -1,9 +1,16 @@
 
-import string
+import string, sys
+
+py2 = sys.version[0] == '2'
 
 from wxPython.wx import *
 try:
-    from xml.parsers import pyexpat
+    if py2:
+        from xml.parsers import expat
+        parsermodule = expat
+    else:
+        from xml.parsers import pyexpat
+        parsermodule = pyexpat
     haveXML = true
 except ImportError:
     haveXML = false
@@ -12,7 +19,8 @@ except ImportError:
 
 if not haveXML:
     def runTest(frame, nb, log):
-        dlg = wxMessageDialog(frame, 'This demo requires the XML package.  See http://www.python.org/sigs/xml-sig/',
+        dlg = wxMessageDialog(frame, 'This demo requires the XML package.  '
+                              'See http://www.python.org/sigs/xml-sig/',
                           'Sorry', wxOK | wxICON_INFORMATION)
         dlg.ShowModal()
         dlg.Destroy()
@@ -26,6 +34,8 @@ else:
 
         # Define a handler for start element events
         def StartElement(self, name, attrs ):
+            if py2:
+                name = name.encode()
             id = self.AppendItem(self.nodeStack[-1], name)
             self.nodeStack.append(id)
 
@@ -34,12 +44,14 @@ else:
 
         def CharacterData(self, data ):
             if string.strip(data):
+                if py2:
+                    data = data.encode()
                 self.AppendItem(self.nodeStack[-1], data)
 
 
         def LoadTree(self, filename):
             # Create a parser
-            Parser = pyexpat.ParserCreate()
+            Parser = parsermodule.ParserCreate()
 
             # Tell the parser what the start element handler is
             Parser.StartElementHandler = self.StartElement