diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-12-10 10:07:42 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-12-10 10:07:42 (GMT) |
| commit | 67317750aff37489fd3fa279413ef20450e7c808 (patch) | |
| tree | de83b05031484f7aad83149092c1ce9318b5ec3d /Lib/importlib | |
| parent | 720682efd1a98dcd70a829c2a06f5fd07638af26 (diff) | |
| download | cpython-67317750aff37489fd3fa279413ef20450e7c808.zip cpython-67317750aff37489fd3fa279413ef20450e7c808.tar.gz cpython-67317750aff37489fd3fa279413ef20450e7c808.tar.bz2 | |
Issue #13248: turn 3.2's PendingDeprecationWarning into 3.3's DeprecationWarning (cgi, importlib, nntplib, smtpd).
Diffstat (limited to 'Lib/importlib')
| -rw-r--r-- | Lib/importlib/abc.py | 4 | ||||
| -rw-r--r-- | Lib/importlib/test/source/test_abc_loader.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Lib/importlib/abc.py b/Lib/importlib/abc.py index fa343f8..df8cd93 100644 --- a/Lib/importlib/abc.py +++ b/Lib/importlib/abc.py @@ -195,7 +195,7 @@ class PyLoader(SourceLoader): "use SourceLoader instead. " "See the importlib documentation on how to be " "compatible with Python 3.1 onwards.", - PendingDeprecationWarning) + DeprecationWarning) path = self.source_path(fullname) if path is None: raise ImportError @@ -234,7 +234,7 @@ class PyPycLoader(PyLoader): "removal in Python 3.4; use SourceLoader instead. " "If Python 3.1 compatibility is required, see the " "latest documentation for PyLoader.", - PendingDeprecationWarning) + DeprecationWarning) source_timestamp = self.source_mtime(fullname) # Try to use bytecode if it is available. bytecode_path = self.bytecode_path(fullname) diff --git a/Lib/importlib/test/source/test_abc_loader.py b/Lib/importlib/test/source/test_abc_loader.py index 3245907..3c19b0b 100644 --- a/Lib/importlib/test/source/test_abc_loader.py +++ b/Lib/importlib/test/source/test_abc_loader.py @@ -102,7 +102,7 @@ class PyLoaderMock(abc.PyLoader): warnings.simplefilter("always") path = super().get_filename(name) assert len(w) == 1 - assert issubclass(w[0].category, PendingDeprecationWarning) + assert issubclass(w[0].category, DeprecationWarning) return path @@ -198,7 +198,7 @@ class PyPycLoaderMock(abc.PyPycLoader, PyLoaderMock): warnings.simplefilter("always") code_object = super().get_code(name) assert len(w) == 1 - assert issubclass(w[0].category, PendingDeprecationWarning) + assert issubclass(w[0].category, DeprecationWarning) return code_object class PyLoaderTests(testing_abc.LoaderTests): |