Removed with_statement imports, useless in Python >= 2.6. Refs #17965. Thanks jonash for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17828 bcc190cf-cafb-0310-a4f2-bffc1f526a37

tests/regressiontests/admin_changelist/tests.py

@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 from django.contrib import admin
 from django.contrib.admin.options import IncorrectLookupParameters

tests/regressiontests/admin_scripts/tests.py

@@ -3,7 +3,6 @@ A series of tests to establish that the command-line managment tools work as
 advertised - especially with regards to the handling of the DJANGO_SETTINGS_MODULE
 and default settings.py files.
 """
-from __future__ import with_statement
 
 import os
 import re

tests/regressiontests/admin_views/tests.py

@@ -1,5 +1,5 @@
 # coding: utf-8
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 import os
 import re

tests/regressiontests/admin_widgets/tests.py

@@ -1,5 +1,5 @@
 # encoding: utf-8
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 from datetime import datetime
 

tests/regressiontests/backends/tests.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Unit and doctests for specific database backends.
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 import datetime
 import threading

tests/regressiontests/bug8245/tests.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 from django.contrib import admin
 from django.utils.unittest import TestCase
 
@@ -19,4 +17,4 @@ class Bug8245Test(TestCase):
         # the first time, not an AlreadyRegistered error.
         with self.assertRaises(Exception) as cm:
             admin.autodiscover()
-        self.assertEqual(str(cm.exception), "Bad admin module")
+        self.assertEqual(str(cm.exception), "Bad admin module")

tests/regressiontests/bulk_create/tests.py

@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 from operator import attrgetter
 

tests/regressiontests/cache/tests.py

@@ -2,7 +2,7 @@
 
 # Unit tests for cache framework
 # Uses whatever cache backend is set in the test settings file.
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 import hashlib
 import os

tests/regressiontests/comment_tests/tests/model_tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import
 
 from django.contrib.comments.models import Comment
 

tests/regressiontests/comment_tests/tests/templatetag_tests.py

@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 from django.contrib.comments.forms import CommentForm
 from django.contrib.comments.models import Comment

tests/regressiontests/csrf_tests/tests.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 
 from django.conf import settings
 from django.core.context_processors import csrf

tests/regressiontests/defaultfilters/tests.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 
 import datetime
 import decimal

tests/regressiontests/defer_regress/tests.py

@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 from operator import attrgetter
 

tests/regressiontests/forms/tests/models.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 import datetime
 

tests/regressiontests/forms/tests/regressions.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 from django.forms import *
 from django.test import TestCase
 from django.utils.translation import ugettext_lazy, override

tests/regressiontests/i18n/commands/compilation.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 import os
 try:
     from cStringIO import StringIO

tests/regressiontests/i18n/commands/extraction.py

@@ -1,5 +1,4 @@
 # -*- encoding: utf-8 -*-
-from __future__ import with_statement
 
 import os
 import re

tests/regressiontests/i18n/contenttypes/tests.py

@@ -1,5 +1,4 @@
 # coding: utf-8
-from __future__ import with_statement
 
 import os
 

tests/regressiontests/i18n/patterns/tests.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 import os
 import warnings
 

tests/regressiontests/i18n/tests.py

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 import datetime
 import decimal

tests/regressiontests/logging_tests/tests.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 import copy
 
 from django.conf import compat_patch_logging_config
@@ -9,7 +7,6 @@ from django.test.utils import override_settings
 from django.utils.log import CallbackFilter, RequireDebugFalse, getLogger
 
 
-
 # logging config prior to using filter with mail_admins
 OLD_LOGGING = {
     'version': 1,

tests/regressiontests/model_formsets_regress/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import
 
 from django import forms
 from django.forms.formsets import BaseFormSet, DELETION_FIELD_NAME

tests/regressiontests/modeladmin/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import
 
 from datetime import date
 

tests/regressiontests/requests/tests.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 import time
 import warnings
 from datetime import datetime, timedelta

tests/regressiontests/select_related_onetoone/tests.py

@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 from django.test import TestCase
 

tests/regressiontests/serializers_regress/tests.py

@@ -6,9 +6,7 @@ test case that is capable of testing the capabilities of
 the serializers. This includes all valid data values, plus
 forward, backwards and self references.
 """
-# This is necessary in Python 2.5 to enable the with statement, in 2.6
-# and up it is no longer necessary.
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 import datetime
 import decimal

tests/regressiontests/settings_tests/tests.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 import os
 
 from django.conf import settings, global_settings

tests/regressiontests/staticfiles_tests/tests.py

@@ -1,5 +1,4 @@
 # -*- encoding: utf-8 -*-
-from __future__ import with_statement
 
 import codecs
 import os

tests/regressiontests/templates/response.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 import os
 import pickle
 import time

tests/regressiontests/templates/tests.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 from django.conf import settings
 

tests/regressiontests/test_utils/tests.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 from django.forms import EmailField, IntegerField
 from django.http import HttpResponse

tests/regressiontests/text/tests.py

@@ -1,5 +1,4 @@
 # coding: utf-8
-from __future__ import with_statement
 
 from django.test import TestCase
 from django.utils.encoding import iri_to_uri

tests/regressiontests/views/tests/debug.py

@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 import inspect
 import os

tests/regressiontests/views/tests/i18n.py

@@ -1,5 +1,5 @@
 # -*- coding:utf-8 -*-
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 import gettext
 from os import path

tests/regressiontests/wsgi/tests.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 from django.core.exceptions import ImproperlyConfigured
 from django.core.servers.basehttp import get_internal_wsgi_application
 from django.core.wsgi import get_wsgi_application