mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-23 18:04:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Raymond Hettinger 2014-06-24 15:21:24 -07:00
commit f2bbb651a8
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/collections/__init__.py
View File

@ -352,6 +352,7 @@ def namedtuple(typename, field_names, verbose=False, rename=False):
if isinstance(field_names, str): if isinstance(field_names, str):
field_names = field_names.replace(',', ' ').split() field_names = field_names.replace(',', ' ').split()
field_names = list(map(str, field_names)) field_names = list(map(str, field_names))
typename = str(typename)
if rename: if rename:
seen = set() seen = set()
for index, name in enumerate(field_names): for index, name in enumerate(field_names):
@ -362,6 +363,8 @@ def namedtuple(typename, field_names, verbose=False, rename=False):
field_names[index] = '_%d' % index field_names[index] = '_%d' % index
seen.add(name) seen.add(name)
for name in [typename] + field_names: for name in [typename] + field_names:
if type(name) != str:
raise TypeError('Type names and field names must be strings')
if not name.isidentifier(): if not name.isidentifier():
raise ValueError('Type names and field names must be valid ' raise ValueError('Type names and field names must be valid '
'identifiers: %r' % name) 'identifiers: %r' % name)