Remove Python 2 branches

pylint-dev · Oct 10, 2018 · 6fbb463 · 6fbb463
1 parent 7513622
commit 6fbb463
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 26 deletions.
diff --git a/astroid/as_string.py b/astroid/as_string.py
@@ -156,17 +156,14 @@ def visit_classdef(self, node):
         """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
@@ -10,7 +10,6 @@
 """Astroid hooks for various builtins."""
 
 from functools import partial
-import sys
 from textwrap import dedent
 
 import six
@@ -94,28 +93,20 @@ def ljust(self, width, fillchar=None):
         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]
     for class_name, transform in class_transforms.items():
         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):