Commit 3ac58425 authored by Vinay Sajip's avatar Vinay Sajip

Closes #27904: Improved logging statements to defer formatting until needed.

parent f3f736a7
...@@ -171,7 +171,7 @@ def make_zipfile(base_name, base_dir, verbose=0, dry_run=0): ...@@ -171,7 +171,7 @@ def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
path = os.path.normpath(os.path.join(dirpath, name)) path = os.path.normpath(os.path.join(dirpath, name))
if os.path.isfile(path): if os.path.isfile(path):
zip.write(path, path) zip.write(path, path)
log.info("adding '%s'" % path) log.info("adding '%s'", path)
zip.close() zip.close()
return zip_filename return zip_filename
......
...@@ -329,8 +329,7 @@ class Command: ...@@ -329,8 +329,7 @@ class Command:
# -- External world manipulation ----------------------------------- # -- External world manipulation -----------------------------------
def warn(self, msg): def warn(self, msg):
log.warn("warning: %s: %s\n" % log.warn("warning: %s: %s\n", self.get_command_name(), msg)
(self.get_command_name(), msg))
def execute(self, func, args, msg=None, level=1): def execute(self, func, args, msg=None, level=1):
util.execute(func, args, msg, dry_run=self.dry_run) util.execute(func, args, msg, dry_run=self.dry_run)
......
...@@ -85,7 +85,7 @@ class bdist_dumb(Command): ...@@ -85,7 +85,7 @@ class bdist_dumb(Command):
install.skip_build = self.skip_build install.skip_build = self.skip_build
install.warn_dir = 0 install.warn_dir = 0
log.info("installing to %s" % self.bdist_dir) log.info("installing to %s", self.bdist_dir)
self.run_command('install') self.run_command('install')
# And make an archive relative to the root of the # And make an archive relative to the root of the
......
...@@ -363,9 +363,9 @@ class build_ext(Command): ...@@ -363,9 +363,9 @@ class build_ext(Command):
ext_name, build_info = ext ext_name, build_info = ext
log.warn(("old-style (ext_name, build_info) tuple found in " log.warn("old-style (ext_name, build_info) tuple found in "
"ext_modules for extension '%s'" "ext_modules for extension '%s'"
"-- please convert to Extension instance" % ext_name)) "-- please convert to Extension instance", ext_name)
if not (isinstance(ext_name, str) and if not (isinstance(ext_name, str) and
extension_name_re.match(ext_name)): extension_name_re.match(ext_name)):
......
...@@ -337,7 +337,7 @@ def dump_file(filename, head=None): ...@@ -337,7 +337,7 @@ def dump_file(filename, head=None):
If head is not None, will be dumped before the file content. If head is not None, will be dumped before the file content.
""" """
if head is None: if head is None:
log.info('%s' % filename) log.info('%s', filename)
else: else:
log.info(head) log.info(head)
file = open(filename) file = open(filename)
......
...@@ -385,7 +385,7 @@ class install(Command): ...@@ -385,7 +385,7 @@ class install(Command):
else: else:
opt_name = opt_name.translate(longopt_xlate) opt_name = opt_name.translate(longopt_xlate)
val = getattr(self, opt_name) val = getattr(self, opt_name)
log.debug(" %s: %s" % (opt_name, val)) log.debug(" %s: %s", opt_name, val)
def finalize_unix(self): def finalize_unix(self):
"""Finalizes options for posix platforms.""" """Finalizes options for posix platforms."""
......
...@@ -94,7 +94,7 @@ class register(PyPIRCCommand): ...@@ -94,7 +94,7 @@ class register(PyPIRCCommand):
''' '''
# send the info to the server and report the result # send the info to the server and report the result
(code, result) = self.post_to_server(self.build_post_data('verify')) (code, result) = self.post_to_server(self.build_post_data('verify'))
log.info('Server response (%s): %s' % (code, result)) log.info('Server response (%s): %s', code, result)
def send_metadata(self): def send_metadata(self):
''' Send the metadata to the package index server. ''' Send the metadata to the package index server.
...@@ -205,7 +205,7 @@ Your selection [default 1]: ''', log.INFO) ...@@ -205,7 +205,7 @@ Your selection [default 1]: ''', log.INFO)
data['email'] = input(' EMail: ') data['email'] = input(' EMail: ')
code, result = self.post_to_server(data) code, result = self.post_to_server(data)
if code != 200: if code != 200:
log.info('Server response (%s): %s' % (code, result)) log.info('Server response (%s): %s', code, result)
else: else:
log.info('You will receive an email shortly.') log.info('You will receive an email shortly.')
log.info(('Follow the instructions in it to ' log.info(('Follow the instructions in it to '
...@@ -216,7 +216,7 @@ Your selection [default 1]: ''', log.INFO) ...@@ -216,7 +216,7 @@ Your selection [default 1]: ''', log.INFO)
while not data['email']: while not data['email']:
data['email'] = input('Your email address: ') data['email'] = input('Your email address: ')
code, result = self.post_to_server(data) code, result = self.post_to_server(data)
log.info('Server response (%s): %s' % (code, result)) log.info('Server response (%s): %s', code, result)
def build_post_data(self, action): def build_post_data(self, action):
# figure the data to send - the metadata plus some additional # figure the data to send - the metadata plus some additional
......
...@@ -412,7 +412,7 @@ class sdist(Command): ...@@ -412,7 +412,7 @@ class sdist(Command):
log.info(msg) log.info(msg)
for file in files: for file in files:
if not os.path.isfile(file): if not os.path.isfile(file):
log.warn("'%s' not a regular file -- skipping" % file) log.warn("'%s' not a regular file -- skipping", file)
else: else:
dest = os.path.join(base_dir, file) dest = os.path.join(base_dir, file)
self.copy_file(file, dest, link=link) self.copy_file(file, dest, link=link)
......
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