Remove now-unnecessary "from __future__ import nested_scopes" stmts.

diff --git a/Lib/__future__.py b/Lib/__future__.py
index de373369b52cda6057211c5c39fd919804660ce1..8510cebc4e98396e367a48d4b417faae1297f8d4 100644 (file)
--- a/Lib/__future__.py
+++ b/Lib/__future__.py
@@ -66,4 +66,4 @@ class _Feature:
         return "Feature(" + `self.getOptionalRelease()` + ", " + \
                             `self.getMandatoryRelease()` + ")"
 
-nested_scopes = _Feature((2, 1, 0, "beta", 1), (2, 2, 0, "final", 0))
+nested_scopes = _Feature((2, 1, 0, "beta", 1), (2, 2, 0, "alpha", 0))

diff --git a/Lib/symtable.py b/Lib/symtable.py
index 210c33978fb141ece15fe8a1d470bade47f98037..15549eeb1da9dbf7a943741aff2ce715b848e129 100644 (file)
--- a/Lib/symtable.py
+++ b/Lib/symtable.py
@@ -1,5 +1,4 @@
 """Interface to the compiler's internal symbol tables"""
-from __future__ import nested_scopes
 
 import _symtable
 from _symtable import USE, DEF_GLOBAL, DEF_LOCAL, DEF_PARAM, \

diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 1b5dfb0b39956b6454a63841d84cae2ea3a2c4e3..a5b2c377700843775611abf74b8f96b005111b07 100644 (file)
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -1,5 +1,3 @@
-from __future__ import nested_scopes
-
 tutorial_tests = """
 Let's try a simple generator:
 

diff --git a/Lib/test/test_scope.py b/Lib/test/test_scope.py
index fb5379067d68c0813f476535acba96f4313d69d9..cb06036677db320eea57ef1d22ec376599ae4c0f 100644 (file)
--- a/Lib/test/test_scope.py
+++ b/Lib/test/test_scope.py
@@ -1,5 +1,3 @@
-from __future__ import nested_scopes
-
 from test.test_support import verify, TestFailed, check_syntax
 
 print "1. simple nesting"
@@ -179,7 +177,7 @@ verify(f(6) == 720)
 
 print "11. unoptimized namespaces"
 
-check_syntax("""from __future__ import nested_scopes
+check_syntax("""\
 def unoptimized_clash1(strip):
     def f(s):
         from string import *
@@ -187,7 +185,7 @@ def unoptimized_clash1(strip):
     return f
 """)
 
-check_syntax("""from __future__ import nested_scopes
+check_syntax("""\
 def unoptimized_clash2():
     from string import *
     def f(s):
@@ -195,7 +193,7 @@ def unoptimized_clash2():
     return f
 """)
 
-check_syntax("""from __future__ import nested_scopes
+check_syntax("""\
 def unoptimized_clash2():
     from string import *
     def g():
@@ -205,7 +203,7 @@ def unoptimized_clash2():
 """)
 
 # XXX could allow this for exec with const argument, but what's the point
-check_syntax("""from __future__ import nested_scopes
+check_syntax("""\
 def error(y):
     exec "a = 1"
     def f(x):
@@ -213,14 +211,14 @@ def error(y):
     return f
 """)
 
-check_syntax("""from __future__ import nested_scopes
+check_syntax("""\
 def f(x):
     def g():
         return x
     del x # can't del name
 """)
 
-check_syntax("""from __future__ import nested_scopes
+check_syntax("""\
 def f():
     def g():
          from string import *

diff --git a/PCbuild/rmpyc.py b/PCbuild/rmpyc.py
index a87eab86c9e58338d177ef16c95813882d9ee441..019c69b16e79e21818e36f53a7799c75dbb1d8eb 100644 (file)
--- a/PCbuild/rmpyc.py
+++ b/PCbuild/rmpyc.py
@@ -1,7 +1,5 @@
 # Remove all the .pyc and .pyo files under ../Lib.
 
-from __future__ import nested_scopes
-
 def deltree(root):
     import os
     def rm(path):