[Python-checkins] python/dist/src/Lib/plat-mac pimp.py, 1.35.4.2, 1.35.4.3

[jackjansen at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/plat-mac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6269

Modified Files:
      Tag: release24-maint
	pimp.py 
Log Message:
Backport of 1.38:
Allow relative URLs for included databases and packages.



Index: pimp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/pimp.py,v
retrieving revision 1.35.4.2
retrieving revision 1.35.4.3
diff -u -d -r1.35.4.2 -r1.35.4.3
--- pimp.py	3 Jan 2005 15:46:45 -0000	1.35.4.2
+++ pimp.py	7 Jan 2005 13:48:49 -0000	1.35.4.3
@@ -402,18 +402,21 @@
             self._maintainer = plistdata.get('Maintainer', '')
             self._description = plistdata.get('Description', '').strip()
             self._url = url
-        self._appendPackages(plistdata['Packages'])
+        self._appendPackages(plistdata['Packages'], url)
         others = plistdata.get('Include', [])
-        for url in others:
-            self.appendURL(url, included=1)
+        for o in others:
+            o = urllib.basejoin(url, o)
+            self.appendURL(o, included=1)
 
-    def _appendPackages(self, packages):
+    def _appendPackages(self, packages, url):
         """Given a list of dictionaries containing package
         descriptions create the PimpPackage objects and append them
         to our internal storage."""
 
         for p in packages:
             p = dict(p)
+            if p.has_key('Download-URL'):
+                p['Download-URL'] = urllib.basejoin(url, p['Download-URL'])
             flavor = p.get('Flavor')
             if flavor == 'source':
                 pkg = PimpPackage_source(self, p)