Commit c32cec14 authored by Jack Jansen's avatar Jack Jansen

Don't use "dict" as a variable, it shadows the builtin. Spotted by

Bob Ippolito.
parent 6e098a15
...@@ -377,24 +377,24 @@ class PimpDatabase: ...@@ -377,24 +377,24 @@ class PimpDatabase:
return return
self._urllist.append(url) self._urllist.append(url)
fp = urllib2.urlopen(url).fp fp = urllib2.urlopen(url).fp
dict = plistlib.Plist.fromFile(fp) plistdata = plistlib.Plist.fromFile(fp)
# Test here for Pimp version, etc # Test here for Pimp version, etc
if included: if included:
version = dict.get('Version') version = plistdata.get('Version')
if version and version > self._version: if version and version > self._version:
sys.stderr.write("Warning: included database %s is for pimp version %s\n" % sys.stderr.write("Warning: included database %s is for pimp version %s\n" %
(url, version)) (url, version))
else: else:
self._version = dict.get('Version') self._version = plistdata.get('Version')
if not self._version: if not self._version:
sys.stderr.write("Warning: database has no Version information\n") sys.stderr.write("Warning: database has no Version information\n")
elif self._version > PIMP_VERSION: elif self._version > PIMP_VERSION:
sys.stderr.write("Warning: database version %s newer than pimp version %s\n" sys.stderr.write("Warning: database version %s newer than pimp version %s\n"
% (self._version, PIMP_VERSION)) % (self._version, PIMP_VERSION))
self._maintainer = dict.get('Maintainer', '') self._maintainer = plistdata.get('Maintainer', '')
self._description = dict.get('Description', '').strip() self._description = plistdata.get('Description', '').strip()
self._appendPackages(dict['Packages']) self._appendPackages(plistdata['Packages'])
others = dict.get('Include', []) others = plistdata.get('Include', [])
for url in others: for url in others:
self.appendURL(url, included=1) self.appendURL(url, included=1)
...@@ -437,13 +437,13 @@ class PimpDatabase: ...@@ -437,13 +437,13 @@ class PimpDatabase:
packages = [] packages = []
for pkg in self._packages: for pkg in self._packages:
packages.append(pkg.dump()) packages.append(pkg.dump())
dict = { plistdata = {
'Version': self._version, 'Version': self._version,
'Maintainer': self._maintainer, 'Maintainer': self._maintainer,
'Description': self._description, 'Description': self._description,
'Packages': packages 'Packages': packages
} }
plist = plistlib.Plist(**dict) plist = plistlib.Plist(**plistdata)
plist.write(pathOrFile) plist.write(pathOrFile)
def find(self, ident): def find(self, ident):
...@@ -504,13 +504,13 @@ ALLOWED_KEYS = [ ...@@ -504,13 +504,13 @@ ALLOWED_KEYS = [
class PimpPackage: class PimpPackage:
"""Class representing a single package.""" """Class representing a single package."""
def __init__(self, db, dict): def __init__(self, db, plistdata):
self._db = db self._db = db
name = dict["Name"] name = plistdata["Name"]
for k in dict.keys(): for k in plistdata.keys():
if not k in ALLOWED_KEYS: if not k in ALLOWED_KEYS:
sys.stderr.write("Warning: %s: unknown key %s\n" % (name, k)) sys.stderr.write("Warning: %s: unknown key %s\n" % (name, k))
self._dict = dict self._dict = plistdata
def __getitem__(self, key): def __getitem__(self, key):
return self._dict[key] return self._dict[key]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment