[Python-checkins] r77040 - in python/branches/release26-maint: Lib/multiprocessing/process.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Dec 24 16:21:47 2009
New Revision: 77040

Log:
Merged revisions 77038 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77038 | benjamin.peterson | 2009-12-24 09:19:40 -0600 (Thu, 24 Dec 2009) | 1 line
  
  allow Process name to be unicode #7571
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/multiprocessing/process.py

Modified: python/branches/release26-maint/Lib/multiprocessing/process.py
==============================================================================
--- python/branches/release26-maint/Lib/multiprocessing/process.py	(original)
+++ python/branches/release26-maint/Lib/multiprocessing/process.py	Thu Dec 24 16:21:47 2009
@@ -138,7 +138,7 @@
 
     @name.setter
     def name(self, name):
-        assert isinstance(name, str), 'name must be a string'
+        assert isinstance(name, basestring), 'name must be a string'
         self._name = name
 
     @property