Merge pull request #32 from juanjux/fix/propagate_errors

Return more concrete AST parsing errors

Author: juanjux

Dockerfile.build.tpl

@@ -4,8 +4,8 @@ RUN mkdir -p /opt/driver/src && \
     adduser $BUILD_USER -u $BUILD_UID -D -h /opt/driver/src
 
 RUN apk add --no-cache --update python python-dev python3 python3-dev py-pip py2-pip git build-base bash
-RUN pip3 install six pydetector==0.5.7 \
+RUN pip3 install six pydetector==0.6.1 \
     git+https://github.com/python/mypy.git@0bb2d1680e8b9522108b38d203cb73021a617e64#egg=mypy-lang
-RUN pip2 install six pydetector==0.5.7
+RUN pip2 install six pydetector==0.6.1
 
 WORKDIR /opt/driver/src

Dockerfile.tpl

@@ -2,8 +2,8 @@ FROM alpine:3.6
 MAINTAINER source{d}
 
 RUN apk add --no-cache --update python python3 py-pip py2-pip git
-RUN pip3 install six pydetector==0.5.7
-RUN pip2 install six pydetector==0.5.7
+RUN pip3 install six pydetector==0.6.1
+RUN pip2 install six pydetector==0.6.1
 
 ADD build /opt/driver/bin
 ADD native/python_package /tmp/python_driver

native/python_package/python_driver/requestprocessor.py

@@ -133,7 +133,11 @@ def process_request(self, request: RawRequest) -> None:
                 elif version in (1, 2) and codeinfo['py2ast']:
                     ast = codeinfo['py2ast']
                 else:
-                    raise Exception('Could not determine Python version')
+                    raise Exception(
+                        'Errors produced trying to get an AST for both Python versions' +
+                        '\n------ Python2 errors:\n%s' % codeinfo['py2_ast_errors'] +
+                        '\n------ Python3 errors:\n%s' % codeinfo['py3_ast_errors']
+                    )
 
                 if not ast:
                     raise Exception('Empty AST generated from non empty code')

native/python_package/requirements.txt

@@ -1,4 +1,4 @@
 msgpack-python==0.4.8
-pydetector==0.5.7
+pydetector==0.6.1
 -e git+git://github.com/python/mypy.git@0bb2d1680e8b9522108b38d203cb73021a617e64#egg=mypy-lang
 typed-ast==1.0.1

native/python_package/setup.py

@@ -32,7 +32,7 @@
     },
     install_requires=[
         "msgpack-python==0.4.8",
-        "pydetector==0.5.7"
+        "pydetector==0.6.1"
     ],
     classifiers=[
         "Development Status :: 4 - Beta",