Merge pull request #145 from rowillia/add_unichr_fixer

Add a fixer for instances of `unichr`

CHANGELOG.rst

@@ -3,6 +3,7 @@ Unreleased
 
 * Added the opt-in classic_division fixer.
 * Updated the ``dict_six`` fixer to support ``six.viewitems()`` and friends.
+* New fixer for ``unichr``, changed to ``six.unichr``.
 * Documentation corrections.
 
 

docs/fixers.rst

@@ -193,6 +193,11 @@ version of ``six`` is installed.
        from six.moves.urllib.parse import quote_plus
        quote_plus('hello world')
 
+.. 2to3fixer:: unichr
+
+   Changes all reference of :func:`unichr <python2:unichr>` to
+   :data:`six.unichr`.
+
 .. 2to3fixer:: xrange_six
 
    Changes::

libmodernize/fixes/__init__.py

@@ -40,6 +40,7 @@
     'libmodernize.fixes.fix_unicode',
     'libmodernize.fixes.fix_unicode_type',
     'libmodernize.fixes.fix_urllib_six',
+    'libmodernize.fixes.fix_unichr',
     'libmodernize.fixes.fix_xrange_six',
     'libmodernize.fixes.fix_zip',
 ])

libmodernize/fixes/fix_unichr.py

@@ -0,0 +1,19 @@
+from __future__ import absolute_import
+
+from lib2to3 import fixer_base
+from lib2to3.fixer_util import is_probably_builtin
+
+import libmodernize
+
+
+class FixUnichr(fixer_base.ConditionalFix):
+    BM_compatible = True
+
+    skip_on = 'six.moves.unichr'
+    PATTERN = """'unichr'"""
+
+    def transform(self, node, results):
+        if self.should_skip(node):
+            return
+        if is_probably_builtin(node):
+            libmodernize.touch_import(u'six', u'unichr', node)

tests/test_fix_unichr_type.py

@@ -0,0 +1,38 @@
+from __future__ import absolute_import
+
+from utils import check_on_input
+
+
+UNICHR_METHOD_REF = ("""\
+converter = unichr
+""", """\
+from __future__ import absolute_import
+from six import unichr
+converter = unichr
+""")
+
+UNICHR_METHOD_CALL = ("""\
+unichr(42)
+""", """\
+from __future__ import absolute_import
+from six import unichr
+unichr(42)
+""")
+
+UNICHR_USER_CALL = ("""\
+foobar.unichr(42)
+""", """\
+foobar.unichr(42)
+""")
+
+
+def test_unichr_method_ref():
+    check_on_input(*UNICHR_METHOD_REF)
+
+
+def test_unichr_method_call():
+    check_on_input(*UNICHR_METHOD_CALL)
+
+
+def test_unichr_user_call():
+    check_on_input(*UNICHR_USER_CALL)