From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 30 Apr 2008 21:25:55 +0000 (+0000)
Subject: Remove some from __future__ import with_statements
X-Git-Tag: v2.6a3~64
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95287fa951ff5b8f1c38e7a9f5e9134acd59a397;p=thirdparty%2FPython%2Fcpython.git

Remove some from __future__ import with_statements
---

diff --git a/Lib/calendar.py b/Lib/calendar.py
index 61af0fd19b3e..ab14c7dbec27 100644
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -5,7 +5,6 @@ default, these calendars have Monday as the first day of the week, and
 Sunday as the last (the European convention). Use setfirstweekday() to
 set the first day of the week (0=Monday, 6=Sunday)."""
 
-from __future__ import with_statement
 import sys
 import datetime
 import locale as _locale
diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
index 9d783565504e..ba410ab997a4 100644
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -1,5 +1,4 @@
 # Tests command line execution of scripts
-from __future__ import with_statement
 
 import unittest
 import os
diff --git a/Lib/test/test_contextlib.py b/Lib/test/test_contextlib.py
index 898bcf243993..4d029dc39560 100644
--- a/Lib/test/test_contextlib.py
+++ b/Lib/test/test_contextlib.py
@@ -1,6 +1,5 @@
 """Unit tests for contextlib.py, and other context managers."""
 
-from __future__ import with_statement
 
 import sys
 import os
diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
index ce6acb677d76..b0d120536f96 100644
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -23,7 +23,6 @@ or Behaviour) to test each part, or without parameter to test both parts. If
 you're working through IDLE, you can import this test module and call test_main()
 with the corresponding argument.
 """
-from __future__ import with_statement
 
 import glob
 import math
diff --git a/Lib/test/test_frozen.py b/Lib/test/test_frozen.py
index 4835e475f859..1654be0eaafe 100644
--- a/Lib/test/test_frozen.py
+++ b/Lib/test/test_frozen.py
@@ -1,5 +1,4 @@
 # Test the frozen module defined in frozen.c.
-from __future__ import with_statement
 
 from test.test_support import captured_stdout, run_unittest
 import unittest
diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index a44be268109c..74e55d80f530 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -1,5 +1,4 @@
 # tempfile.py unit tests.
-from __future__ import with_statement
 import tempfile
 import os
 import sys
diff --git a/Lib/test/test_with.py b/Lib/test/test_with.py
index 8242c912c526..3007e5aa2c7a 100644
--- a/Lib/test/test_with.py
+++ b/Lib/test/test_with.py
@@ -2,7 +2,6 @@
 
 """Unit tests for the with statement specified in PEP 343."""
 
-from __future__ import with_statement
 
 __author__ = "Mike Bland"
 __email__ = "mbland at acm dot org"