Merge branch 'interpreter-api' into dev
Conflicts: jedi/__init__.py test/test_regression.py See: #145
This commit is contained in:
commit
5f2477d5bf
8 files changed
+328
-28
No files matched your search
+1
-1
@@ -42,7 +42,7 @@ import sys
|
||||
# imports and circular imports... Just avoid it:
|
||||
sys.path.insert(0, __path__[0])
|
||||
|
||||
from .api import Script, NotFoundError, set_debug_function, _quick_complete, \
|
||||
from .api import Script, Interpreter, NotFoundError, set_debug_function, \
|
||||
preload_module
|
||||
from . import settings
|
||||
|
||||
|
||||
Reference in new issue
Block a user