[DEV_TOOLS, GIT, PACKAGING] Modify all components based on the rename...

.gitattributes

@@ -9,7 +9,7 @@
 #
 *.py text diff=python
 *.in text
-*.ast text
+*.tree text
 
 # Documents
 *.doc diff=astextplain

.gitignore

@@ -22,7 +22,7 @@ venv
 *.sublime*
 
 # Auto-generated, include according to files in the directory.
-py2c/ast/python.py
+py2c/tree/python.py
 
 #-----------------------------------------------------------
 # Beyond this is Github's .gitignore for Python projects.

MANIFEST.in

@@ -1,2 +1,2 @@
 include README.md
-include py2c/ast/*.ast
+include py2c/tree/*.tree

dev_tools/TODO

@@ -32,14 +32,13 @@ Testing:
    Allow for each test to be describe uniquely shown in a good-looking way,
    to make writing tests feel worthwhile.
 
-AST and AST Generator:
+Tree and Node Generator:
  ✔ Implement. @done (12-December-2014 05:03PM)
- - Remove dependency on ply of ast_gen.py (for parsing files). @contrib @moderate
-   This is really a might-do as since ast_gen.py has been moved into the
+ - Remove dependency on ply of node_gen.py (for parsing files). @contrib @moderate
+   This is really a might-do as since node_gen.py has been moved into the
    package, this dependency is not a problem in any way.
- ✔ Allow inheritence of fields in AST definitions. @done (04-January-2015 10:57AM)
+ ✔ Allow inheritence of fields in Node definitions. @done (04-January-2015 10:57AM)
  - Make RecursiveASTVisitor tests more comprehensive. @contrib @easy
- - Move to a "flow" tree for simplifying analysis.
 
 Managers:
  ✔ Implement BaseManager @done (12-December-2014 05:03PM)
@@ -54,7 +53,8 @@ Configuration:
  - Integrate into all components.
 
 Pre-processing:
- ✔ Implement. @done (12-December-2014 05:03PM)
+ ✘ Implement a code to custom Python AST Tree converter. @cancelled (04-January-2015 11:54AM)
+ - Move to a "flow" tree for simplifying analysis.
  - Change tests to only check the specific changes. @contrib @easy
    The tests should not check every single combination, just a unique bunch of
    them, to cover the cases where we make changes.

dev_tools/check_packaging.py

@@ -117,7 +117,7 @@ def basic_installation_checks():
     run_and_report(
         "Check: Is auto-generated file usable? ",
         "No!", "Yes!",
-        sys.executable + " -c 'import py2c.ast.python'", False
+        sys.executable + " -c 'import py2c.tree.python'", False
     )
 
 

dev_tools/cleanup.py

@@ -46,9 +46,9 @@ def should_remove_file(root, name):
         matches_any_pattern(name, FILE_PATTERNS) or
         (
             REMOVE_GENERATED_AST and
-            root.endswith(os.path.join("py2c", "ast")) and
+            root.endswith(os.path.join("py2c", "tree")) and
             name.endswith(".py") and
-            name not in ["__init__.py", "ast_gen.py"]
+            name not in ["__init__.py", "node_gen.py"]
         )
     )
 

dev_tools/tree_printer.py

@@ -7,9 +7,8 @@
 #------------------------------------------------------------------------------
 
 import ast
-import py2c.ast
-
-import py2c.ast.python as py
+from py2c.tree import Node, iter_fields as py_iter_fields
+import py2c.tree.python as py_tree
 
 
 class Indentor(object):
@@ -45,7 +44,7 @@ def write(*args, sep="", end=""):
 def _dump(node, indentor):
     if isinstance(node, (list, tuple)):
         _dump_list(node, indentor)
-    elif isinstance(node, (py2c.ast.AST, ast.AST)):
+    elif isinstance(node, (Node, ast.AST)):
         _dump_node(node, indentor)
     else:
         write(indentor, repr(node))
@@ -73,16 +72,16 @@ def _dump_list(li, indentor):
 
 def _dump_node(node, indentor):
     # Initial header
-    if isinstance(node, py2c.ast.AST):
-        module = "py"
-        iter_fields = py2c.ast.iter_fields
+    if isinstance(node, Node):
+        module = "py_tree"
+        iter_fields = py_iter_fields
     else:
         module = "ast"
         iter_fields = ast.iter_fields
     write(indentor, "{}.{}(".format(module, node.__class__.__name__))
 
     # Should the node be printed inline
-    in_line = isinstance(node, (py.Name, py.NameConstant, ast.Name, ast.NameConstant))
+    in_line = isinstance(node, (py_tree.Name, py_tree.NameConstant, ast.Name, ast.NameConstant))
     length = len(node._fields)
     for i, (name, value) in enumerate(iter_fields(node)):
         with indentor: