[Python-checkins] python/dist/src/Mac/Tools/IDE PackageManager.py,1.8,1.9

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Tue, 22 Apr 2003 06:53:36 -0700


Update of /cvsroot/python/python/dist/src/Mac/Tools/IDE
In directory sc8-pr-cvs1:/tmp/cvs-serv2673

Modified Files:
	PackageManager.py 
Log Message:
Hiding packages was done incorrectly. Fixed.


Index: PackageManager.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/PackageManager.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PackageManager.py	16 Apr 2003 12:40:21 -0000	1.8
--- PackageManager.py	22 Apr 2003 13:53:33 -0000	1.9
***************
*** 49,57 ****
  		
  USER_INSTALL_DIR = os.path.join(os.environ.get('HOME', ''),
!         						'Library',
!         						'Python',
!         						sys.version[:3],
!         						'site-packages')
!         						
  class PackageManagerMain(Wapplication.Application):
  	
--- 49,57 ----
  		
  USER_INSTALL_DIR = os.path.join(os.environ.get('HOME', ''),
! 								'Library',
! 								'Python',
! 								sys.version[:3],
! 								'site-packages')
! 								
  class PackageManagerMain(Wapplication.Application):
  	
***************
*** 205,209 ****
  				rv = window.close() # ignore any errors while quitting
  			except:
! 				rv = 0   # (otherwise, we can get stuck!)
  			if rv and rv > 0:
  				return
--- 205,209 ----
  				rv = window.close() # ignore any errors while quitting
  			except:
! 				rv = 0	 # (otherwise, we can get stuck!)
  			if rv and rv > 0:
  				return
***************
*** 271,280 ****
  			
  	def getbrowserdata(self, show_hidden=1):
! 		self.packages = self.pimpdb.list()
  		rv = []
  		for pkg in self.packages:
  			name = pkg.fullname()
- 			if name[0] == '(' and name[-1] == ')' and not show_hidden:
- 				continue
  			status, _ = pkg.installed()
  			description = pkg.description()
--- 271,287 ----
  			
  	def getbrowserdata(self, show_hidden=1):
! 		packages = self.pimpdb.list()
! 		if show_hidden:
! 			self.packages = packages
! 		else:
! 			self.packages = []
! 			for pkg in packages:
! 				name = pkg.fullname()
! 				if name[0] == '(' and name[-1] == ')' and not show_hidden:
! 					continue
! 				self.packages.append(pkg)			
  		rv = []
  		for pkg in self.packages:
  			name = pkg.fullname()
  			status, _ = pkg.installed()
  			description = pkg.description()