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

source_to_unicode -> python_bytes_to_unicode.

Browse Source
This commit is contained in:
Dave Halter
2017-08-15 20:09:44 +02:00
parent f9e31dc941
commit fe9be9fe09
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/evaluate/imports.py
View File

@@ -19,7 +19,7 @@ import sys
from parso.python import tree
from parso.tree import search_ancestor
from parso.cache import parser_cache
from parso.utils import source_to_unicode
from parso.utils import python_bytes_to_unicode
from jedi._compatibility import find_module, unicode, ImplicitNSInfo
from jedi import debug
@@ -510,7 +510,7 @@ def get_modules_containing_name(evaluator, modules, name):
def check_fs(path):
with open(path, 'rb') as f:
code = source_to_unicode(f.read(), errors='replace')
code = python_bytes_to_unicode(f.read(), errors='replace')
if name in code:
module_name = os.path.basename(path)[:-3] # Remove `.py`.
module = _load_module(evaluator, path, code)

4
jedi/evaluate/representation.py
View File

@@ -44,7 +44,7 @@ import re
from itertools import chain
from parso.python import tree
from parso.utils import source_to_unicode
from parso.utils import python_bytes_to_unicode
from jedi._compatibility import use_metaclass
from jedi import debug
@@ -548,7 +548,7 @@ class ModuleContext(use_metaclass(CachedMetaClass, context.TreeContext)):
init_path = self.py__file__()
if os.path.basename(init_path) == '__init__.py':
with open(init_path, 'rb') as f:
content = source_to_unicode(f.read(), errors='replace')
content = python_bytes_to_unicode(f.read(), errors='replace')
# 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__')