From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Sat, 29 Mar 2008 12:42:54 +0000 (+0000)
Subject: lib2to3 should install a logging handler only when run as a main program,
X-Git-Tag: v2.6a2~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bae17a8aa182a816f628234903b386978d6db40e;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py
index 2edf4dbbdd36..74a40539c0ff 100755
--- a/Lib/lib2to3/refactor.py
+++ b/Lib/lib2to3/refactor.py
@@ -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)