re-enable the interpretation of the None keyword

This commit is contained in:
Dave Halter
2014-08-12 14:38:56 +02:00
parent 469988be9c
commit fb1dba269a
4 changed files with 6 additions and 7 deletions

View File

@@ -13,7 +13,8 @@ def next(iterator, default=None):
else:
return iterator.__next__()
else:
return default
if default is not None:
return default
def iter(collection, sentinel=None):

View File

@@ -39,11 +39,6 @@ class NameFinder(object):
@debug.increase_indent
def find(self, scopes, resolve_decorator=True, search_global=False):
if unicode(self.name_str) == 'None':
# Filter None, because it's really just a keyword, nobody wants to
# access it.
return []
names = self.filter_name(scopes)
types = self._names_to_types(names, resolve_decorator)

View File

@@ -18,7 +18,7 @@ next(reversed(arr))
def yielder():
yield None
#?
#? None
next(reversed(yielder()))
# empty reversed should not raise an error

View File

@@ -15,6 +15,8 @@ There are three kinds of test:
import textwrap
import pytest
import jedi
from jedi.api import classes
from jedi.evaluate import Evaluator
@@ -42,6 +44,7 @@ class MixinTestFullName(object):
class TestFullNameWithGotoDefinitions(MixinTestFullName, TestCase):
operation = 'goto_definitions'
@pytest.mark.skipif('sys.version_info[:2] <= (2, 6)', reason='Python 2.6 also yields None.')
def test_tuple_mapping(self):
self.check("""
import re