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

Don't use literal_eval

Browse Source 
Using it without control over the input leads to various possible exceptions.
Refs #868.
This commit is contained in:
Dave Halter
2017-09-09 19:22:43 +02:00
parent 3bceef075a
commit d47804edef
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
jedi/evaluate/docstrings.py
View File

@@ -15,10 +15,11 @@ As an addition to parameter searching, this module also provides return
annotations. annotations.
""" """
from ast import literal_eval
import re import re
from textwrap import dedent from textwrap import dedent
from parso import parse
from jedi._compatibility import u from jedi._compatibility import u
from jedi.common import unite from jedi.common import unite
from jedi.evaluate import context from jedi.evaluate import context
@@ -63,7 +64,7 @@ else:
m = re.match('([^,]+(,[^,]+)*?)(,[ ]*optional)?$', p_type) m = re.match('([^,]+(,[^,]+)*?)(,[ ]*optional)?$', p_type)
if m: if m:
p_type = m.group(1) p_type = m.group(1)
return _expand_typestr(p_type) return list(_expand_typestr(p_type))
return [] return []
def _search_return_in_numpydocstr(docstr): def _search_return_in_numpydocstr(docstr):
@@ -92,20 +93,31 @@ def _expand_typestr(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('\\bor\\b', type_str):
types = [t.split('of')[0].strip() for t in type_str.split('or')] for t in type_str.split('or'):
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('\\bof\\b', type_str):
types = [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('{'):
# python2 does not support literal set evals node = parse(type_str, version='3.6').children[0]
# workaround this by using lists instead if node.type == 'atom':
type_str = type_str.replace('{', '[').replace('}', ']') for leaf in node.children[1].children:
types = set(type(x).__name__ for x in literal_eval(type_str)) if leaf.type == 'number':
# Otherwise just return the typestr wrapped in a list if '.' in leaf.value:
yield 'float'
else: else:
types = [type_str] yield 'int'
return types elif leaf.type == 'string':
if 'b' in leaf.string_prefix.lower():
yield 'bytes'
else:
yield 'str'
# Ignore everything else.
# Otherwise just work with what we have.
else:
yield type_str
def _search_param_in_docstr(docstr, param_str): def _search_param_in_docstr(docstr, param_str):