HA
/
patool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace iter*() methods of dicts.

This commit is contained in:
Bastian Kleineidam 2010-03-16 16:54:02 +01:00
parent b209c5d46f
commit 7a901a2d3f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patoolib/baker.py
View File

@ -342,7 +342,7 @@ class Baker(object):
# shortopts maps long option names to characters. To look up short # shortopts maps long option names to characters. To look up short
# options, we need to create a reverse mapping. # options, we need to create a reverse mapping.
shortchars = dict((v, k) for k, v in shortopts.iteritems()) shortchars = dict((v, k) for k, v in shortopts.items())
# The *vargs list and **kwargs dict to build up from the command line # The *vargs list and **kwargs dict to build up from the command line
# arguments # arguments
@ -515,7 +515,7 @@ class Baker(object):
raise CommandError("Too many arguments to %s: %s" % (cmd.name, " ".join(args))) raise CommandError("Too many arguments to %s: %s" % (cmd.name, " ".join(args)))
if not cmd.has_kwargs: if not cmd.has_kwargs:
for k in sorted(kwargs.iterkeys()): for k in sorted(kwargs.keys()):
if k not in cmd.keywords: if k not in cmd.keywords:
raise CommandError("Unknown option --%s" % k) raise CommandError("Unknown option --%s" % k)
@ -560,7 +560,7 @@ class Baker(object):
cmd, args, kwargs = self.parse(argv) cmd, args, kwargs = self.parse(argv)
result = "%s(%s" % (cmd.name, ",".join(repr(a) for a in args)) result = "%s(%s" % (cmd.name, ",".join(repr(a) for a in args))
if kwargs: if kwargs:
kws = ",".join("%s=%r" % (k, v) for k, v in kwargs.iteritems()) kws = ",".join("%s=%r" % (k, v) for k, v in kwargs.items())
result += "," + kws result += "," + kws
result += ")" result += ")"
return result return result