bpo-31107: Fix copyreg mangled slot names calculation. (#2989)
This commit is contained in:
parent
778928b0c7
commit
c4c9866064
|
@ -128,7 +128,11 @@ def _slotnames(cls):
|
|||
continue
|
||||
# mangled names
|
||||
elif name.startswith('__') and not name.endswith('__'):
|
||||
names.append('_%s%s' % (c.__name__, name))
|
||||
stripped = c.__name__.lstrip('_')
|
||||
if stripped:
|
||||
names.append('_%s%s' % (stripped, name))
|
||||
else:
|
||||
names.append(name)
|
||||
else:
|
||||
names.append(name)
|
||||
|
||||
|
|
|
@ -16,6 +16,12 @@ class WithWeakref(object):
|
|||
class WithPrivate(object):
|
||||
__slots__ = ('__spam',)
|
||||
|
||||
class _WithLeadingUnderscoreAndPrivate(object):
|
||||
__slots__ = ('__spam',)
|
||||
|
||||
class ___(object):
|
||||
__slots__ = ('__spam',)
|
||||
|
||||
class WithSingleString(object):
|
||||
__slots__ = 'spam'
|
||||
|
||||
|
@ -104,6 +110,10 @@ class CopyRegTestCase(unittest.TestCase):
|
|||
self.assertEqual(copyreg._slotnames(WithWeakref), [])
|
||||
expected = ['_WithPrivate__spam']
|
||||
self.assertEqual(copyreg._slotnames(WithPrivate), expected)
|
||||
expected = ['_WithLeadingUnderscoreAndPrivate__spam']
|
||||
self.assertEqual(copyreg._slotnames(_WithLeadingUnderscoreAndPrivate),
|
||||
expected)
|
||||
self.assertEqual(copyreg._slotnames(___), ['__spam'])
|
||||
self.assertEqual(copyreg._slotnames(WithSingleString), ['spam'])
|
||||
expected = ['eggs', 'spam']
|
||||
expected.sort()
|
||||
|
|
|
@ -598,6 +598,7 @@ David Harrigan
|
|||
Brian Harring
|
||||
Jonathan Hartley
|
||||
Travis B. Hartwell
|
||||
Shane Harvey
|
||||
Larry Hastings
|
||||
Tim Hatch
|
||||
Shane Hathaway
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Fix `copyreg._slotnames()` mangled attribute calculation for classes whose
|
||||
name begins with an underscore. Patch by Shane Harvey.
|
Loading…
Reference in New Issue