Merge pull request #234 from graingert/move-to-flit

Author: graingert

.pre-commit-config.yaml

@@ -40,3 +40,14 @@ repos:
     hooks:
       - id: prettier
         args: [--prose-wrap=always, --print-width=88]
+
+  - repo: https://github.com/myint/autoflake
+    rev: v1.4
+    hooks:
+      - id: autoflake
+        args:
+          - --in-place
+          - --remove-all-unused-imports
+          - --expand-star-imports
+          - --remove-duplicate-keys
+          - --remove-unused-variables

CHANGELOG.rst

@@ -1,7 +1,8 @@
 0.8.1 (unreleased)
 ==================
 
-- Nothing changed yet.
+- move all code under the ``modernize`` namespace.
+- use flit to create PyPI distributions.
 
 
 0.8.0 (2020-09-27)

MANIFEST.in

@@ -305,7 +305,7 @@ Opt-in
 To specify an opt-in fixer while also running all the default fixers, make sure
 to specify the ``-f default`` or ``--fix=default`` option, e.g.::
 
-    python -m modernize -f default -f libmodernize.fixes.fix_open
+    python -m modernize -f default -f modernize.fixes.fix_open
 
 .. attribute:: classic_division
 

docs/fixers.rst

@@ -42,11 +42,11 @@ A note about handling text literals
   along with Python 2.
 - Alternatively, there is the ``--six-unicode`` flag which will wrap Unicode
   literals with the six helper function ``six.u()`` using the
-  ``libmodernize.fixes.fix_unicode`` fixer. This is useful if you want
+  ``modernize.fixes.fix_unicode`` fixer. This is useful if you want
   to support Python 3.1 and Python 3.2 without bigger changes.
 - The last alternative is the ``--future-unicode`` flag which
   imports the ``unicode_literals`` from the ``__future__`` module using the
-  ``libmodernize.fixes.fix_unicode_future`` fixer.
+  ``modernize.fixes.fix_unicode_future`` fixer.
   This requires Python 2.6 and later, and will require that you
   mark bytestrings with ``b''`` and native strings in ``str('')``
   or something similar that survives the transformation.

docs/index.rst

@@ -0,0 +1,7 @@
+"""
+A hack on top of fissix (lib2to3 fork) for modernizing code for hybrid codebases.
+"""
+
+from __future__ import generator_stop
+
+__version__ = "0.8.1.dev0"

modernize.py

@@ -1,6 +1,8 @@
 from __future__ import generator_stop
 
-from libmodernize import main
+import sys
+
+from .main import main
 
 if __name__ == "__main__":
-    main.main()
+    sys.exit(main())

modernize/__init__.py

@@ -28,31 +28,29 @@
     "fissix.fixes.fix_xreadlines",
 }
 
-lib2to3_fix_names = fissix_fix_names
-
 # fixes that involve using six
 six_fix_names = {
-    "libmodernize.fixes.fix_basestring",
-    "libmodernize.fixes.fix_dict_six",
-    "libmodernize.fixes.fix_filter",
-    "libmodernize.fixes.fix_imports_six",
-    "libmodernize.fixes.fix_itertools_six",
-    "libmodernize.fixes.fix_itertools_imports_six",
-    "libmodernize.fixes.fix_input_six",
-    "libmodernize.fixes.fix_int_long_tuple",
-    "libmodernize.fixes.fix_map",
-    "libmodernize.fixes.fix_metaclass",
-    "libmodernize.fixes.fix_raise_six",
-    "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",
+    "modernize.fixes.fix_basestring",
+    "modernize.fixes.fix_dict_six",
+    "modernize.fixes.fix_filter",
+    "modernize.fixes.fix_imports_six",
+    "modernize.fixes.fix_itertools_six",
+    "modernize.fixes.fix_itertools_imports_six",
+    "modernize.fixes.fix_input_six",
+    "modernize.fixes.fix_int_long_tuple",
+    "modernize.fixes.fix_map",
+    "modernize.fixes.fix_metaclass",
+    "modernize.fixes.fix_raise_six",
+    "modernize.fixes.fix_unicode",
+    "modernize.fixes.fix_unicode_type",
+    "modernize.fixes.fix_urllib_six",
+    "modernize.fixes.fix_unichr",
+    "modernize.fixes.fix_xrange_six",
+    "modernize.fixes.fix_zip",
 }
 
 # Fixes that are opt-in only.
 opt_in_fix_names = {
-    "libmodernize.fixes.fix_classic_division",
-    "libmodernize.fixes.fix_open",
+    "modernize.fixes.fix_classic_division",
+    "modernize.fixes.fix_open",
 }

__main__.py renamed to modernize/__main__.py

@@ -2,13 +2,11 @@
 
 from fissix import fixer_base, fixer_util
 
-import libmodernize
-
 
 class FixBasestring(fixer_base.BaseFix):
     BM_compatible = True
     PATTERN = """'basestring'"""
 
     def transform(self, node, results):
-        libmodernize.touch_import(None, "six", node)
+        fixer_util.touch_import(None, "six", node)
         return fixer_util.Name("six.string_types", prefix=node.prefix)