corrected version number extraction

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

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 96672b8ddf3f9d066dbffbc4ca8ef9c7579ad999..2454fb8459b9be1c170e602fc509399bf378d918 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -528,16 +528,11 @@ def find_DLLs():
     proc.close()
     for line in lines:
         if line.startswith("    wxmsw"):
     proc.close()
     for line in lines:
         if line.startswith("    wxmsw"):

-            WXDLLVER = line[9:14]
-            if WXDLLVER.endswith('_'):
-                WXDLLVER = WXDLLVER[:-1]
-
+            WXDLLVER = line[9:14].split('_')[0]
+            

         if line.startswith("    python"):
             PYTHONVER = line[10] + '.' + line[11]
 
         if line.startswith("    python"):
             PYTHONVER = line[10] + '.' + line[11]
 

-        #if WXDLLVER and PYTHONVER:
-        #    return WXDLLVER, PYTHONVER
-

     return WXDLLVER, PYTHONVER
 
 
     return WXDLLVER, PYTHONVER