Issue #19828: Fixed test_site when the whole suite is run with -S.

zware · zware · commit 36193e73b8d1 · 2013-12-11T16:59:44.000-06:00
Also, cleaned up an unused import.
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
@@ -6,8 +6,7 @@
 """
 import unittest
 import test.support
-from test.support import run_unittest, TESTFN, EnvironmentVarGuard
-from test.support import captured_stderr
+from test.support import captured_stderr, TESTFN, EnvironmentVarGuard
 import builtins
 import os
 import sys
@@ -19,13 +18,13 @@
 import sysconfig
 from copy import copy
 
-# Need to make sure to not import 'site' if someone specified ``-S`` at the
-# command-line.  Detect this by just making sure 'site' has not been imported
-# already.
-if "site" in sys.modules:
-    import site
-else:
-    raise unittest.SkipTest("importation of site.py suppressed")
+# These tests are not particularly useful if Python was invoked with -S.
+# If you add tests that are useful under -S, this skip should be moved
+# to the class level.
+if sys.flags.no_site:
+    raise unittest.SkipTest("Python was invoked with -S")
+
+import site
 
 if site.ENABLE_USER_SITE and not os.path.isdir(site.USER_SITE):
     # need to add user site directory for tests
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -130,6 +130,8 @@ IDLE
 Tests
 -----
 
+- Issue #19828: Fixed test_site when the whole suite is run with -S.
+
 - Issue #19928: Implemented a test for repr() of cell objects.
 
 - Issue #19535: Fixed test_docxmlrpc when python is run with -OO.
