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

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Mon, 10 Feb 2003 06:19:17 -0800


Update of /cvsroot/python/python/dist/src/Lib/plat-mac
In directory sc8-pr-cvs1:/tmp/cvs-serv25111

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


Index: pimp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/pimp.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pimp.py	10 Feb 2003 13:38:44 -0000	1.3
--- pimp.py	10 Feb 2003 14:19:14 -0000	1.4
***************
*** 105,109 ****
  			return
  		self._urllist.append(url)
! 		fp = urllib.urlopen(url).fp
  		dict = plistlib.Plist.fromFile(fp)
  		# Test here for Pimp version, etc
--- 105,109 ----
  			return
  		self._urllist.append(url)
! 		fp = MyURLopener().open(url).fp
  		dict = plistlib.Plist.fromFile(fp)
  		# Test here for Pimp version, etc
***************
*** 300,303 ****
--- 300,305 ----
  		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",