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

tim-one · tim-one · commit c4889c496ade · 2001-07-12T22:36:02.000Z
diff --git a/Lib/__future__.py b/Lib/__future__.py
@@ -66,4 +66,4 @@ def __repr__(self):
         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
@@ -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
@@ -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
@@ -1,5 +1,3 @@
-from __future__ import nested_scopes
-
 from test.test_support import verify, TestFailed, check_syntax
 
 print "1. simple nesting"
@@ -179,23 +177,23 @@ def fact(n):
 
 print "11. unoptimized namespaces"
 
-check_syntax("""from __future__ import nested_scopes
+check_syntax("""\
 def unoptimized_clash1(strip):
     def f(s):
         from string import *
         return strip(s) # ambiguity: free or local
     return f
 """)
 
-check_syntax("""from __future__ import nested_scopes
+check_syntax("""\
 def unoptimized_clash2():
     from string import *
     def f(s):
         return strip(s) # ambiguity: global or local
     return f
 """)
 
-check_syntax("""from __future__ import nested_scopes
+check_syntax("""\
 def unoptimized_clash2():
     from string import *
     def g():
@@ -205,22 +203,22 @@ def f(s):
 """)
 
 # 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):
         return x + 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
@@ -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):

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`"""Interface to the compiler's internal symbol tables"""`
`2`		`-from __future__ import nested_scopes`
`3`	`2`
`4`	`3`	`import _symtable`
`5`	`4`	`from _symtable import USE, DEF_GLOBAL, DEF_LOCAL, DEF_PARAM, \`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import nested_scopes`
`2`		`-`
`3`	`1`	`tutorial_tests = """`
`4`	`2`	`Let's try a simple generator:`
`5`	`3`