From: Tim Peters <tim.peters@gmail.com>
Date: Mon, 1 Apr 2002 00:28:59 +0000 (+0000)
Subject: Remove some now-obsolete generator future statements.
X-Git-Tag: v2.3c1~6206
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=496563a5146e2650dcf6f3595c58ff24f39a9afb;p=thirdparty%2FPython%2Fcpython.git

Remove some now-obsolete generator future statements.
I left the email pkg alone; I'm not sure how Barry would like to handle
that.
---

diff --git a/Lib/difflib.py b/Lib/difflib.py
index a2689f406f2e..db254e3fc3ff 100644
--- a/Lib/difflib.py
+++ b/Lib/difflib.py
@@ -1,7 +1,5 @@
 #! /usr/bin/env python
 
-from __future__ import generators
-
 """
 Module difflib -- helpers for computing deltas between objects.
 
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 155a83cb21f2..fb92ef472ba2 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -1,5 +1,3 @@
-from __future__ import generators
-
 tutorial_tests = """
 Let's try a simple generator:
 
diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py
index 966f3e993423..5df1e4613140 100644
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -27,14 +27,10 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase):
         self.roundtrip(parser.suite, s)
 
     def test_yield_statement(self):
-        self.check_suite("from __future__ import generators\n"
-                         "def f(): yield 1")
-        self.check_suite("from __future__ import generators\n"
-                         "def f(): return; yield 1")
-        self.check_suite("from __future__ import generators\n"
-                         "def f(): yield 1; return")
-        self.check_suite("from __future__ import generators\n"
-                         "def f():\n"
+        self.check_suite("def f(): yield 1")
+        self.check_suite("def f(): return; yield 1")
+        self.check_suite("def f(): yield 1; return")
+        self.check_suite("def f():\n"
                          "    for x in range(30):\n"
                          "        yield x\n")
 
diff --git a/Lib/test/test_profilehooks.py b/Lib/test/test_profilehooks.py
index fa38d3047c7d..8990e2ced2e3 100644
--- a/Lib/test/test_profilehooks.py
+++ b/Lib/test/test_profilehooks.py
@@ -1,5 +1,3 @@
-from __future__ import generators
-
 from test_support import TestFailed
 
 import pprint
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
index f7ff000d016a..27ee1bc6fae2 100644
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -22,8 +22,6 @@ are the same, except instead of generating tokens, tokeneater is a callback
 function to which the 5 fields described above are passed as 5 arguments,
 each time a new token is found."""
 
-from __future__ import generators
-
 __author__ = 'Ka-Ping Yee <ping@lfw.org>'
 __credits__ = \
     'GvR, ESR, Tim Peters, Thomas Wouters, Fred Drake, Skip Montanaro'
diff --git a/Lib/types.py b/Lib/types.py
index 8a07950f7e98..41accfc94dff 100644
--- a/Lib/types.py
+++ b/Lib/types.py
@@ -2,8 +2,6 @@
 
 Types that are part of optional modules (e.g. array) are not listed.
 """
-from __future__ import generators
-
 import sys
 
 # Iterators in Python aren't a matter of type but of protocol.  A large
@@ -83,4 +81,4 @@ EllipsisType = type(Ellipsis)
 
 DictProxyType = type(TypeType.__dict__)
 
-del sys, _f, _C, _x, generators                  # Not for export
+del sys, _f, _C, _x                  # Not for export