summaryrefslogtreecommitdiffstats
path: root/Lib/warnings.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/warnings.py')
-rw-r--r--Lib/warnings.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/warnings.py b/Lib/warnings.py
index a88e7ba..70b3d43 100644
--- a/Lib/warnings.py
+++ b/Lib/warnings.py
@@ -383,8 +383,11 @@ except ImportError:
# Module initialization
_processoptions(sys.warnoptions)
if not _warnings_defaults:
- for cls in (DeprecationWarning, PendingDeprecationWarning, ImportWarning):
- simplefilter("ignore", category=cls, append=True)
+ silence = [ImportWarning, PendingDeprecationWarning]
+ if not sys.py3kwarning: # Don't silence DeprecationWarning if -3 was used.
+ silence.append(DeprecationWarning)
+ for cls in silence:
+ simplefilter("ignore", category=cls)
bytes_warning = sys.flags.bytes_warning
if bytes_warning > 1:
bytes_action = "error"