From 8c065688b7120799bf58fada396bce4e431132a6 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Sun, 26 Nov 2006 23:50:19 +0000 Subject: [PATCH] Moved wxpyaddons.wxcommunity.com to wxaddons.wxcommunity.com to be consistent about naming. Also, removed hardcoded url variable, added a note about grabbing the URL, and updated tests. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/wxaddons/__init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/wxPython/wxaddons/__init__.py b/wxPython/wxaddons/__init__.py index 4af9d1831a..3fe2dd97b8 100644 --- a/wxPython/wxaddons/__init__.py +++ b/wxPython/wxaddons/__init__.py @@ -15,7 +15,12 @@ import xmlrpclib 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 @@ -98,7 +103,7 @@ def require_addon_version(name, version=[], canBeNewer=True): 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 = "" @@ -118,9 +123,6 @@ def dl_and_install_addon(name, version, url): 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, @@ -205,7 +207,7 @@ def import_hook(name, globals=None, locals=None, fromlist=None): raise def runTests(): - import wxaddons.sized_controls + import wxaddons.persistence import wxaddons.foo_bar import googly -- 2.47.2