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

Use the parser to check for certain namedtuple features

Browse Source 
This fixes tests that are used with python 2 but a different environment
This commit is contained in:
Dave Halter
2017-12-30 04:41:19 +01:00
parent 4514373de6
commit b716fb7dc6
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jedi/evaluate/imports.py
View File

@@ -12,7 +12,6 @@ This module also supports import autocompletion, which means to complete
statements like ``from datetim`` (curser at the end would return ``datetime``). statements like ``from datetim`` (curser at the end would return ``datetime``).
""" """
import os import os
import sys
from parso.python import tree from parso.python import tree
from parso.tree import search_ancestor from parso.tree import search_ancestor

20
jedi/evaluate/stdlib.py
View File

@@ -9,7 +9,6 @@ Note that this module exists only to implement very specific functionality in
the standard library. The usual way to understand the standard library is the the standard library. The usual way to understand the standard library is the
compiled module that returns the types for C-builtins. compiled module that returns the types for C-builtins.
""" """
import collections
import re import re
from jedi._compatibility import force_unicode from jedi._compatibility import force_unicode
@@ -267,8 +266,11 @@ def collections_namedtuple(evaluator, obj, arguments):
.. note:: |jedi| only supports namedtuples on Python >2.6. .. note:: |jedi| only supports namedtuples on Python >2.6.
""" """
# Namedtuples are not supported on Python 2.6 collections_context = obj.parent_context
if not hasattr(collections, '_class_template'): _class_template_set = collections_context.py__getattribute__(u'_class_template')
if not _class_template_set:
# Namedtuples are not supported on Python 2.6, early 2.7, because the
# _class_template variable is not defined, there.
return NO_CONTEXTS return NO_CONTEXTS
# Process arguments # Process arguments
@@ -287,16 +289,20 @@ def collections_namedtuple(evaluator, obj, arguments):
else: else:
return NO_CONTEXTS return NO_CONTEXTS
base = collections._class_template def get_var(name):
x, = collections_context.py__getattribute__(name)
return x.get_safe_value()
base = next(iter(_class_template_set)).get_safe_value()
base += _NAMEDTUPLE_INIT base += _NAMEDTUPLE_INIT
# Build source # Build source
source = base.format( source = base.format(
typename=name, typename=name,
field_names=tuple(fields), field_names=tuple(fields),
num_fields=len(fields), num_fields=len(fields),
arg_list = repr(tuple(fields)).replace("'", "")[1:-1], arg_list=repr(tuple(fields)).replace("u'", "").replace("'", "")[1:-1],
repr_fmt=', '.join(collections._repr_template.format(name=name) for name in fields), repr_fmt=', '.join(get_var(u'_repr_template').format(name=name) for name in fields),
field_defs='\n'.join(collections._field_template.format(index=index, name=name) field_defs='\n'.join(get_var(u'_field_template').format(index=index, name=name)
for index, name in enumerate(fields)) for index, name in enumerate(fields))
) )