Merged wxPython 2.4.x to the 2.5 branch (Finally!!!)

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

wxPython/tests/txml.py

@@ -3,7 +3,7 @@ Build a GUI Tree (wxWindows) from an XML file
 using pyExpat
 """
 
-import sys,string
+import sys
 from xml.parsers import pyexpat
 
 from wxPython.wx import *
@@ -59,7 +59,7 @@ def EndElement( name ):
 
 def CharacterData ( data ):
         global NodeStack
-        if string.strip(data):
+        if data.strip():
                 app.tree.AppendItem(NodeStack[-1],data)