diff options
| author | Raymond Hettinger <python@rcn.com> | 2008-01-15 05:39:59 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2008-01-15 05:39:59 (GMT) |
| commit | cbf8f6cffb94123ec964155aa02124e4f838b5e1 (patch) | |
| tree | ad1443fafaa358d7a949845e47c34d425f8ed17a | |
| parent | f233b0c454cbdca54c510f7b77fb3a64dcd05f1e (diff) | |
| download | cpython-cbf8f6cffb94123ec964155aa02124e4f838b5e1.zip cpython-cbf8f6cffb94123ec964155aa02124e4f838b5e1.tar.gz cpython-cbf8f6cffb94123ec964155aa02124e4f838b5e1.tar.bz2 | |
Temporarily revert 59967 until GC can be added.
| -rw-r--r-- | Lib/test/test_structseq.py | 6 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Objects/structseq.c | 2 |
4 files changed, 1 insertions, 12 deletions
diff --git a/Lib/test/test_structseq.py b/Lib/test/test_structseq.py index 02c2f72..83c7ccf 100644 --- a/Lib/test/test_structseq.py +++ b/Lib/test/test_structseq.py @@ -26,12 +26,6 @@ class StructSeqTest(unittest.TestCase): for i in xrange(-len(t), len(t)-1): self.assertEqual(t[i], astuple[i]) - def test_tuple_subclass(self): - # Issue 1820 - t = time.localtime() - s = ('%s ' * len(t)) % t # This used to fail because t was not a tuple subclass - self.assert_(isinstance(t, tuple)) - def test_repr(self): t = time.gmtime() self.assert_(repr(t)) @@ -686,7 +686,6 @@ Wojtek Walczak Charles Waldman Richard Walker Larry Wall -Leif Walsh Greg Ward Barry Warsaw Steve Waterbury @@ -975,10 +975,6 @@ Library Extension Modules ----------------- -- Issue 1820: structseq objects did not subclass from tuple so they did - not pass isinstance(t, tuple) tests and they could not be passed to - the % string formatting operator as an input tuple. - - _winreg's HKEY object has gained __enter__ and __exit__ methods to support the context manager protocol. The _winreg module also gained a new function ``ExpandEnvironmentStrings`` to expand REG_EXPAND_SZ keys. diff --git a/Objects/structseq.c b/Objects/structseq.c index 6b1b590..b6126ba 100644 --- a/Objects/structseq.c +++ b/Objects/structseq.c @@ -460,7 +460,7 @@ static PyTypeObject _struct_sequence_template = { structseq_methods, /* tp_methods */ NULL, /* tp_members */ 0, /* tp_getset */ - &PyTuple_Type, /* tp_base */ + 0, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ |