From: Brett Cannon <bcannon@gmail.com>
Date: Sat, 4 Sep 2010 18:24:04 +0000 (+0000)
Subject: _warnings exposed two variables with the name 'default_action' and
X-Git-Tag: v3.2a2~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef0e6c3b0485e83444b15c07f9cb1d905203791a;p=thirdparty%2FPython%2Fcpython.git

_warnings exposed two variables with the name 'default_action' and
'once_registry'. This is bad as the warnings module had variables named
'defaultaction' and 'onceregistry' which are what people should be looking at
(technically those variables shouldn't be mucked with as they are undocumented,
but we all know better than to believe that isn't happening). So the variables
from _warnings have been renamed to come off as private and to avoid confusion
over what variable should be used.

Closes issue #9766. Thanks to Antoine Pitrou for the discovery.
---

diff --git a/Lib/warnings.py b/Lib/warnings.py
index ec835b18cee7..a81aab3fe567 100644
--- a/Lib/warnings.py
+++ b/Lib/warnings.py
@@ -357,10 +357,10 @@ class catch_warnings(object):
 # If either if the compiled regexs are None, match anything.
 _warnings_defaults = False
 try:
-    from _warnings import (filters, default_action, once_registry,
+    from _warnings import (filters, _defaultaction, _onceregistry,
                             warn, warn_explicit)
-    defaultaction = default_action
-    onceregistry = once_registry
+    defaultaction = _defaultaction
+    onceregistry = _onceregistry
     _warnings_defaults = True
 except ImportError:
     filters = []
diff --git a/Misc/NEWS b/Misc/NEWS
index 4673e028b290..d7976bc062e7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.2 Alpha 2?
 Core and Builtins
 -----------------
 
+- Issue #9766: Rename poorly named variables exposed by _warnings to prevent
+  confusion with the proper variables names from 'warnings' itself.
+
 - Issue #9212: dict_keys and dict_items now provide the isdisjoint()
   method, to conform to the Set ABC.  Patch by Daniel Urban.
 
diff --git a/Python/_warnings.c b/Python/_warnings.c
index 63bcbffea9fd..a4e9d48e8ec2 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -945,13 +945,13 @@ _PyWarnings_Init(void)
     if (_once_registry == NULL)
         return NULL;
     Py_INCREF(_once_registry);
-    if (PyModule_AddObject(m, "once_registry", _once_registry) < 0)
+    if (PyModule_AddObject(m, "_onceregistry", _once_registry) < 0)
         return NULL;
 
     _default_action = PyUnicode_FromString("default");
     if (_default_action == NULL)
         return NULL;
-    if (PyModule_AddObject(m, "default_action", _default_action) < 0)
+    if (PyModule_AddObject(m, "_defaultaction", _default_action) < 0)
         return NULL;
     return m;
 }