Merge branch 'master' into typeshed

2018-10-02 19:07:59 +02:00
parent ba5abf4700 bd1010bbd2
commit ad83f5419a
13 changed files with 78 additions and 16 deletions
@@ -276,7 +276,7 @@ class Importer(object):
        return sys_path_mod

    def follow(self):
-        if not self.import_path:
+        if not self.import_path or not self._evaluator.infer_enabled:
            return NO_CONTEXTS

        import_names = tuple(