VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-05-25 17:58:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'interpreter-api' into dev

Browse Source 
Conflicts:
	jedi/__init__.py
	test/test_regression.py

See: #145
This commit is contained in:
Takafumi Arakaki
2013-05-18 22:28:56 +02:00
parent 700f685f59 3d6ef88795
commit 5f2477d5bf
8 changed files with 328 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/__init__.py
+1 -1
View File
@@ -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