[Jython-checkins] jython: Removed unnecessary redefinitions.

[frank.wierzbicki]

http://hg.python.org/jython/rev/da72d829ed1b
changeset:   6671:da72d829ed1b
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Fri May 25 13:10:03 2012 -0700
summary:
  Removed unnecessary redefinitions.

files:
  Lib/_warnings.py |  11 ++++++-----
  Lib/warnings.py  |   2 --
  2 files changed, 6 insertions(+), 7 deletions(-)


diff --git a/Lib/_warnings.py b/Lib/_warnings.py
--- a/Lib/_warnings.py
+++ b/Lib/_warnings.py
@@ -7,10 +7,13 @@
 import sys
 import types
 
-__all__ = ["warn", "showwarning", "formatwarning", "filterwarnings",
-           "resetwarnings", "catch_warnings"]
+__all__ = ["filters", "default_action", "once_registry", "warn",
+           "warn_explicit"]
 
-onceregistry = {}
+once_registry = {}
+onceregistry = once_registry
+default_action = "default"
+defaultaction = default_action
 
 def warnpy3k(message, category=None, stacklevel=1):
     """Issue a deprecation warning for Python 3.x related changes.
@@ -171,8 +174,6 @@
         raise _OptionError("invalid warning category: %r" % (category,))
     return cat
 
-onceregistry = {}
-
 # Code typically replaced by _warnings
 def warn(message, category=None, stacklevel=1):
     """Issue a warning, or maybe ignore it or raise an exception."""
diff --git a/Lib/warnings.py b/Lib/warnings.py
--- a/Lib/warnings.py
+++ b/Lib/warnings.py
@@ -10,8 +10,6 @@
 __all__ = ["warn", "showwarning", "formatwarning", "filterwarnings",
            "resetwarnings", "catch_warnings"]
 
-onceregistry = {}
-
 def warnpy3k(message, category=None, stacklevel=1):
     """Issue a deprecation warning for Python 3.x related changes.
 

-- 
Repository URL: http://hg.python.org/jython