[Python-checkins] cpython: Fix importlib.test.__main__ to only worry about command-line flags when

[brett.cannon]

http://hg.python.org/cpython/rev/35c514368276
changeset:   75001:35c514368276
user:        Brett Cannon <brett at python.org>
date:        Fri Feb 17 10:44:24 2012 -0500
summary:
  Fix importlib.test.__main__ to only worry about command-line flags when directly executed.

files:
  Lib/importlib/test/__main__.py |  17 +++++++++--------
  1 files changed, 9 insertions(+), 8 deletions(-)


diff --git a/Lib/importlib/test/__main__.py b/Lib/importlib/test/__main__.py
--- a/Lib/importlib/test/__main__.py
+++ b/Lib/importlib/test/__main__.py
@@ -4,7 +4,6 @@
 builtins.__import__ instead of importlib.__import__.
 
 """
-import argparse
 from importlib.test.import_ import util
 import os.path
 from test.support import run_unittest
@@ -12,6 +11,15 @@
 
 
 def test_main():
+    start_dir = os.path.dirname(__file__)
+    top_dir = os.path.dirname(os.path.dirname(start_dir))
+    test_loader = unittest.TestLoader()
+    run_unittest(test_loader.discover(start_dir, top_level_dir=top_dir))
+
+
+if __name__ == '__main__':
+    import argparse
+
     parser = argparse.ArgumentParser(description='Execute the importlib test '
                                                   'suite')
     parser.add_argument('-b', '--builtin', action='store_true', default=False,
@@ -19,11 +27,4 @@
     args = parser.parse_args()
     if args.builtin:
         util.using___import__ = True
-    start_dir = os.path.dirname(__file__)
-    top_dir = os.path.dirname(os.path.dirname(start_dir))
-    test_loader = unittest.TestLoader()
-    run_unittest(test_loader.discover(start_dir, top_level_dir=top_dir))
-
-
-if __name__ == '__main__':
     test_main()

-- 
Repository URL: http://hg.python.org/cpython