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

django/contrib/auth/tests/forms.py

@@ -1,4 +1,3 @@
-from __future__ import with_statement
 import os
 from django.contrib.auth.models import User
 from django.contrib.auth.forms import (UserCreationForm, AuthenticationForm,

django/contrib/auth/tests/views.py

@@ -1,4 +1,3 @@
-from __future__ import with_statement
 import os
 import re
 import urllib

django/contrib/contenttypes/tests.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 import urllib
 
 from django.db import models

django/contrib/flatpages/tests/forms.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 from django.conf import settings
 from django.contrib.flatpages.forms import FlatpageForm
 from django.contrib.flatpages.models import FlatPage

django/contrib/formtools/tests/wizard/wizardtests/tests.py

@@ -1,4 +1,3 @@
-from __future__ import with_statement
 import os
 
 from django import forms

django/contrib/humanize/tests.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 import datetime
 import new
 

django/contrib/sessions/tests.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 from datetime import datetime, timedelta
 import shutil
 import string

django/contrib/staticfiles/management/commands/collectstatic.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 import os
 import sys
 from optparse import make_option

django/contrib/staticfiles/storage.py

@@ -1,4 +1,3 @@
-from __future__ import with_statement
 import hashlib
 import os
 import posixpath

django/core/cache/backends/locmem.py

@@ -1,7 +1,5 @@
 "Thread-safe in-memory cache backend."
 
-from __future__ import with_statement
-
 import time
 try:
     import cPickle as pickle

django/core/management/base.py

@@ -3,7 +3,6 @@ Base classes for writing management commands (named commands which can
 be executed through ``django-admin.py`` or ``manage.py``).
 
 """
-from __future__ import with_statement
 import os
 import sys
 

django/core/management/commands/loaddata.py

@@ -1,7 +1,3 @@
-# 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
-
 import sys
 import os
 import gzip

django/core/management/templates.py

@@ -1,4 +1,3 @@
-from __future__ import with_statement
 import cgi
 import errno
 import mimetypes

django/db/transaction.py

@@ -11,7 +11,6 @@ called, a commit is made.
 Managed transactions don't do those commits, but will need some kind of manual
 or implicit commits or rollbacks.
 """
-from __future__ import with_statement
 
 from functools import wraps
 

django/templatetags/i18n.py

@@ -1,4 +1,3 @@
-from __future__ import with_statement
 import re
 
 from django.template import (Node, Variable, TemplateSyntaxError,

django/templatetags/tz.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 from datetime import datetime, tzinfo
 
 try:

django/test/testcases.py

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

django/test/utils.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 import warnings
 from django.conf import settings, UserSettingsHolder
 from django.core import mail

django/utils/archive.py

@@ -21,7 +21,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 """
-from __future__ import with_statement
 import os
 import shutil
 import sys

django/utils/synch.py

@@ -6,8 +6,6 @@ Synchronization primitives:
 (Contributed to Django by eugene@lazutkin.com)
 """
 
-from __future__ import with_statement
-
 import contextlib
 try:
     import threading
@@ -92,4 +90,4 @@ class RWLock(object):
         try:
             yield
         finally:
-            self.writer_leaves()
+            self.writer_leaves()

django/views/static.py

@@ -2,7 +2,6 @@
 Views and functions for serving static files. These are only to be used
 during development, and SHOULD NOT be used in a production setting.
 """
-from __future__ import with_statement
 
 import mimetypes
 import os

tests/modeltests/distinct_on_fields/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import
 
 from django.db.models import Max
 from django.test import TestCase, skipUnlessDBFeature

tests/modeltests/empty/tests.py

@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured

tests/modeltests/files/tests.py

@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 import shutil
 import tempfile

tests/modeltests/lookup/tests.py

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

tests/modeltests/many_to_many/tests.py

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

tests/modeltests/many_to_one/tests.py

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

tests/modeltests/many_to_one_null/tests.py

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

tests/modeltests/model_forms/tests.py

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

tests/modeltests/prefetch_related/tests.py

@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase

tests/modeltests/properties/tests.py

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

tests/modeltests/select_related/tests.py

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

tests/modeltests/serializers/tests.py

@@ -1,6 +1,4 @@
-# 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
 
 # -*- coding: utf-8 -*-
 from datetime import datetime

tests/modeltests/timezones/tests.py

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

tests/modeltests/transactions/tests.py

@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
 
 from django.db import connection, transaction, IntegrityError
 from django.test import TransactionTestCase, skipUnlessDBFeature

tests/modeltests/user_commands/tests.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 from StringIO import StringIO
 
 from django.core import management

tests/modeltests/validation/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 from django.core.exceptions import ValidationError
 from django.test import TestCase
 

tests/modeltests/validation/test_unique.py

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

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