summaryrefslogtreecommitdiff
path: root/astroid/helpers.py
diff options
context:
space:
mode:
authorClaudiu Popa <pcmanticore@gmail.com>2018-02-21 12:08:35 +0100
committerClaudiu Popa <pcmanticore@gmail.com>2018-02-21 12:08:35 +0100
commit8425d915c0186f87da66ad6223588ce70c49031c (patch)
tree1922a89c09dc10f9a00af1ba2bf23cb50bf75923 /astroid/helpers.py
parent29eb92e6bb8231f8a5b4171383684b26fcc10a6c (diff)
downloadastroid-git-8425d915c0186f87da66ad6223588ce70c49031c.tar.gz
Remove Python 2 branches, assume we always run on Python 3
Diffstat (limited to 'astroid/helpers.py')
-rw-r--r--astroid/helpers.py14
1 files changed, 4 insertions, 10 deletions
diff --git a/astroid/helpers.py b/astroid/helpers.py
index 26aa07f9..ac5cbd27 100644
--- a/astroid/helpers.py
+++ b/astroid/helpers.py
@@ -9,7 +9,7 @@
Various helper utilities.
"""
-import six
+import builtins
from astroid import bases
from astroid import context as contextmod
@@ -21,7 +21,7 @@ from astroid import scoped_nodes
from astroid import util
-BUILTINS = six.moves.builtins.__name__
+BUILTINS = builtins.__name__
def _build_proxy_class(cls_name, builtins):
@@ -37,15 +37,9 @@ def _function_type(function, builtins):
else:
cls_name = 'function'
elif isinstance(function, bases.BoundMethod):
- if six.PY2:
- cls_name = 'instancemethod'
- else:
- cls_name = 'method'
+ cls_name = 'method'
elif isinstance(function, bases.UnboundMethod):
- if six.PY2:
- cls_name = 'instancemethod'
- else:
- cls_name = 'function'
+ cls_name = 'function'
return _build_proxy_class(cls_name, builtins)