[Python-checkins] cpython (merge 3.4 -> default): merge

[raymond.hettinger]

http://hg.python.org/cpython/rev/2f3a0ad5fe1f
changeset:   91368:2f3a0ad5fe1f
parent:      91358:3fa0d2b297c6
parent:      91367:c238d2899d47
user:        Raymond Hettinger <python at rcn.com>
date:        Tue Jun 24 13:44:39 2014 -0700
summary:
  merge

files:
  Lib/collections/__init__.py |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


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

-- 
Repository URL: http://hg.python.org/cpython