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

[jackjansen at users.sourceforge.net]

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

Modified Files:
	pimp.py 
Log Message:
Don't use "dict" as a variable, it shadows the builtin. Spotted by
Bob Ippolito.


Index: pimp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/pimp.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** pimp.py	13 Mar 2004 23:03:38 -0000	1.32
--- pimp.py	13 Mar 2004 23:32:47 -0000	1.33
***************
*** 378,390 ****
          self._urllist.append(url)
          fp = urllib2.urlopen(url).fp
!         dict = plistlib.Plist.fromFile(fp)
          # Test here for Pimp version, etc
          if included:
!             version = dict.get('Version')
              if version and version > self._version:
                  sys.stderr.write("Warning: included database %s is for pimp version %s\n" %
                      (url, version))
          else:
!             self._version = dict.get('Version')
              if not self._version:
                  sys.stderr.write("Warning: database has no Version information\n")
--- 378,390 ----
          self._urllist.append(url)
          fp = urllib2.urlopen(url).fp
!         plistdata = plistlib.Plist.fromFile(fp)
          # Test here for Pimp version, etc
          if included:
!             version = plistdata.get('Version')
              if version and version > self._version:
                  sys.stderr.write("Warning: included database %s is for pimp version %s\n" %
                      (url, version))
          else:
!             self._version = plistdata.get('Version')
              if not self._version:
                  sys.stderr.write("Warning: database has no Version information\n")
***************
*** 392,399 ****
                  sys.stderr.write("Warning: database version %s newer than pimp version %s\n" 
                      % (self._version, PIMP_VERSION))
!             self._maintainer = dict.get('Maintainer', '')
!             self._description = dict.get('Description', '').strip()
!         self._appendPackages(dict['Packages'])
!         others = dict.get('Include', [])
          for url in others:
              self.appendURL(url, included=1)
--- 392,399 ----
                  sys.stderr.write("Warning: database version %s newer than pimp version %s\n" 
                      % (self._version, PIMP_VERSION))
!             self._maintainer = plistdata.get('Maintainer', '')
!             self._description = plistdata.get('Description', '').strip()
!         self._appendPackages(plistdata['Packages'])
!         others = plistdata.get('Include', [])
          for url in others:
              self.appendURL(url, included=1)
***************
*** 438,442 ****
          for pkg in self._packages:
              packages.append(pkg.dump())
!         dict = {
              'Version': self._version,
              'Maintainer': self._maintainer,
--- 438,442 ----
          for pkg in self._packages:
              packages.append(pkg.dump())
!         plistdata = {
              'Version': self._version,
              'Maintainer': self._maintainer,
***************
*** 444,448 ****
              'Packages': packages
              }
!         plist = plistlib.Plist(**dict)
          plist.write(pathOrFile)
          
--- 444,448 ----
              'Packages': packages
              }
!         plist = plistlib.Plist(**plistdata)
          plist.write(pathOrFile)
          
***************
*** 505,515 ****
      """Class representing a single package."""
      
!     def __init__(self, db, dict):
          self._db = db
!         name = dict["Name"]
!         for k in dict.keys():
              if not k in ALLOWED_KEYS:
                  sys.stderr.write("Warning: %s: unknown key %s\n" % (name, k))
!         self._dict = dict
      
      def __getitem__(self, key):
--- 505,515 ----
      """Class representing a single package."""
      
!     def __init__(self, db, plistdata):
          self._db = db
!         name = plistdata["Name"]
!         for k in plistdata.keys():
              if not k in ALLOWED_KEYS:
                  sys.stderr.write("Warning: %s: unknown key %s\n" % (name, k))
!         self._dict = plistdata
      
      def __getitem__(self, key):