Merge pull request #117 from vmarkovtsev/master

Fix import failure on Python 3.7

Author: juanjux

.travis.yml

@@ -1,5 +1,6 @@
 language: python
 sudo: true
+dist: xenial
 services:
   - docker
 cache:
@@ -8,6 +9,7 @@ cache:
 python:
   - "3.5"
   - "3.6"
+  - "3.7"
 install:
   - wget https://github.com/bblfsh/client-python/releases/download/v2.2.1/protobuf-python_3.4.1-1_amd64.deb
   - sudo dpkg -i protobuf-python_3.4.1-1_amd64.deb

setup.py

@@ -1,3 +1,4 @@
+import fileinput
 import logging
 import os
 import pkg_resources
@@ -81,7 +82,8 @@ def cpr(src, dst):
     src = src.format(**FORMAT_ARGS)
     dst = dst.format(**FORMAT_ARGS)
     log.info("cp -pr %s %s", src, dst)
-    shutil.rmtree(dst, ignore_errors=True)
+    if os.path.isdir(dst):
+        shutil.rmtree(dst)
     shutil.copytree(src, dst, symlinks=True)
 
 
@@ -161,15 +163,22 @@ def protoc(python_out, proto_file, *extra, grpc=True):
         log.info("%s -m grpc.tools.protoc " + " ".join(main_args), sys.executable)
         protoc_module.main(main_args)
 
+    sdk_root = j("bblfsh", "gopkg", "in", "bblfsh", "sdk", SDK_MAJOR)
     # SDK
-    protoc(j("bblfsh", "gopkg", "in", "bblfsh", "sdk", SDK_MAJOR, "protocol"),
+    protoc(j(sdk_root, "protocol"),
            j("gopkg.in", "bblfsh", "sdk." + SDK_MAJOR, "protocol", "generated.proto"),
            "-I" + j("gopkg.in", "bblfsh", "sdk." + SDK_MAJOR, "protocol"))
     # UAST
     protoc("bblfsh", j("github.com", "gogo", "protobuf", "gogoproto", "gogo.proto"),
            grpc=False)
     protoc("bblfsh", j("gopkg.in", "bblfsh", "sdk." + SDK_MAJOR, "uast", "generated.proto"),
            grpc=False)
+    for line in fileinput.input([j(sdk_root, "protocol", "generated_pb2.py"),
+                                 j(sdk_root, "uast", "generated_pb2.py")],
+                                inplace=True):
+        print(line.replace("from github.com.gogo.protobuf.gogoproto import",
+                           "from bblfsh.github.com.gogo.protobuf.gogoproto import"),
+              end="")
 
 
 def do_get_deps():