From: Jack Jansen <jack.jansen@cwi.nl>
Date: Mon, 10 Feb 2003 14:19:14 +0000 (+0000)
Subject: - Better exception when the database isn't found.
X-Git-Tag: v2.3c1~1939
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26bf3acf42578c1d7798638f425d4d35b4cd807e;p=thirdparty%2FPython%2Fcpython.git

- Better exception when the database isn't found.
- Allow for "manual:" pseudo-scheme in downloadURL to signal that
  the download should be done manually.
---

diff --git a/Lib/plat-mac/pimp.py b/Lib/plat-mac/pimp.py
index cb3a058bd1be..e91e75b0ce96 100644
--- a/Lib/plat-mac/pimp.py
+++ b/Lib/plat-mac/pimp.py
@@ -104,7 +104,7 @@ class PimpDatabase:
 		if url in self._urllist:
 			return
 		self._urllist.append(url)
-		fp = urllib.urlopen(url).fp
+		fp = MyURLopener().open(url).fp
 		dict = plistlib.Plist.fromFile(fp)
 		# Test here for Pimp version, etc
 		if not included:
@@ -299,6 +299,8 @@ class PimpPackage:
 		filename = os.path.split(path)[1]
 		self.archiveFilename = os.path.join(self._db.preferences.downloadDir, filename)			
 		if not self._archiveOK():
+			if scheme == 'manual':
+				return "Please download package manually and save as %s" % self.archiveFilename
 			if self._cmd(output, self._db.preferences.downloadDir,
 					"curl",
 					"--output", self.archiveFilename,