VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-07 22:44:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed and simplified flask imports.

Browse Source
This commit is contained in:
Dave Halter
2014-12-07 18:11:05 +01:00
parent db636c35ae
commit e3ab56504e
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jedi/evaluate/imports.py
View File

@@ -462,17 +462,11 @@ class _Importer(object):
# ``flask.ext.foo`` is really ``flask_foo`` or ``flaskext.foo``. # ``flask.ext.foo`` is really ``flask_foo`` or ``flaskext.foo``.
if len(self.import_path) > 2 and self.str_import_path[:2] == ('flask', 'ext'): if len(self.import_path) > 2 and self.str_import_path[:2] == ('flask', 'ext'):
orig_path = tuple(self.import_path) orig_path = tuple(self.import_path)
part = orig_path[2]
pos = (part._line, part._column)
try: try:
self.import_path = ( self.import_path = ('flask_' + str(orig_path[2]),) + orig_path[3:]
pr.Name(FakeSubModule, 'flask_' + str(part), part.parent, pos),
) + orig_path[3:]
return self._real_follow_file_system() return self._real_follow_file_system()
except ModuleNotFound: except ModuleNotFound:
self.import_path = ( self.import_path = ('flaskext',) + orig_path[2:]
pr.Name(FakeSubModule, 'flaskext', part.parent, pos),
) + orig_path[2:]
return self._real_follow_file_system() return self._real_follow_file_system()
return self._real_follow_file_system() return self._real_follow_file_system()
@@ -641,7 +635,7 @@ class _Importer(object):
extname = modname[len('flask_'):] extname = modname[len('flask_'):]
names.append(self._generate_name(extname)) names.append(self._generate_name(extname))
# Now the old style: ``flaskext.foo`` # Now the old style: ``flaskext.foo``
for dir in self._importer.sys_path_with_modifications(): for dir in self.sys_path_with_modifications():
flaskext = os.path.join(dir, 'flaskext') flaskext = os.path.join(dir, 'flaskext')
if os.path.isdir(flaskext): if os.path.isdir(flaskext):
names += self._get_module_names([flaskext]) names += self._get_module_names([flaskext])