mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-28 06:06:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Allow all alphanumeric and underscores in type and field names.

Browse source
This commit is contained in:
Raymond Hettinger 2007-05-21 16:40:10 +00:00
parent 0d6a8ccfb7
commit 767debb6aa
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/collections.py
View file

@ -24,7 +24,7 @@ def NamedTuple(typename, s):
""" """
field_names = s.split() field_names = s.split()
if not ''.join([typename] + field_names).replace('_', '').isalpha(): if not ''.join([typename] + field_names).replace('_', '').isalnum():
raise ValueError('Type names and field names can only contain alphanumeric characters and underscores') raise ValueError('Type names and field names can only contain alphanumeric characters and underscores')
argtxt = ', '.join(field_names) argtxt = ', '.join(field_names)
reprtxt = ', '.join('%s=%%r' % name for name in field_names) reprtxt = ', '.join('%s=%%r' % name for name in field_names)

3
Lib/test/test_collections.py
View file

@ -11,6 +11,9 @@ class TestNamedTuple(unittest.TestCase):
self.assertEqual(Point.__slots__, ()) self.assertEqual(Point.__slots__, ())
self.assertEqual(Point.__module__, __name__) self.assertEqual(Point.__module__, __name__)
self.assertEqual(Point.__getitem__, tuple.__getitem__) self.assertEqual(Point.__getitem__, tuple.__getitem__)
self.assertRaises(ValueError, NamedTuple, 'abc%', 'def ghi')
self.assertRaises(ValueError, NamedTuple, 'abc', 'def g%hi')
NamedTuple('Point0', 'x1 y2') # Verify that numbers are allowed in names
def test_instance(self): def test_instance(self):
Point = NamedTuple('Point', 'x y') Point = NamedTuple('Point', 'x y')