Issue #29407: Merge from 3.5

1 files changed, 17 insertions, 7 deletions

diff --git a/Lib/test/test_importlib/import_/test_relative_imports.py b/Lib/test/test_importlib/import_/test_relative_imports.py
index 3bb819f906..8a95a32109 100644
--- a/Lib/test/test_importlib/import_/test_relative_imports.py
+++ b/Lib/test/test_importlib/import_/test_relative_imports.py
@@ -1,7 +1,8 @@
 """Test relative imports (PEP 328)."""
 from .. import util
-import sys
 import unittest
+import warnings
+
 
 class RelativeImports:
 
@@ -65,9 +66,11 @@ class RelativeImports:
                 uncache_names.append(name[:-len('.__init__')])
         with util.mock_spec(*create) as importer:
             with util.import_state(meta_path=[importer]):
-                for global_ in globals_:
-                    with util.uncache(*uncache_names):
-                        callback(global_)
+                with warnings.catch_warnings():
+                    warnings.simplefilter("ignore")
+                    for global_ in globals_:
+                        with util.uncache(*uncache_names):
+                            callback(global_)
 
 
     def test_module_from_module(self):
@@ -204,11 +207,18 @@ class RelativeImports:
 
     def test_relative_import_no_globals(self):
         # No globals for a relative import is an error.
-        with self.assertRaises(KeyError):
-            self.__import__('sys', level=1)
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            with self.assertRaises(KeyError):
+                self.__import__('sys', level=1)
+
+    def test_relative_import_no_package(self):
+        with self.assertRaises(ImportError):
+            self.__import__('a', {'__package__': '', '__spec__': None},
+                            level=1)
 
     def test_relative_import_no_package_exists_absolute(self):
-        with self.assertRaises(SystemError):
+        with self.assertRaises(ImportError):
             self.__import__('sys', {'__package__': '', '__spec__': None},
                             level=1)