From 082f177c67d8dc7edd16dd5db764e28f5a0795f1 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 17 Feb 2012 10:44:24 -0500 Subject: Fix importlib.test.__main__ to only worry about command-line flags when directly executed. --- Lib/importlib/test/__main__.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Lib/importlib/test/__main__.py b/Lib/importlib/test/__main__.py index 5515812..92171b2 100644 --- a/Lib/importlib/test/__main__.py +++ b/Lib/importlib/test/__main__.py @@ -4,7 +4,6 @@ Specifying the ``--builtin`` flag will run tests, where applicable, with builtins.__import__ instead of importlib.__import__. """ -import argparse from importlib.test.import_ import util import os.path from test.support import run_unittest @@ -12,13 +11,6 @@ import unittest def test_main(): - parser = argparse.ArgumentParser(description='Execute the importlib test ' - 'suite') - parser.add_argument('-b', '--builtin', action='store_true', default=False, - help='use builtins.__import__() instead of importlib') - 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() @@ -26,4 +18,13 @@ def test_main(): if __name__ == '__main__': + import argparse + + parser = argparse.ArgumentParser(description='Execute the importlib test ' + 'suite') + parser.add_argument('-b', '--builtin', action='store_true', default=False, + help='use builtins.__import__() instead of importlib') + args = parser.parse_args() + if args.builtin: + util.using___import__ = True test_main() -- cgit v0.12