handle syntax errors correctly; add syntax error test

Signed-off-by: Denys Smirnov <[email protected]>

Author: Denys Smirnov

Gopkg.lock

@@ -3,7 +3,7 @@
 
 [[constraint]]
   name = "gopkg.in/bblfsh/sdk.v2"
-  version = "v2.4.x"
+  version = "v2.5.x"
 
 [prune]
   go-tests = true

Gopkg.toml

@@ -0,0 +1,3 @@
+def testfnc1(a, b):
+    = b
+    return 1

fixtures/_syntax_error.py

@@ -135,22 +135,26 @@ def process_request(self, request: RawRequest) -> None:
                 codeinfo = resdict['<code_string>']
                 version  = codeinfo['version']
 
+                failed = False
+
                 if version in (3, 6) and codeinfo['py3ast']:
                     orig_ast = codeinfo['py3ast']["PY3AST"]
                 elif version in (1, 2) and codeinfo['py2ast']:
                     orig_ast = codeinfo['py2ast']["PY2AST"]
                 else:
-                    raise Exception(
+                    failed = True
+                    self.errors = [
                         '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 orig_ast:
-                    raise Exception('Empty AST generated from non empty code')
-                ast = AstImprover(code, orig_ast).parse()
-                if not ast:
-                    raise Exception('Empty AST generated from non empty code')
+                    ]
+
+                if not failed:
+                    if not orig_ast:
+                        raise Exception('Empty AST generated from non empty code')
+                    ast = AstImprover(code, orig_ast).parse()
+                    if not ast:
+                        raise Exception('Empty AST generated from non empty code')
             else:
                 # Module with empty code (like __init__.py) return a module-only AST
                 # since this would still have semantic meaning for Python
@@ -162,16 +166,21 @@ def process_request(self, request: RawRequest) -> None:
                 version = 3
 
             response = Response({
-                'status'           : 'ok',
                 'errors'           : self.errors,
-                'ast'              : {"PY%dAST" % version: ast},
                 'metadata'         : {
                     'language'         : 'python',
                     'language_version' : version,
                     'driver'           : 'python23:%s' % __version__,
                 }
             })
 
+            if failed:
+                response['status'] = 'error'
+                response['ast'] = None
+            else:
+                response['status'] = 'ok'
+                response['ast'] = {"PY%dAST" % version: ast}
+
             if filepath:
                 response['filepath'] = filepath
 

native/python_package/python_driver/requestprocessor.py

@@ -103,7 +103,7 @@ def _check_reply_dict(self, response: Response, has_errors: bool=False) -> None:
         status = response.get('status')
 
         if has_errors:
-            assert status in ('ok', 'fatal')
+            assert status in ('error', 'fatal')
             errors = response.get('errors', list)
             self.assertIsInstance(errors, list)
             self.assertGreater(len(errors), 0)