diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:35:38 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:35:38 (GMT) |
commit | 3b3499ba69341a49fc842ce0d4a2f66fcb249a04 (patch) | |
tree | dd97578d333a72ac825c0e7ad64e4367d8dfe248 /Lib/test/test_marshal.py | |
parent | cc4a4842643d6415ca4a449e9d0557cfb029715a (diff) | |
parent | 13925008dc11f2a235627dc8c0440c0ce99171d9 (diff) | |
download | cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.zip cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.tar.gz cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.tar.bz2 |
#11565: Merge with 3.1.
Diffstat (limited to 'Lib/test/test_marshal.py')
-rw-r--r-- | Lib/test/test_marshal.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py index f9b1900..81cf598 100644 --- a/Lib/test/test_marshal.py +++ b/Lib/test/test_marshal.py @@ -194,7 +194,7 @@ class BugsTestCase(unittest.TestCase): # >>> type(loads(dumps(Int()))) # <type 'int'> for typ in (int, float, complex, tuple, list, dict, set, frozenset): - # Note: str sublclasses are not tested because they get handled + # Note: str subclasses are not tested because they get handled # by marshal's routines for objects supporting the buffer API. subtyp = type('subtyp', (typ,), {}) self.assertRaises(ValueError, marshal.dumps, subtyp()) |