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

Don't use invalid escape sequences in regex, see https://github.com/davidhalter/jedi-vim/issues/843

Browse Source
This commit is contained in:
Dave Halter
2018-07-12 08:54:03 +02:00
parent 87d7c59c6e
commit 71cea7200b
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/api/classes.py
View File

@@ -536,9 +536,9 @@ class Definition(BaseDefinition):
# here. # here.
txt = definition.get_code(include_prefix=False) txt = definition.get_code(include_prefix=False)
# Delete comments: # Delete comments:
txt = re.sub('#[^\n]+\n', ' ', txt) txt = re.sub(r'#[^\n]+\n', ' ', txt)
# Delete multi spaces/newlines # Delete multi spaces/newlines
txt = re.sub('\s+', ' ', txt).strip() txt = re.sub(r'\s+', ' ', txt).strip()
return txt return txt
@property @property

8
jedi/evaluate/docstrings.py
View File

@@ -68,7 +68,7 @@ def _search_param_in_numpydocstr(docstr, param_str):
return [] return []
for p_name, p_type, p_descr in params: for p_name, p_type, p_descr in params:
if p_name == param_str: if p_name == param_str:
m = re.match('([^,]+(,[^,]+)*?)(,[ ]*optional)?$', p_type) m = re.match(r'([^,]+(,[^,]+)*?)(,[ ]*optional)?$', p_type)
if m: if m:
p_type = m.group(1) p_type = m.group(1)
return list(_expand_typestr(p_type)) return list(_expand_typestr(p_type))
@@ -103,11 +103,11 @@ def _expand_typestr(type_str):
Attempts to interpret the possible types in `type_str` Attempts to interpret the possible types in `type_str`
""" """
# Check if alternative types are specified with 'or' # Check if alternative types are specified with 'or'
if re.search('\\bor\\b', type_str): if re.search(r'\bor\b', type_str):
for t in type_str.split('or'): for t in type_str.split('or'):
yield t.split('of')[0].strip() yield t.split('of')[0].strip()
# Check if like "list of `type`" and set type to list # Check if like "list of `type`" and set type to list
elif re.search('\\bof\\b', type_str): elif re.search(r'\bof\b', type_str):
yield type_str.split('of')[0] yield type_str.split('of')[0]
# Check if type has is a set of valid literal values eg: {'C', 'F', 'A'} # Check if type has is a set of valid literal values eg: {'C', 'F', 'A'}
elif type_str.startswith('{'): elif type_str.startswith('{'):
@@ -194,7 +194,7 @@ def _evaluate_for_statement_string(module_context, string):
if string is None: if string is None:
return [] return []
for element in re.findall('((?:\w+\.)*\w+)\.', string): for element in re.findall(r'((?:\w+\.)*\w+)\.', string):
# Try to import module part in dotted name. # Try to import module part in dotted name.
# (e.g., 'threading' in 'threading.Thread'). # (e.g., 'threading' in 'threading.Thread').
string = 'import %s\n' % element + string string = 'import %s\n' % element + string

2
jedi/evaluate/helpers.py
View File

@@ -19,7 +19,7 @@ def is_stdlib_path(path):
return False return False
base_path = os.path.join(sys.prefix, 'lib', 'python') base_path = os.path.join(sys.prefix, 'lib', 'python')
return bool(re.match(re.escape(base_path) + '\d.\d', path)) return bool(re.match(re.escape(base_path) + r'\d.\d', path))
def deep_ast_copy(obj): def deep_ast_copy(obj):

2
jedi/evaluate/utils.py
View File

@@ -11,7 +11,7 @@ from jedi._compatibility import reraise
_sep = os.path.sep _sep = os.path.sep
if os.path.altsep is not None: if os.path.altsep is not None:
_sep += os.path.altsep _sep += os.path.altsep
_path_re = re.compile('(?:\.[^{0}]+|[{0}]__init__\.py)$'.format(re.escape(_sep))) _path_re = re.compile(r'(?:\.[^{0}]+|[{0}]__init__\.py)$'.format(re.escape(_sep)))
del _sep del _sep

2
jedi/utils.py
View File

@@ -138,5 +138,5 @@ def version_info():
""" """
Version = namedtuple('Version', 'major, minor, micro') Version = namedtuple('Version', 'major, minor, micro')
from jedi import __version__ from jedi import __version__
tupl = re.findall('[a-z]+|\d+', __version__) tupl = re.findall(r'[a-z]+|\d+', __version__)
return Version(*[x if i == 3 else int(x) for i, x in enumerate(tupl)]) return Version(*[x if i == 3 else int(x) for i, x in enumerate(tupl)])