mirror of https://github.com/python/cpython
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.
This commit is contained in:
parent
0069d85ba9
commit
bae17a8aa1
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in New Issue