diff options
| author | Tim Peters <tim.peters@gmail.com> | 2001-07-12 22:36:02 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2001-07-12 22:36:02 (GMT) |
| commit | c4889c496ade6a1529a74054f8fcc2847d8cd0bb (patch) | |
| tree | 996c3f196b2fe35c6c0e6c382cd1450b60594136 | |
| parent | 9a1ae1a9605b2832e2cdfee1f35cbb811ca2729f (diff) | |
| download | cpython-c4889c496ade6a1529a74054f8fcc2847d8cd0bb.zip cpython-c4889c496ade6a1529a74054f8fcc2847d8cd0bb.tar.gz cpython-c4889c496ade6a1529a74054f8fcc2847d8cd0bb.tar.bz2 | |
Remove now-unnecessary "from __future__ import nested_scopes" stmts.
| -rw-r--r-- | Lib/__future__.py | 2 | ||||
| -rw-r--r-- | Lib/symtable.py | 1 | ||||
| -rw-r--r-- | Lib/test/test_generators.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_scope.py | 14 | ||||
| -rw-r--r-- | PCbuild/rmpyc.py | 2 |
5 files changed, 7 insertions, 14 deletions
diff --git a/Lib/__future__.py b/Lib/__future__.py index de37336..8510ceb 100644 --- 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 210c339..15549ee 100644 --- 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 1b5dfb0..a5b2c37 100644 --- 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 fb53790..cb06036 100644 --- 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 a87eab8..019c69b 100644 --- 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): |