Issue #7092: Fix the DeprecationWarnings emitted by the standard library
when using the -3 flag. Patch by Florent Xicluna.
diff --git a/Lib/compiler/ast.py b/Lib/compiler/ast.py
index 43b1659..f923077 100644
--- a/Lib/compiler/ast.py
+++ b/Lib/compiler/ast.py
@@ -51,9 +51,9 @@
return "Expression(%s)" % (repr(self.node))
class Add(Node):
- def __init__(self, (left, right), lineno=None):
- self.left = left
- self.right = right
+ def __init__(self, leftright, lineno=None):
+ self.left = leftright[0]
+ self.right = leftright[1]
self.lineno = lineno
def getChildren(self):
@@ -431,9 +431,9 @@
return "Discard(%s)" % (repr(self.expr),)
class Div(Node):
- def __init__(self, (left, right), lineno=None):
- self.left = left
- self.right = right
+ def __init__(self, leftright, lineno=None):
+ self.left = leftright[0]
+ self.right = leftright[1]
self.lineno = lineno
def getChildren(self):
@@ -485,9 +485,9 @@
return "Exec(%s, %s, %s)" % (repr(self.expr), repr(self.locals), repr(self.globals))
class FloorDiv(Node):
- def __init__(self, (left, right), lineno=None):
- self.left = left
- self.right = right
+ def __init__(self, leftright, lineno=None):
+ self.left = leftright[0]
+ self.right = leftright[1]
self.lineno = lineno
def getChildren(self):
@@ -560,7 +560,6 @@
self.kwargs = 1
-
def getChildren(self):
children = []
children.append(self.decorators)
@@ -590,6 +589,7 @@
self.argnames = ['.0']
self.varargs = self.kwargs = None
+
def getChildren(self):
return self.code,
@@ -607,7 +607,6 @@
self.lineno = lineno
self.is_outmost = False
-
def getChildren(self):
children = []
children.append(self.assign)
@@ -784,7 +783,6 @@
self.kwargs = 1
-
def getChildren(self):
children = []
children.append(self.argnames)
@@ -803,9 +801,9 @@
return "Lambda(%s, %s, %s, %s)" % (repr(self.argnames), repr(self.defaults), repr(self.flags), repr(self.code))
class LeftShift(Node):
- def __init__(self, (left, right), lineno=None):
- self.left = left
- self.right = right
+ def __init__(self, leftright, lineno=None):
+ self.left = leftright[0]
+ self.right = leftright[1]
self.lineno = lineno
def getChildren(self):
@@ -893,9 +891,9 @@
return "ListCompIf(%s)" % (repr(self.test),)
class Mod(Node):
- def __init__(self, (left, right), lineno=None):
- self.left = left
- self.right = right
+ def __init__(self, leftright, lineno=None):
+ self.left = leftright[0]
+ self.right = leftright[1]
self.lineno = lineno
def getChildren(self):
@@ -923,9 +921,9 @@
return "Module(%s, %s)" % (repr(self.doc), repr(self.node))
class Mul(Node):
- def __init__(self, (left, right), lineno=None):
- self.left = left
- self.right = right
+ def __init__(self, leftright, lineno=None):
+ self.left = leftright[0]
+ self.right = leftright[1]
self.lineno = lineno
def getChildren(self):
@@ -995,9 +993,9 @@
return "Pass()"
class Power(Node):
- def __init__(self, (left, right), lineno=None):
- self.left = left
- self.right = right
+ def __init__(self, leftright, lineno=None):
+ self.left = leftright[0]
+ self.right = leftright[1]
self.lineno = lineno
def getChildren(self):
@@ -1095,9 +1093,9 @@
return "Return(%s)" % (repr(self.value),)
class RightShift(Node):
- def __init__(self, (left, right), lineno=None):
- self.left = left
- self.right = right
+ def __init__(self, leftright, lineno=None):
+ self.left = leftright[0]
+ self.right = leftright[1]
self.lineno = lineno
def getChildren(self):
@@ -1170,9 +1168,9 @@
return "Stmt(%s)" % (repr(self.nodes),)
class Sub(Node):
- def __init__(self, (left, right), lineno=None):
- self.left = left
- self.right = right
+ def __init__(self, leftright, lineno=None):
+ self.left = leftright[0]
+ self.right = leftright[1]
self.lineno = lineno
def getChildren(self):
diff --git a/Lib/compiler/pycodegen.py b/Lib/compiler/pycodegen.py
index 81234d1..960c4fc 100644
--- a/Lib/compiler/pycodegen.py
+++ b/Lib/compiler/pycodegen.py
@@ -870,10 +870,10 @@
level = node.level
if level == 0 and not self.graph.checkFlag(CO_FUTURE_ABSIMPORT):
level = -1
- fromlist = map(lambda (name, alias): name, node.names)
+ fromlist = tuple(name for (name, alias) in node.names)
if VERSION > 1:
self.emit('LOAD_CONST', level)
- self.emit('LOAD_CONST', tuple(fromlist))
+ self.emit('LOAD_CONST', fromlist)
self.emit('IMPORT_NAME', node.modname)
for name, alias in node.names:
if VERSION > 1: