[Python-checkins] r77807 - in python/branches/release26-maint: Lib/UserDict.py Lib/abc.py Lib/test/test_abc.py Misc/NEWS
benjamin.peterson
python-checkins at python.org
Thu Jan 28 02:31:13 CET 2010
Author: benjamin.peterson
Date: Thu Jan 28 02:31:13 2010
New Revision: 77807
Log:
revert r77790. it requires a new-style class change
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Lib/UserDict.py
python/branches/release26-maint/Lib/abc.py
python/branches/release26-maint/Lib/test/test_abc.py
python/branches/release26-maint/Misc/NEWS
Modified: python/branches/release26-maint/Lib/UserDict.py
==============================================================================
--- python/branches/release26-maint/Lib/UserDict.py (original)
+++ python/branches/release26-maint/Lib/UserDict.py Thu Jan 28 02:31:13 2010
@@ -1,6 +1,6 @@
"""A more or less complete user-defined wrapper around dictionary objects."""
-class UserDict(object):
+class UserDict:
def __init__(self, dict=None, **kwargs):
self.data = {}
if dict is not None:
Modified: python/branches/release26-maint/Lib/abc.py
==============================================================================
--- python/branches/release26-maint/Lib/abc.py (original)
+++ python/branches/release26-maint/Lib/abc.py Thu Jan 28 02:31:13 2010
@@ -96,7 +96,7 @@
def register(cls, subclass):
"""Register a virtual subclass of an ABC."""
- if not isinstance(subclass, type):
+ if not isinstance(cls, type):
raise TypeError("Can only register classes")
if issubclass(subclass, cls):
return # Already a subclass
Modified: python/branches/release26-maint/Lib/test/test_abc.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_abc.py (original)
+++ python/branches/release26-maint/Lib/test/test_abc.py Thu Jan 28 02:31:13 2010
@@ -149,11 +149,6 @@
self.assertRaises(RuntimeError, C.register, A) # cycles not allowed
C.register(B) # ok
- def test_register_non_class(self):
- class A(object):
- __metaclass__ = abc.ABCMeta
- self.assertRaises(TypeError, A.register, 4)
-
def test_registration_transitiveness(self):
class A:
__metaclass__ = abc.ABCMeta
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Thu Jan 28 02:31:13 2010
@@ -58,8 +58,6 @@
file position to the given argument, which goes against the tradition of
ftruncate() and other truncation APIs. Patch by Pascal Chambon.
-- Issue #7792: Registering non-classes to ABCs raised an obscure error.
-
- Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when
the release file is empty.
More information about the Python-checkins
mailing list