Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
c32cec14
Commit
c32cec14
authored
Mar 13, 2004
by
Jack Jansen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't use "dict" as a variable, it shadows the builtin. Spotted by
Bob Ippolito.
parent
6e098a15
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
Lib/plat-mac/pimp.py
Lib/plat-mac/pimp.py
+13
-13
No files found.
Lib/plat-mac/pimp.py
View file @
c32cec14
...
...
@@ -377,24 +377,24 @@ class PimpDatabase:
return
self
.
_urllist
.
append
(
url
)
fp
=
urllib2
.
urlopen
(
url
).
fp
dict
=
plistlib
.
Plist
.
fromFile
(
fp
)
plistdata
=
plistlib
.
Plist
.
fromFile
(
fp
)
# Test here for Pimp version, etc
if
included
:
version
=
dict
.
get
(
'Version'
)
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
=
dict
.
get
(
'Version'
)
self
.
_version
=
plistdata
.
get
(
'Version'
)
if
not
self
.
_version
:
sys
.
stderr
.
write
(
"Warning: database has no Version information
\
n
"
)
elif
self
.
_version
>
PIMP_VERSION
:
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'
,
[])
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
)
...
...
@@ -437,13 +437,13 @@ class PimpDatabase:
packages
=
[]
for
pkg
in
self
.
_packages
:
packages
.
append
(
pkg
.
dump
())
dict
=
{
plistdata
=
{
'Version'
:
self
.
_version
,
'Maintainer'
:
self
.
_maintainer
,
'Description'
:
self
.
_description
,
'Packages'
:
packages
}
plist
=
plistlib
.
Plist
(
**
dict
)
plist
=
plistlib
.
Plist
(
**
plistdata
)
plist
.
write
(
pathOrFile
)
def
find
(
self
,
ident
):
...
...
@@ -504,13 +504,13 @@ ALLOWED_KEYS = [
class
PimpPackage
:
"""Class representing a single package."""
def
__init__
(
self
,
db
,
dict
):
def
__init__
(
self
,
db
,
plistdata
):
self
.
_db
=
db
name
=
dict
[
"Name"
]
for
k
in
dict
.
keys
():
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
=
dict
self
.
_dict
=
plistdata
def
__getitem__
(
self
,
key
):
return
self
.
_dict
[
key
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment