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/demo/widgetTest.py

@@ -1,6 +1,6 @@
 
 
-import sys, string
+import sys
 
 from wxPython.wx   import *
 from wxPython.html import *
@@ -43,7 +43,7 @@ class TestHtmlPanel(wxPanel):
         import About
         wxPanel.__init__(self, parent, id, size=size)
         self.html = wxHtmlWindow(self, -1, wxPoint(5,5), wxSize(400, 350))
-        py_version = string.split(sys.version)[0]
+        py_version = sys.version.split()[0]
         self.html.SetPage(About.MyAboutBox.text % (wx.__version__, py_version))
         ir = self.html.GetInternalRepresentation()
         self.html.SetSize( (ir.GetWidth()+5, ir.GetHeight()+5) )