[Python-checkins] cpython (2.7): Issue #13938: 2to3 converts StringTypes to a tuple. Patch from Mark Hammond.

[robert.collins]

https://hg.python.org/cpython/rev/ce34c78ebf65
changeset:   97008:ce34c78ebf65
branch:      2.7
parent:      96993:b2f4d8377bce
user:        Robert Collins <rbtcollins at hp.com>
date:        Thu Jul 23 06:19:18 2015 +1200
summary:
  Issue #13938: 2to3 converts StringTypes to a tuple. Patch from Mark Hammond.

files:
  Lib/lib2to3/fixes/fix_types.py   |  2 +-
  Lib/lib2to3/tests/test_fixers.py |  4 ++++
  Misc/NEWS                        |  2 ++
  3 files changed, 7 insertions(+), 1 deletions(-)


diff --git a/Lib/lib2to3/fixes/fix_types.py b/Lib/lib2to3/fixes/fix_types.py
--- a/Lib/lib2to3/fixes/fix_types.py
+++ b/Lib/lib2to3/fixes/fix_types.py
@@ -42,7 +42,7 @@
         'NotImplementedType' : 'type(NotImplemented)',
         'SliceType' : 'slice',
         'StringType': 'bytes', # XXX ?
-        'StringTypes' : 'str', # XXX ?
+        'StringTypes' : '(str,)', # XXX ?
         'TupleType': 'tuple',
         'TypeType' : 'type',
         'UnicodeType': 'str',
diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py
--- a/Lib/lib2to3/tests/test_fixers.py
+++ b/Lib/lib2to3/tests/test_fixers.py
@@ -3263,6 +3263,10 @@
         a = """type(None)"""
         self.check(b, a)
 
+        b = "types.StringTypes"
+        a = "(str,)"
+        self.check(b, a)
+
 class Test_idioms(FixerTestCase):
     fixer = "idioms"
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,6 +34,8 @@
 Library
 -------
 
+- Issue #13938: 2to3 converts StringTypes to a tuple. Patch from Mark Hammond.
+
 - Issue #24611: Fixed compiling the posix module on non-Windows platforms
   without mknod() or makedev() (e.g. on Unixware).
 

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