Compile fixes for Panther

[wxWidgets.git] / wxPython / wxaddons / __init__.py

diff --git a/wxPython/wxaddons/__init__.py b/wxPython/wxaddons/__init__.py
index 80c2385471d5143151260e95a9b7749114c087c6..3fe2dd97b88ad0631710b2950a12c33a89f0e4f8 100644 (file)
--- a/wxPython/wxaddons/__init__.py
+++ b/wxPython/wxaddons/__init__.py
@@ -15,7 +15,12 @@ import xmlrpclib
 import __builtin__
 import wx
 
 import __builtin__
 import wx
 

-domain = 'http://wxpyaddons.wxcommunity.com'
+# NB: For some reason that I haven't been able to track down, on Mac (at least)
+# calling xmlrpc methods no longer works after the wx.App is started. Therefore, 
+# we grab the package URL even before prompting the user if they want to install
+# the package in order for us to have the info we need before the wx.App is started.
+
+domain = 'http://wxaddons.wxcommunity.com'

 builtin_import = __builtin__.__import__
 
 debug = False
 builtin_import = __builtin__.__import__
 
 debug = False


@@ -98,7 +103,7 @@ def require_addon_version(name, version=[], canBeNewer=True):
             should_install = prompt_install(name, comp_version)
             
             if should_install:
             should_install = prompt_install(name, comp_version)
             
             if should_install:

-                dl_and_install_addon(name, comp_version)
+                dl_and_install_addon(name, comp_version, url)

 
 def get_url(name, version):
     url = ""
 
 def get_url(name, version):
     url = ""


@@ -118,9 +123,6 @@ def dl_and_install_addon(name, version, url):
     tempdir = None
     cwd = os.getcwd()
     
     tempdir = None
     cwd = os.getcwd()
     

-    # get the package URL
-    url = "http://wxpyaddons.wxcommunity.com/releases/sized_controls-0.5.tar.gz"
-    

     if use_gui:
         progress = wx.ProgressDialog("Installing Dependency", 
             "Preparing to install the %s addon module." % name, 
     if use_gui:
         progress = wx.ProgressDialog("Installing Dependency", 
             "Preparing to install the %s addon module." % name, 


@@ -177,7 +179,6 @@ def import_hook(name, globals=None, locals=None, fromlist=None):
     try:
         return builtin_import(name, globals, locals, fromlist)
     except:
     try:
         return builtin_import(name, globals, locals, fromlist)
     except:

-        print "Check imports is: " + `check_imports`

         if name.startswith("wxaddons"):
             print "Querying %s for module." % domain
             try:
         if name.startswith("wxaddons"):
             print "Querying %s for module." % domain
             try:


@@ -206,7 +207,7 @@ def import_hook(name, globals=None, locals=None, fromlist=None):
             raise
 
 def runTests():
             raise
 
 def runTests():

-    import wxaddons.sized_controls
+    import wxaddons.persistence

     import wxaddons.foo_bar
     import googly
 
     import wxaddons.foo_bar
     import googly