Update Python integration

2bfe9d70079b8d6191634bc2fb641747c04e6d83
commit 2bfe9d70079b8d6191634bc2fb641747c04e6d83
diff --git a/.travis.yml b/.travis.yml
@@ -4,22 +4,22 @@ node_js:
   - 6
   - 8
   - 9
+env:
+  - PYTHON_VERSION=2.7.11
+  - PYTHON_VERSION=3.6.3
 cache:
   yarn: true
   directories:
   - node_modules
-  - /home/travis/.pyenv_cache
+  - /home/travis/.pyenv
 install:
   - yarn install
 before_install:
-  - export PYTHON_BUILD_CACHE_PATH="/home/travis/.pyenv_cache"
   - curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash
   - export PATH="/home/travis/.pyenv/bin:$PATH"
   - eval "$(pyenv init -)"
-  - eval "$(pyenv virtualenv-init -)"
-  - pyenv install -s 2.7.11
-  - pyenv install -s 3.6.3
-  - pyenv global 2.7.11 3.6.3
+  - pyenv install -s $PYTHON_VERSION
+  - pyenv global $PYTHON_VERSION
 script:
   - yarn lint
   - yarn test -- --runInBand
diff --git a/package.json b/package.json
@@ -7,8 +7,8 @@
   "author": "Lucas Azzola <@azz>",
   "license": "MIT",
   "files": [
-    "src",
-    "vendor"
+    "python",
+    "src"
   ],
   "engines": {
     "node": ">=6"

diff --git a/vendor/python/astexport.py → python/patched/astexport.py b/vendor/python/astexport.py → python/patched/astexport.py
@@ -1,31 +1,8 @@
 import ast
-import fileinput
-import json
+import tokenize
 
-import asttokens
 
-
-def export_json(atok, pretty_print=False):
-    dict = export_dict(atok)
-    dict['comments'] = [{
-            'ast_type': 'comment',
-            'value': token.string,
-            'start': token.startpos,
-            'end': token.endpos,
-        } for token in atok.tokens if token.type == 57]
-    return json.dumps(
-        dict,
-        indent=4 if pretty_print else None,
-        sort_keys=True,
-        separators=(",", ": ") if pretty_print else (",", ":")
-    )
-
-
-def export_dict(atok):
-    return DictExportVisitor(atok).visit(atok.tree)
-
-
-class DictExportVisitor:
+class DictExportVisitor(object):
     ast_type_field = "ast_type"
 
     def __init__(self, atok):
@@ -102,21 +79,17 @@ def visit_field_Num_n(self, val):
             }
 
 
-def parse(source):
-    assert (isinstance(source, str))
-
-    atok = asttokens.ASTTokens(source, parse=True)
-
-    return atok
-
-
-def main():
-    source = "".join(fileinput.input())
-
-    tree = parse(source)
-    json = export_json(tree, True)
-    print(json)
+def export(atok):
+    exported_ast = DictExportVisitor(atok).visit(atok.tree)
 
+    exported_ast['comments'] = [
+        {
+            'ast_type': 'comment',
+            'value': token.string,
+            'start': token.startpos,
+            'end': token.endpos,
+        }
+        for token in atok.tokens if token.type == tokenize.COMMENT
+    ]
 
-if __name__ == '__main__':
-    main()
+    return exported_ast
diff --git a/python/prettier/__init__.py b/python/prettier/__init__.py
@@ -0,0 +1,7 @@
+import os
+import sys
+
+base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+sys.path.insert(0, os.path.join(base_dir, 'vendor'))
+sys.path.insert(0, os.path.join(base_dir, 'patched'))
diff --git a/python/prettier/parser.py b/python/prettier/parser.py
@@ -0,0 +1,22 @@
+import json
+import sys
+
+import astexport
+import asttokens
+
+
+def main():
+    source = sys.stdin.read()
+    atok = asttokens.ASTTokens(source, parse=True)
+
+    exported_ast = astexport.export(atok)
+    print(json.dumps(
+        exported_ast,
+        indent=4,
+        sort_keys=True,
+        separators=(',', ': '),
+    ))
+
+
+if __name__ == '__main__':
+    main()
diff --git a/vendor/python/asttokens/__init__.py → python/vendor/asttokens/__init__.py b/vendor/python/asttokens/__init__.py → python/vendor/asttokens/__init__.py
diff --git a/vendor/python/asttokens/asttokens.py → python/vendor/asttokens/asttokens.py b/vendor/python/asttokens/asttokens.py → python/vendor/asttokens/asttokens.py
diff --git a/vendor/python/asttokens/line_numbers.py → python/vendor/asttokens/line_numbers.py b/vendor/python/asttokens/line_numbers.py → python/vendor/asttokens/line_numbers.py
diff --git a/vendor/python/asttokens/mark_tokens.py → python/vendor/asttokens/mark_tokens.py b/vendor/python/asttokens/mark_tokens.py → python/vendor/asttokens/mark_tokens.py
diff --git a/vendor/python/asttokens/util.py → python/vendor/asttokens/util.py b/vendor/python/asttokens/util.py → python/vendor/asttokens/util.py
diff --git a/vendor/python/six.py → python/vendor/six.py b/vendor/python/six.py → python/vendor/six.py
diff --git a/src/parser.js b/src/parser.js
@@ -3,31 +3,23 @@
 const spawnSync = require("child_process").spawnSync;
 const path = require("path");
 
-function parseText(text, pythonExecutable) {
-  const executionResult = spawnSync(
-    pythonExecutable,
-    [path.join(__dirname, "../vendor/python/astexport.py")],
-    {
-      input: text
-    }
-  );
-
-  const error = executionResult.stderr.toString();
-
-  if (error) {
-    throw new Error(error);
+function parse(text) {
+  const executionResult = spawnSync("python", ["-m", "prettier.parser"], {
+    env: {
+      PYTHONPATH: [
+        path.join(__dirname, "../python"),
+        process.env.PYTHONPATH
+      ].join(path.delimiter)
+    },
+    input: text
+  });
+
+  if (executionResult.status) {
+    throw new Error(executionResult.stderr.toString());
   }
 
-  return executionResult;
-}
-
-function parse(text, parsers, opts) {
-  const pythonExectuable = `python${opts.pythonVersion == "2" ? "" : "3"}`;
-  const executionResult = parseText(text, pythonExectuable);
-
   const res = executionResult.stdout.toString();
-  const ast = JSON.parse(res);
-  return ast;
+  return JSON.parse(res);
 }
 
 module.exports = parse;