mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Fix most trivially-findable print statements.

Browse source 
There's one major and one minor category still unfixed:
doctests are the major category (and I hope to be able to augment the
refactoring tool to refactor bona fide doctests soon);
other code generating print statements in strings is the minor category.

(Oh, and I don't know if the compiler package works.)
This commit is contained in:
Guido van Rossum 2007-02-09 05:37:30 +00:00
parent 452bf519a7
commit be19ed77dd
331 changed files with 2567 additions and 2648 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/distutils/bcppcompiler.py
View file

@ -392,7 +392,7 @@ class BCPPCompiler(CCompiler) :
try:
self.spawn(pp_args)
except DistutilsExecError as msg:
print msg
print(msg)
raise CompileError, msg
# preprocess()

2
Lib/distutils/ccompiler.py
View file

@ -1026,7 +1026,7 @@ main (int argc, char **argv) {
def debug_print (self, msg):
from distutils.debug import DEBUG
if DEBUG:
print msg
print(msg)
def warn (self, msg):
sys.stderr.write ("warning: %s\n" % msg)

8
Lib/distutils/cmd.py
View file

@ -163,14 +163,14 @@ class Command:
from distutils.fancy_getopt import longopt_xlate
if header is None:
header = "command options for '%s':" % self.get_command_name()
print indent + header
print(indent + header)
indent = indent + " "
for (option, _, _) in self.user_options:
option = string.translate(option, longopt_xlate)
if option[-1] == "=":
option = option[:-1]
value = getattr(self, option)
print indent + "%s = %s" % (option, value)
print(indent + "%s = %s" % (option, value))
def run (self):
@ -199,7 +199,7 @@ class Command:
"""
from distutils.debug import DEBUG
if DEBUG:
print msg
print(msg)
sys.stdout.flush()
@ -475,4 +475,4 @@ class install_misc (Command):
if __name__ == "__main__":
print "ok"
print("ok")

10
Lib/distutils/command/bdist_rpm.py
View file

@ -267,11 +267,11 @@ class bdist_rpm (Command):
def run (self):
if DEBUG:
print "before _get_package_data():"
print "vendor =", self.vendor
print "packager =", self.packager
print "doc_files =", self.doc_files
print "changelog =", self.changelog
print("before _get_package_data():")
print("vendor =", self.vendor)
print("packager =", self.packager)
print("doc_files =", self.doc_files)
print("changelog =", self.changelog)
# make directories
if self.spec_only:

4
Lib/distutils/command/config.py
View file

@ -359,9 +359,9 @@ class config (Command):
def dump_file (filename, head=None):
if head is None:
print filename + ":"
print(filename + ":")
else:
print head
print(head)
file = open(filename)
sys.stdout.write(file.read())

6
Lib/distutils/command/install.py
View file

@ -292,7 +292,7 @@ class install (Command):
if DEBUG:
from pprint import pprint
print "config vars:"
print("config vars:")
pprint(self.config_vars)
# Expand "~" and configuration variables in the installation
@ -347,7 +347,7 @@ class install (Command):
def dump_dirs (self, msg):
if DEBUG:
from distutils.fancy_getopt import longopt_xlate
print msg + ":"
print(msg + ":")
for opt in self.user_options:
opt_name = opt[0]
if opt_name[-1] == "=":
@ -359,7 +359,7 @@ class install (Command):
else:
opt_name = string.translate(opt_name, longopt_xlate)
val = getattr(self, opt_name)
print " %s: %s" % (opt_name, val)
print(" %s: %s" % (opt_name, val))
def finalize_unix (self):

30
Lib/distutils/command/register.py
View file

@ -86,14 +86,14 @@ class register(Command):
''' Fetch the list of classifiers from the server.
'''
response = urllib2.urlopen(self.repository+'?:action=list_classifiers')
print response.read()
print(response.read())
def verify_metadata(self):
''' Send the metadata to the package index server to be checked.
'''
# send the info to the server and report the result
(code, result) = self.post_to_server(self.build_post_data('verify'))
print 'Server response (%s): %s'%(code, result)
print('Server response (%s): %s'%(code, result))
def send_metadata(self):
''' Send the metadata to the package index server.
@ -128,7 +128,7 @@ class register(Command):
if os.environ.has_key('HOME'):
rc = os.path.join(os.environ['HOME'], '.pypirc')
if os.path.exists(rc):
print 'Using PyPI login from %s'%rc
print('Using PyPI login from %s'%rc)
config = ConfigParser.ConfigParser()
config.read(rc)
username = config.get('server-login', 'username')
@ -138,17 +138,17 @@ class register(Command):
# get the user's login info
choices = '1 2 3 4'.split()
while choice not in choices:
print '''We need to know who you are, so please choose either:
print('''We need to know who you are, so please choose either:
1. use your existing login,
2. register as a new user,
3. have the server generate a new password for you (and email it to you), or
4. quit
Your selection [default 1]: ''',
Your selection [default 1]: ''', end=' ')
choice = raw_input()
if not choice:
choice = '1'
elif choice not in choices:
print 'Please choose one of the four options!'
print('Please choose one of the four options!')
if choice == '1':
# get the username and password
@ -165,13 +165,13 @@ Your selection [default 1]: ''',
# send the info to the server and report the result
code, result = self.post_to_server(self.build_post_data('submit'),
auth)
print 'Server response (%s): %s'%(code, result)
print('Server response (%s): %s'%(code, result))
# possibly save the login
if os.environ.has_key('HOME') and config is None and code == 200:
rc = os.path.join(os.environ['HOME'], '.pypirc')
print 'I can store your PyPI login so future submissions will be faster.'
print '(the login will be stored in %s)'%rc
print('I can store your PyPI login so future submissions will be faster.')
print('(the login will be stored in %s)'%rc)
choice = 'X'
while choice.lower() not in 'yn':
choice = raw_input('Save your login (y/N)?')
@ -200,22 +200,22 @@ Your selection [default 1]: ''',
if data['password'] != data['confirm']:
data['password'] = ''
data['confirm'] = None
print "Password and confirm don't match!"
print("Password and confirm don't match!")
while not data['email']:
data['email'] = raw_input(' EMail: ')
code, result = self.post_to_server(data)
if code != 200:
print 'Server response (%s): %s'%(code, result)
print('Server response (%s): %s'%(code, result))
else:
print 'You will receive an email shortly.'
print 'Follow the instructions in it to complete registration.'
print('You will receive an email shortly.')
print('Follow the instructions in it to complete registration.')
elif choice == '3':
data = {':action': 'password_reset'}
data['email'] = ''
while not data['email']:
data['email'] = raw_input('Your email address: ')
code, result = self.post_to_server(data)
print 'Server response (%s): %s'%(code, result)
print('Server response (%s): %s'%(code, result))
def build_post_data(self, action):
# figure the data to send - the metadata plus some additional
@ -295,5 +295,5 @@ Your selection [default 1]: ''',
data = result.read()
result = 200, 'OK'
if self.show_response:
print '-'*75, data, '-'*75
print('-'*75, data, '-'*75)
return result

2
Lib/distutils/command/upload.py
View file

@ -196,4 +196,4 @@ class upload(Command):
self.announce('Upload failed (%s): %s' % (r.status, r.reason),
log.ERROR)
if self.show_response:
print '-'*75, r.read(), '-'*75
print('-'*75, r.read(), '-'*75)

4
Lib/distutils/core.py
View file

@ -125,7 +125,7 @@ def setup (**attrs):
dist.parse_config_files()
if DEBUG:
print "options (after parsing config files):"
print("options (after parsing config files):")
dist.dump_option_dicts()
if _setup_stop_after == "config":
@ -139,7 +139,7 @@ def setup (**attrs):
raise SystemExit, gen_usage(dist.script_name) + "\nerror: %s" % msg
if DEBUG:
print "options (after parsing command line):"
print("options (after parsing command line):")
dist.dump_option_dicts()
if _setup_stop_after == "commandline":

48
Lib/distutils/dist.py
View file

@ -290,22 +290,22 @@ Common commands: (see '--help-commands' for more)
commands.sort()
if header is not None:
print indent + header
print(indent + header)
indent = indent + " "
if not commands:
print indent + "no commands known yet"
print(indent + "no commands known yet")
return
for cmd_name in commands:
opt_dict = self.command_options.get(cmd_name)
if opt_dict is None:
print indent + "no option dict for '%s' command" % cmd_name
print(indent + "no option dict for '%s' command" % cmd_name)
else:
print indent + "option dict for '%s' command:" % cmd_name
print(indent + "option dict for '%s' command:" % cmd_name)
out = pformat(opt_dict)
for line in string.split(out, "\n"):
print indent + " " + line
print(indent + " " + line)
# dump_option_dicts ()
@ -365,11 +365,11 @@ Common commands: (see '--help-commands' for more)
if filenames is None:
filenames = self.find_config_files()
if DEBUG: print "Distribution.parse_config_files():"
if DEBUG: print("Distribution.parse_config_files():")
parser = ConfigParser()
for filename in filenames:
if DEBUG: print " reading", filename
if DEBUG: print(" reading", filename)
parser.read(filename)
for section in parser.sections():
options = parser.options(section)
@ -636,14 +636,14 @@ Common commands: (see '--help-commands' for more)
options = self.global_options
parser.set_option_table(options)
parser.print_help(self.common_usage + "\nGlobal options:")
print
print()
if display_options:
parser.set_option_table(self.display_options)
parser.print_help(
"Information display options (just display " +
"information, ignore any commands)")
print
print()
for command in self.commands:
if type(command) is ClassType and issubclass(command, Command):
@ -657,9 +657,9 @@ Common commands: (see '--help-commands' for more)
else:
parser.set_option_table(klass.user_options)
parser.print_help("Options for '%s' command:" % klass.__name__)
print
print()
print gen_usage(self.script_name)
print(gen_usage(self.script_name))
return
# _show_help ()
@ -678,8 +678,8 @@ Common commands: (see '--help-commands' for more)
# we ignore "foo bar").
if self.help_commands:
self.print_commands()
print
print gen_usage(self.script_name)
print()
print(gen_usage(self.script_name))
return 1
# If user supplied any of the "display metadata" options, then
@ -695,12 +695,12 @@ Common commands: (see '--help-commands' for more)
opt = translate_longopt(opt)
value = getattr(self.metadata, "get_"+opt)()
if opt in ['keywords', 'platforms']:
print string.join(value, ',')
print(string.join(value, ','))
elif opt in ('classifiers', 'provides', 'requires',
'obsoletes'):
print string.join(value, '\n')
print(string.join(value, '\n'))
else:
print value
print(value)
any_display_options = 1
return any_display_options
@ -712,7 +712,7 @@ Common commands: (see '--help-commands' for more)
'print_commands()'.
"""
print header + ":"
print(header + ":")
for cmd in commands:
klass = self.cmdclass.get(cmd)
@ -723,7 +723,7 @@ Common commands: (see '--help-commands' for more)
except AttributeError:
description = "(no description available)"
print " %-*s %s" % (max_length, cmd, description)
print(" %-*s %s" % (max_length, cmd, description))
# print_command_list ()
@ -757,7 +757,7 @@ Common commands: (see '--help-commands' for more)
"Standard commands",
max_length)
if extra_commands:
print
print()
self.print_command_list(extra_commands,
"Extra commands",
max_length)
@ -862,8 +862,8 @@ Common commands: (see '--help-commands' for more)
cmd_obj = self.command_obj.get(command)
if not cmd_obj and create:
if DEBUG:
print "Distribution.get_command_obj(): " \
"creating '%s' command object" % command
print("Distribution.get_command_obj(): " \
"creating '%s' command object" % command)
klass = self.get_command_class(command)
cmd_obj = self.command_obj[command] = klass(self)
@ -893,9 +893,9 @@ Common commands: (see '--help-commands' for more)
if option_dict is None:
option_dict = self.get_option_dict(command_name)
if DEBUG: print " setting options for '%s' command:" % command_name
if DEBUG: print(" setting options for '%s' command:" % command_name)
for (option, (source, value)) in option_dict.items():
if DEBUG: print " %s = %s (from %s)" % (option, value, source)
if DEBUG: print(" %s = %s (from %s)" % (option, value, source))
try:
bool_opts = map(translate_longopt, command_obj.boolean_options)
except AttributeError:
@ -1219,4 +1219,4 @@ def fix_help_options (options):
if __name__ == "__main__":
dist = Distribution()
print "ok"
print("ok")

6
Lib/distutils/fancy_getopt.py
View file

@ -497,6 +497,6 @@ How *do* you spell that odd word, anyways?
say, "How should I know?"].)"""
for w in (10, 20, 30, 40):
print "width: %d" % w
print string.join(wrap_text(text, w), "\n")
print
print("width: %d" % w)
print(string.join(wrap_text(text, w), "\n"))
print()

2
Lib/distutils/filelist.py
View file

@ -53,7 +53,7 @@ class FileList:
"""
from distutils.debug import DEBUG
if DEBUG:
print msg
print(msg)
# -- List-like methods ---------------------------------------------

4
Lib/distutils/log.py
View file

@ -23,9 +23,9 @@ class Log:
if not args:
# msg may contain a '%'. If args is empty,
# don't even try to string-format
print msg
print(msg)
else:
print msg % args
print(msg % args)
sys.stdout.flush()
def log(self, level, msg, *args):

4
Lib/distutils/mwerkscompiler.py
View file

@ -160,9 +160,9 @@ class MWerksCompiler (CCompiler) :
settings['libraries'] = libraries
settings['extrasearchdirs'] = sourcefiledirs + include_dirs + library_dirs
if self.dry_run:
print 'CALLING LINKER IN', os.getcwd()
print('CALLING LINKER IN', os.getcwd())
for key, value in settings.items():
print '%20.20s %s'%(key, value)
print('%20.20s %s'%(key, value))
return
# Build the export file
exportfilename = os.path.join(build_temp, exportname)

2
Lib/distutils/spawn.py
View file

@ -109,7 +109,7 @@ def _spawn_os2 (cmd,
"command '%s' failed: %s" % (cmd[0], exc[-1])
if rc != 0:
# and this reflects the command running but failing
print "command '%s' failed with exit status %d" % (cmd[0], rc)
print("command '%s' failed with exit status %d" % (cmd[0], rc))
raise DistutilsExecError, \
"command '%s' failed with exit status %d" % (cmd[0], rc)

4
Lib/distutils/tests/test_dist.py
View file

@ -74,8 +74,8 @@ class DistributionTestCase(unittest.TestCase):
sys.argv.append("build")
f = open(TESTFN, "w")
try:
print >>f, "[global]"
print >>f, "command_packages = foo.bar, splat"
print("[global]", file=f)
print("command_packages = foo.bar, splat", file=f)
f.close()
d = self.create_distribution([TESTFN])
self.assertEqual(d.get_command_packages(),

12
Lib/distutils/text_file.py
View file

@ -342,13 +342,13 @@ line 3 \\
result = file.readlines ()
# result = string.join (result, '')
if result == expected_result:
print "ok %d (%s)" % (count, description)
print("ok %d (%s)" % (count, description))
else:
print "not ok %d (%s):" % (count, description)
print "** expected:"
print expected_result
print "** received:"
print result
print("not ok %d (%s):" % (count, description))
print("** expected:")
print(expected_result)
print("** received:")
print(result)
filename = "test.txt"