Applied patch [ 1378183 ] Mac: wxNotebook::HitTest off by one

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 6a1b7fe998fbafe2f5c901f0307fbc3a608485be..555b98593cc50e1a8c350b5e83cba84d053df38d 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -34,8 +34,9 @@ import sys, os
 # We happen to be doing that here in this script, so make sure to
 # remove the build_options.py file, so that config.py will recreate it.
 
 # We happen to be doing that here in this script, so make sure to
 # remove the build_options.py file, so that config.py will recreate it.
 

-if os.path.exists("build_options.py"):
-    os.remove("build_options.py")
+for bo_name in ["build_options.py", "build_options.pyc"]:
+    if os.path.exists(bo_name):
+        os.remove(bo_name)

 
 sys.setup_is_main =  __name__ == "__main__"  # an icky hack!
 from config import *
 
 sys.setup_is_main =  __name__ == "__main__"  # an icky hack!
 from config import *


@@ -726,7 +727,7 @@ else:
 
 
 if INSTALL_MULTIVERSION:
 
 
 if INSTALL_MULTIVERSION:

-    EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS)
+    EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS, shortVer=not EP_FULL_VER)

     open("src/wx.pth", "w").write(EXTRA_PATH)
     CLEANUP.append("src/wx.pth")
 else:
     open("src/wx.pth", "w").write(EXTRA_PATH)
     CLEANUP.append("src/wx.pth")
 else: