Commit bae17a8a authored by Amaury Forgeot d'Arc's avatar Amaury Forgeot d'Arc

lib2to3 should install a logging handler only when run as a main program,

not when used as a library.

This may please the buildbots, which fail when test_lib2to3 is run before test_logging.
parent 0069d85b
......@@ -28,15 +28,6 @@ from . import patcomp
from . import fixes
from . import pygram
if sys.version_info < (2, 4):
hdlr = logging.StreamHandler()
fmt = logging.Formatter('%(name)s: %(message)s')
hdlr.setFormatter(fmt)
logging.root.addHandler(hdlr)
else:
logging.basicConfig(format='%(name)s: %(message)s', level=logging.INFO)
def main(args=None):
"""Main program.
......@@ -73,6 +64,15 @@ def main(args=None):
print >>sys.stderr, "Use --help to show usage."
return 2
# Set up logging handler
if sys.version_info < (2, 4):
hdlr = logging.StreamHandler()
fmt = logging.Formatter('%(name)s: %(message)s')
hdlr.setFormatter(fmt)
logging.root.addHandler(hdlr)
else:
logging.basicConfig(format='%(name)s: %(message)s', level=logging.INFO)
# Initialize the refactoring tool
rt = RefactoringTool(options)
......
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