diff options
| -rw-r--r-- | astroid/as_string.py | 17 | ||||
| -rw-r--r-- | astroid/brain/brain_builtin_inference.py | 23 |
2 files changed, 14 insertions, 26 deletions
diff --git a/astroid/as_string.py b/astroid/as_string.py index 10b79df9..7042272f 100644 --- a/astroid/as_string.py +++ b/astroid/as_string.py @@ -156,17 +156,14 @@ class AsStringVisitor: """return an astroid.ClassDef node as string""" decorate = node.decorators.accept(self) if node.decorators else "" bases = ", ".join(n.accept(self) for n in node.bases) - if sys.version_info[0] == 2: - bases = "(%s)" % bases if bases else "" - else: - metaclass = node.metaclass() - if metaclass and not node.has_metaclass_hack(): - if bases: - bases = "(%s, metaclass=%s)" % (bases, metaclass.name) - else: - bases = "(metaclass=%s)" % metaclass.name + metaclass = node.metaclass() + if metaclass and not node.has_metaclass_hack(): + if bases: + bases = "(%s, metaclass=%s)" % (bases, metaclass.name) else: - bases = "(%s)" % bases if bases else "" + bases = "(metaclass=%s)" % metaclass.name + else: + bases = "(%s)" % bases if bases else "" docs = self._docs_dedent(node.doc) if node.doc else "" return "\n\n%sclass %s%s:%s\n%s\n" % ( decorate, diff --git a/astroid/brain/brain_builtin_inference.py b/astroid/brain/brain_builtin_inference.py index 44a2efb3..2655095a 100644 --- a/astroid/brain/brain_builtin_inference.py +++ b/astroid/brain/brain_builtin_inference.py @@ -10,7 +10,6 @@ """Astroid hooks for various builtins.""" from functools import partial -import sys from textwrap import dedent import six @@ -94,7 +93,7 @@ def _extend_str(class_node, rvalue): method.parent = class_node -def extend_builtins(class_transforms): +def _extend_builtins(class_transforms): from astroid.bases import BUILTINS builtin_ast = MANAGER.astroid_cache[BUILTINS] @@ -102,20 +101,12 @@ def extend_builtins(class_transforms): transform(builtin_ast[class_name]) -if sys.version_info > (3, 0): - extend_builtins( - { - "bytes": partial(_extend_str, rvalue="b''"), - "str": partial(_extend_str, rvalue="''"), - } - ) -else: - extend_builtins( - { - "str": partial(_extend_str, rvalue="''"), - "unicode": partial(_extend_str, rvalue="u''"), - } - ) +_extend_builtins( + { + "bytes": partial(_extend_str, rvalue="b''"), + "str": partial(_extend_str, rvalue="''"), + } +) def _builtin_filter_predicate(node, builtin_name): |