summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
Diffstat (limited to 'Lib')
-rw-r--r--Lib/site.py2
-rw-r--r--Lib/test/test___all__.py3
-rw-r--r--Lib/test/test_json.py1
-rw-r--r--Lib/test/test_support.py3
4 files changed, 6 insertions, 3 deletions
diff --git a/Lib/site.py b/Lib/site.py
index 548aa62..0df1d04 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -184,7 +184,7 @@ def addsitedir(sitedir, known_paths=None):
def check_enableusersite():
"""Check if user site directory is safe for inclusion
- The functions tests for the command line flag (including environment var),
+ The function tests for the command line flag (including environment var),
process uid/gid equal to effective uid/gid.
None: Disabled for security reasons
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index f6da4fe..dbc55cd 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -9,7 +9,8 @@ class AllTest(unittest.TestCase):
def check_all(self, modname):
names = {}
with catch_warning():
- warnings.filterwarnings("ignore", ".* module", DeprecationWarning)
+ warnings.filterwarnings("ignore", ".* (module|package)",
+ DeprecationWarning)
try:
exec("import %s" % modname, names)
except ImportError:
diff --git a/Lib/test/test_json.py b/Lib/test/test_json.py
index 7b8f3de..17ccdee 100644
--- a/Lib/test/test_json.py
+++ b/Lib/test/test_json.py
@@ -11,6 +11,7 @@ import test.test_support
def test_main():
test.test_support.run_unittest(json.tests.test_suite())
+ test.test_support.run_doctest(json)
if __name__ == "__main__":
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 62d327e..27a01ea 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -42,7 +42,8 @@ def import_module(name, deprecated=False):
available."""
with catch_warning(record=False):
if deprecated:
- warnings.filterwarnings("ignore", ".+ module", DeprecationWarning)
+ warnings.filterwarnings("ignore", ".+ (module|package)",
+ DeprecationWarning)
try:
module = __import__(name, level=0)
except ImportError: