VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Merge branch 'dev' of github.com:davidhalter/jedi into dev

Browse Source
This commit is contained in:
Dave Halter
2014-04-25 15:03:36 +02:00
parent a6f962f1c2 ecd9470803
commit 289dbc8629
4 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/_compatibility.py
View File

@@ -32,9 +32,7 @@ def find_module_py33(string, path=None):
module_file = None
else:
module_path = loader.get_filename(string)
module_ext = os.path.splitext(module_path)[1]
mode = 'rb' if module_ext in ['.pyc', '.so', '.pyd'] else 'r'
module_file = open(module_path, mode)
module_file = open(module_path, 'rb')
except AttributeError:
# ExtensionLoader has not attribute get_filename, instead it has a
# path attribute that we can use to retrieve the module path

10
jedi/evaluate/imports.py
View File

@@ -331,8 +331,8 @@ class _Importer(object):
deeper_paths.append(new)
return follow_path(directories, deeper_paths)
with open(os.path.join(found_path, '__init__.py')) as f:
content = f.read()
with open(os.path.join(found_path, '__init__.py'), 'rb') as f:
content = common.source_to_unicode(f.read())
# these are strings that need to be used for namespace packages,
# the first one is ``pkgutil``, the second ``pkg_resources``.
options = 'declare_namespace(__name__)', 'extend_path(__path__'
@@ -406,7 +406,7 @@ class _Importer(object):
# is a directory module
if is_package_directory:
path += '/__init__.py'
with open(path) as f:
with open(path, 'rb') as f:
source = f.read()
else:
source = current_namespace[0].read()
@@ -454,7 +454,7 @@ def load_module(path=None, source=None, name=None):
def load(source):
if path is not None and path.endswith('.py'):
if source is None:
with open(path) as f:
with open(path, 'rb') as f:
source = f.read()
else:
return compiled.load_module(path, name)
@@ -481,7 +481,7 @@ def get_modules_containing_name(mods, name):
return None
def check_fs(path):
with open(path) as f:
with open(path, 'rb') as f:
source = source_to_unicode(f.read())
if name in source:
return load_module(path, source)