[pypy-svn] r14052 - pypy/branch/dist-2.4.1/lib-python/modified-2.4.1

[nik at codespeak.net]

Author: nik
Date: Fri Jul  1 19:52:15 2005
New Revision: 14052

Added:
   pypy/branch/dist-2.4.1/lib-python/modified-2.4.1/warnings.py
      - copied, changed from r14047, pypy/branch/dist-2.4.1/lib-python/2.4.1/warnings.py
Log:
Modified warnings module according to previous modifications from 2.3.4


Copied: pypy/branch/dist-2.4.1/lib-python/modified-2.4.1/warnings.py (from r14047, pypy/branch/dist-2.4.1/lib-python/2.4.1/warnings.py)
==============================================================================
--- pypy/branch/dist-2.4.1/lib-python/2.4.1/warnings.py	(original)
+++ pypy/branch/dist-2.4.1/lib-python/modified-2.4.1/warnings.py	Fri Jul  1 19:52:15 2005
@@ -141,7 +141,7 @@
     assert action in ("error", "ignore", "always", "default", "module",
                       "once"), "invalid action: %r" % (action,)
     assert isinstance(message, basestring), "message must be a string"
-    assert isinstance(category, types.ClassType), "category must be a class"
+    #assert isinstance(category, types.ClassType), "category must be a class"
     assert issubclass(category, Warning), "category must be a Warning subclass"
     assert isinstance(module, basestring), "module must be a string"
     assert isinstance(lineno, int) and lineno >= 0, \
@@ -243,8 +243,7 @@
             cat = getattr(m, klass)
         except AttributeError:
             raise _OptionError("unknown warning category: %r" % (category,))
-    if (not isinstance(cat, types.ClassType) or
-        not issubclass(cat, Warning)):
+    if not issubclass(cat, Warning): # or not isinstance(cat, types.ClassType):
         raise _OptionError("invalid warning category: %r" % (category,))
     return cat