mirror of
https://github.com/python/cpython.git
synced 2025-09-06 17:02:26 +00:00
Run 2to3's print fixer over some places that had been missed.
This commit is contained in:
parent
716c3ac40c
commit
e7bf59f500
51 changed files with 253 additions and 253 deletions
|
@ -417,18 +417,18 @@ def printUsage():
|
|||
"Print usage message."
|
||||
|
||||
format = "Usage: %s <opts1> [<opts2>] <root> [<resources>]"
|
||||
print format % basename(sys.argv[0])
|
||||
print
|
||||
print " with arguments:"
|
||||
print " (mandatory) root: the package root folder"
|
||||
print " (optional) resources: the package resources folder"
|
||||
print
|
||||
print " and options:"
|
||||
print " (mandatory) opts1:"
|
||||
print(format % basename(sys.argv[0]))
|
||||
print()
|
||||
print(" with arguments:")
|
||||
print(" (mandatory) root: the package root folder")
|
||||
print(" (optional) resources: the package resources folder")
|
||||
print()
|
||||
print(" and options:")
|
||||
print(" (mandatory) opts1:")
|
||||
mandatoryKeys = string.split("Title Version Description", " ")
|
||||
for k in mandatoryKeys:
|
||||
print " --%s" % k
|
||||
print " (optional) opts2: (with default values)"
|
||||
print(" --%s" % k)
|
||||
print(" (optional) opts2: (with default values)")
|
||||
|
||||
pmDefaults = PackageMaker.packageInfoDefaults
|
||||
optionalKeys = pmDefaults.keys()
|
||||
|
@ -439,7 +439,7 @@ def printUsage():
|
|||
for k in optionalKeys:
|
||||
format = " --%%s:%s %%s"
|
||||
format = format % (" " * (maxKeyLen-len(k)))
|
||||
print format % (k, repr(pmDefaults[k]))
|
||||
print(format % (k, repr(pmDefaults[k])))
|
||||
|
||||
|
||||
def main():
|
||||
|
@ -452,7 +452,7 @@ def main():
|
|||
try:
|
||||
opts, args = getopt.getopt(sys.argv[1:], shortOpts, longOpts)
|
||||
except getopt.GetoptError as details:
|
||||
print details
|
||||
print(details)
|
||||
printUsage()
|
||||
return
|
||||
|
||||
|
@ -462,11 +462,11 @@ def main():
|
|||
|
||||
ok = optsDict.keys()
|
||||
if not (1 <= len(args) <= 2):
|
||||
print "No argument given!"
|
||||
print("No argument given!")
|
||||
elif not ("Title" in ok and \
|
||||
"Version" in ok and \
|
||||
"Description" in ok):
|
||||
print "Missing mandatory option!"
|
||||
print("Missing mandatory option!")
|
||||
else:
|
||||
buildPackage(*args, **optsDict)
|
||||
return
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue