From 468ff59c1c6c9bbeb47fbe3daec78a2f8e429502 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Fri, 6 Mar 2015 00:25:01 +0100 Subject: [PATCH] Remove hasattr/next from _compatibility (not used anymore), thanks @dongweiming for noticing. --- jedi/_compatibility.py | 29 ----------------------------- jedi/api/__init__.py | 2 +- jedi/common.py | 2 +- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/jedi/_compatibility.py b/jedi/_compatibility.py index 2e231733..b7ecd162 100644 --- a/jedi/_compatibility.py +++ b/jedi/_compatibility.py @@ -65,23 +65,6 @@ or the name of the module if it is a builtin one and a boolean indicating if the module is contained in a package. """ -# next was defined in python 2.6, in python 3 obj.next won't be possible -# anymore -try: - next = next -except NameError: - _raiseStopIteration = object() - - def next(iterator, default=_raiseStopIteration): - if not hasattr(iterator, 'next'): - raise TypeError("not an iterator") - try: - return iterator.next() - except StopIteration: - if default is _raiseStopIteration: - raise - else: - return default # unicode function try: @@ -125,18 +108,6 @@ Usage:: """ -# hasattr function used because python -if is_py3: - hasattr = hasattr -else: - def hasattr(obj, name): - try: - getattr(obj, name) - return True - except AttributeError: - return False - - class Python3Method(object): def __init__(self, func): self.func = func diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py index eaedb61b..3bf49843 100644 --- a/jedi/api/__init__.py +++ b/jedi/api/__init__.py @@ -12,7 +12,7 @@ import warnings import sys from itertools import chain -from jedi._compatibility import next, unicode, builtins +from jedi._compatibility import unicode, builtins from jedi.parser import Parser, load_grammar from jedi.parser.tokenize import source_tokens from jedi.parser import tree as pr diff --git a/jedi/common.py b/jedi/common.py index 38ed6d23..0e9afd11 100644 --- a/jedi/common.py +++ b/jedi/common.py @@ -5,7 +5,7 @@ import functools import re from ast import literal_eval -from jedi._compatibility import unicode, next, reraise +from jedi._compatibility import unicode, reraise from jedi import settings