[Python-checkins] bpo-33988: Fix test_warnings using -W error (GH-7985)

[Victor Stinner]

https://github.com/python/cpython/commit/f5770f354cb982303237d581ad2b296486475965
commit: f5770f354cb982303237d581ad2b296486475965
branch: 3.7
author: Xtreak <tirkarthi at users.noreply.github.com>
committer: Victor Stinner <vstinner at redhat.com>
date: 2018-07-05T18:59:46+02:00
summary:

bpo-33988: Fix test_warnings using -W error (GH-7985)

Use DeprecationWarning instead of PendingDeprecationWarning.

files:
M Lib/test/test_platform.py
M Lib/test/test_ssl.py

diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
index 5f1e28a5d950..d3b77eb5a610 100644
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -265,7 +265,7 @@ def test_dist(self):
                 'ignore',
                 r'dist\(\) and linux_distribution\(\) '
                 'functions are deprecated .*',
-                PendingDeprecationWarning,
+                DeprecationWarning,
             )
             res = platform.dist()
 
@@ -341,7 +341,7 @@ def test_linux_distribution_encoding(self):
                         'ignore',
                         r'dist\(\) and linux_distribution\(\) '
                         'functions are deprecated .*',
-                        PendingDeprecationWarning,
+                        DeprecationWarning,
                     )
                     distname, version, distid = platform.linux_distribution()
 
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 7bbaa9f1e8eb..d80e8d3fcfc6 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -4145,7 +4145,7 @@ def test_main(verbose=False):
                 'ignore',
                 r'dist\(\) and linux_distribution\(\) '
                 'functions are deprecated .*',
-                PendingDeprecationWarning,
+                DeprecationWarning,
             )
             for name, func in plats.items():
                 plat = func()