extras dir, wip #702 cleanup step for dicts indents

fixabsoluteimports.py → extras/fixabsoluteimports.py

@@ -87,7 +87,7 @@ def clean_import(package, import_path):
 
 
 if __name__ == '__main__':
-    for args in os.walk('misago'):
+    for args in os.walk('../misago'):
         walk_directory(*args)
 
     print "\nDone! Don't forget to run isort to fix imports ordering!"

extras/fixdictsformatting.py

@@ -0,0 +1,105 @@
+from __future__ import unicode_literals
+
+import sys
+
+from lib2to3.pytree import Node, Leaf
+from lib2to3.fixer_util import token, syms
+
+from yapf.yapflib import pytree_utils
+
+from django.utils import six
+
+
+def fix_formatting(filesource):
+    if not ('{'  in filesource and ('[' in filesource or '(' in filesource)):
+        return filesource
+
+    tree = pytree_utils.ParseCodeToTree(filesource)
+    for node in tree.children:
+        walk_tree(node, node.children)
+    return six.text_type(tree)
+
+
+def walk_tree(node, children):
+    for item in children:
+        if item.type == syms.dictsetmaker:
+            walk_dict_tree(item, item.children)
+        else:
+            walk_tree(item, item.children)
+
+
+def walk_dict_tree(node, children):
+    for item in children:
+        prev = item.prev_sibling
+        if isinstance(prev, Leaf) and prev.value == ':':
+            if isinstance(item, Leaf):
+                if six.text_type(item).startswith("\n"):
+                    # first case: intended string
+                    item.replace(Leaf(
+                        item.type,
+                        item.value,
+                        prefix=' ',
+                    ))
+            elif six.text_type(item).strip()[0] in ('[', '{'):
+                walk_tree(item, item.children)
+            else:
+                walk_dedent_tree(item, item.children)
+
+
+def walk_dedent_tree(node, children):
+    for item in children:
+        prev = item.prev_sibling
+        if not prev:
+            if isinstance(item, Leaf) and six.text_type(item).startswith("\n"):
+                # first case: intended string
+                item.replace(Leaf(
+                    item.type,
+                    item.value,
+                    prefix=' ',
+                ))
+        elif isinstance(item, Node):
+            for subitem in item.children[1:]:
+                walk_dedent_tree_node(subitem, subitem.children)
+
+
+def walk_dedent_tree_node(node, children):
+    if six.text_type(node).startswith("\n"):
+        if isinstance(node, Leaf):
+            prev = node.prev_sibling
+            is_followup = prev and prev.type == token.STRING and node.type == token.STRING
+            if is_followup:
+                new_prefix = "\n%s" % (' ' * (len(prev.prefix.lstrip("\n")) / 4 * 4))
+                node.replace(Leaf(
+                    node.type,
+                    "%s\n%s" % (node.value, (' ' * ((len(prev.prefix.lstrip("\n")) / 4 - 1) * 4))),
+                    prefix=new_prefix,
+                ))
+            else:
+                node.replace(Leaf(
+                    node.type,
+                    node.value,
+                    prefix=node.prefix[:-4],
+                ))
+        else:
+            for item in children:
+                walk_dedent_tree_node(item, item.children)
+    elif isinstance(node, Leaf):
+        if node.type == token.STRING:
+            prev = node.prev_sibling
+            next = node.next_sibling
+
+            is_opening = prev is None and six.text_type(node.parent.parent).strip()[0] == '('
+            has_followup = next and next.type == token.STRING
+
+            if is_opening and has_followup:
+                new_prefix = "\n%s" % (' ' * (len(next.prefix.lstrip("\n")) / 4 * 4))
+
+                node.replace(Leaf(
+                    node.type,
+                    node.value,
+                    prefix=new_prefix,
+                ))
+    else:
+        for item in children:
+            walk_dedent_tree_node(item, item.children)
+

fixrelativeimports.py → extras/fixrelativeimports.py

@@ -45,8 +45,9 @@ def clean_import(package, match):
 
     return '.'.join(import_path)
 
+
 if __name__ == '__main__':
-    for args in os.walk('misago'):
+    for args in os.walk('../misago'):
         walk_directory(*args)
 
     print "\nDone! Don't forget to run isort to fix imports ordering!"

extras/utils.py

@@ -0,0 +1,7 @@
+import tokenize
+
+from django.utils import six
+
+
+def generate_tokens(filesource):
+    return list(tokenize.generate_tokens(six.StringIO(filesource).readline))

pycodestyle.py

@@ -0,0 +1,40 @@
+"""
+Code style cleanups done after yapf
+"""
+import argparse
+import os
+
+from extras import fixdictsformatting
+
+
+CLEANUPS = [
+    fixdictsformatting,
+]
+
+
+def walk_directory(root, dirs, files):
+    for filename in files:
+        if filename.lower().endswith('.py'):
+            with open(os.path.join(root, filename), 'r') as f:
+                filesource = f.read()
+
+            org_source = filesource
+            if 'migrate_settings_group' not in filesource:
+                continue
+
+            for cleanup in CLEANUPS:
+                filesource = cleanup.fix_formatting(filesource)
+
+            if org_source != filesource:
+                print '====' * 8
+                print os.path.join(root, filename)
+                print ''
+                print filesource
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('path', nargs='?', default='./')
+
+    for args in os.walk(parser.parse_args().path):
+        walk_directory(*args)