Author: claudep
Date: 2012-03-30 01:02:08 -0700 (Fri, 30 Mar 2012)
New Revision: 17828
Modified:
django/trunk/django/contrib/auth/tests/forms.py
django/trunk/django/contrib/auth/tests/views.py
django/trunk/django/contrib/contenttypes/tests.py
django/trunk/django/contrib/flatpages/tests/forms.py
django/trunk/django/contrib/formtools/tests/wizard/wizardtests/tests.py
django/trunk/django/contrib/humanize/tests.py
django/trunk/django/contrib/sessions/tests.py
django/trunk/django/contrib/staticfiles/management/commands/collectstatic.py
django/trunk/django/contrib/staticfiles/storage.py
django/trunk/django/core/cache/backends/locmem.py
django/trunk/django/core/management/base.py
django/trunk/django/core/management/commands/loaddata.py
django/trunk/django/core/management/templates.py
django/trunk/django/db/transaction.py
django/trunk/django/templatetags/i18n.py
django/trunk/django/templatetags/tz.py
django/trunk/django/test/testcases.py
django/trunk/django/test/utils.py
django/trunk/django/utils/archive.py
django/trunk/django/utils/synch.py
django/trunk/django/views/static.py
django/trunk/tests/modeltests/distinct_on_fields/tests.py
django/trunk/tests/modeltests/empty/tests.py
django/trunk/tests/modeltests/files/tests.py
django/trunk/tests/modeltests/lookup/tests.py
django/trunk/tests/modeltests/many_to_many/tests.py
django/trunk/tests/modeltests/many_to_one/tests.py
django/trunk/tests/modeltests/many_to_one_null/tests.py
django/trunk/tests/modeltests/model_forms/tests.py
django/trunk/tests/modeltests/prefetch_related/tests.py
django/trunk/tests/modeltests/properties/tests.py
django/trunk/tests/modeltests/select_related/tests.py
django/trunk/tests/modeltests/serializers/tests.py
django/trunk/tests/modeltests/timezones/tests.py
django/trunk/tests/modeltests/transactions/tests.py
django/trunk/tests/modeltests/user_commands/tests.py
django/trunk/tests/modeltests/validation/__init__.py
django/trunk/tests/modeltests/validation/test_unique.py
django/trunk/tests/regressiontests/admin_changelist/tests.py
django/trunk/tests/regressiontests/admin_scripts/tests.py
django/trunk/tests/regressiontests/admin_views/tests.py
django/trunk/tests/regressiontests/admin_widgets/tests.py
django/trunk/tests/regressiontests/backends/tests.py
django/trunk/tests/regressiontests/bug8245/tests.py
django/trunk/tests/regressiontests/bulk_create/tests.py
django/trunk/tests/regressiontests/cache/tests.py
django/trunk/tests/regressiontests/comment_tests/tests/model_tests.py
django/trunk/tests/regressiontests/comment_tests/tests/templatetag_tests.py
django/trunk/tests/regressiontests/csrf_tests/tests.py
django/trunk/tests/regressiontests/defaultfilters/tests.py
django/trunk/tests/regressiontests/defer_regress/tests.py
django/trunk/tests/regressiontests/forms/tests/models.py
django/trunk/tests/regressiontests/forms/tests/regressions.py
django/trunk/tests/regressiontests/i18n/commands/compilation.py
django/trunk/tests/regressiontests/i18n/commands/extraction.py
django/trunk/tests/regressiontests/i18n/contenttypes/tests.py
django/trunk/tests/regressiontests/i18n/patterns/tests.py
django/trunk/tests/regressiontests/i18n/tests.py
django/trunk/tests/regressiontests/logging_tests/tests.py
django/trunk/tests/regressiontests/model_formsets_regress/tests.py
django/trunk/tests/regressiontests/modeladmin/tests.py
django/trunk/tests/regressiontests/requests/tests.py
django/trunk/tests/regressiontests/select_related_onetoone/tests.py
django/trunk/tests/regressiontests/serializers_regress/tests.py
django/trunk/tests/regressiontests/settings_tests/tests.py
django/trunk/tests/regressiontests/staticfiles_tests/tests.py
django/trunk/tests/regressiontests/templates/response.py
django/trunk/tests/regressiontests/templates/tests.py
django/trunk/tests/regressiontests/test_utils/tests.py
django/trunk/tests/regressiontests/text/tests.py
django/trunk/tests/regressiontests/views/tests/debug.py
django/trunk/tests/regressiontests/views/tests/i18n.py
django/trunk/tests/regressiontests/wsgi/tests.py
Log:
Removed with_statement imports, useless in Python >= 2.6. Refs #17965. Thanks
jonash for the patch.
Modified: django/trunk/django/contrib/auth/tests/forms.py
===================================================================
--- django/trunk/django/contrib/auth/tests/forms.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/django/contrib/auth/tests/forms.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -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,
Modified: django/trunk/django/contrib/auth/tests/views.py
===================================================================
--- django/trunk/django/contrib/auth/tests/views.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/django/contrib/auth/tests/views.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,4 +1,3 @@
-from __future__ import with_statement
import os
import re
import urllib
Modified: django/trunk/django/contrib/contenttypes/tests.py
===================================================================
--- django/trunk/django/contrib/contenttypes/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/django/contrib/contenttypes/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
import urllib
from django.db import models
Modified: django/trunk/django/contrib/flatpages/tests/forms.py
===================================================================
--- django/trunk/django/contrib/flatpages/tests/forms.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/django/contrib/flatpages/tests/forms.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -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
Modified:
django/trunk/django/contrib/formtools/tests/wizard/wizardtests/tests.py
===================================================================
--- django/trunk/django/contrib/formtools/tests/wizard/wizardtests/tests.py
2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/django/contrib/formtools/tests/wizard/wizardtests/tests.py
2012-03-30 08:02:08 UTC (rev 17828)
@@ -1,4 +1,3 @@
-from __future__ import with_statement
import os
from django import forms
Modified: django/trunk/django/contrib/humanize/tests.py
===================================================================
--- django/trunk/django/contrib/humanize/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/django/contrib/humanize/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
import datetime
import new
Modified: django/trunk/django/contrib/sessions/tests.py
===================================================================
--- django/trunk/django/contrib/sessions/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/django/contrib/sessions/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
from datetime import datetime, timedelta
import shutil
import string
Modified:
django/trunk/django/contrib/staticfiles/management/commands/collectstatic.py
===================================================================
---
django/trunk/django/contrib/staticfiles/management/commands/collectstatic.py
2012-03-29 18:53:27 UTC (rev 17827)
+++
django/trunk/django/contrib/staticfiles/management/commands/collectstatic.py
2012-03-30 08:02:08 UTC (rev 17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
import os
import sys
from optparse import make_option
Modified: django/trunk/django/contrib/staticfiles/storage.py
===================================================================
--- django/trunk/django/contrib/staticfiles/storage.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/django/contrib/staticfiles/storage.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,4 +1,3 @@
-from __future__ import with_statement
import hashlib
import os
import posixpath
Modified: django/trunk/django/core/cache/backends/locmem.py
===================================================================
--- django/trunk/django/core/cache/backends/locmem.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/django/core/cache/backends/locmem.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,7 +1,5 @@
"Thread-safe in-memory cache backend."
-from __future__ import with_statement
-
import time
try:
import cPickle as pickle
Modified: django/trunk/django/core/management/base.py
===================================================================
--- django/trunk/django/core/management/base.py 2012-03-29 18:53:27 UTC (rev
17827)
+++ django/trunk/django/core/management/base.py 2012-03-30 08:02:08 UTC (rev
17828)
@@ -3,7 +3,6 @@
be executed through ``django-admin.py`` or ``manage.py``).
"""
-from __future__ import with_statement
import os
import sys
Modified: django/trunk/django/core/management/commands/loaddata.py
===================================================================
--- django/trunk/django/core/management/commands/loaddata.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/django/core/management/commands/loaddata.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -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
Modified: django/trunk/django/core/management/templates.py
===================================================================
--- django/trunk/django/core/management/templates.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/django/core/management/templates.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,4 +1,3 @@
-from __future__ import with_statement
import cgi
import errno
import mimetypes
Modified: django/trunk/django/db/transaction.py
===================================================================
--- django/trunk/django/db/transaction.py 2012-03-29 18:53:27 UTC (rev
17827)
+++ django/trunk/django/db/transaction.py 2012-03-30 08:02:08 UTC (rev
17828)
@@ -11,7 +11,6 @@
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
Modified: django/trunk/django/templatetags/i18n.py
===================================================================
--- django/trunk/django/templatetags/i18n.py 2012-03-29 18:53:27 UTC (rev
17827)
+++ django/trunk/django/templatetags/i18n.py 2012-03-30 08:02:08 UTC (rev
17828)
@@ -1,4 +1,3 @@
-from __future__ import with_statement
import re
from django.template import (Node, Variable, TemplateSyntaxError,
Modified: django/trunk/django/templatetags/tz.py
===================================================================
--- django/trunk/django/templatetags/tz.py 2012-03-29 18:53:27 UTC (rev
17827)
+++ django/trunk/django/templatetags/tz.py 2012-03-30 08:02:08 UTC (rev
17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
from datetime import datetime, tzinfo
try:
Modified: django/trunk/django/test/testcases.py
===================================================================
--- django/trunk/django/test/testcases.py 2012-03-29 18:53:27 UTC (rev
17827)
+++ django/trunk/django/test/testcases.py 2012-03-30 08:02:08 UTC (rev
17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
import difflib
import os
import re
Modified: django/trunk/django/test/utils.py
===================================================================
--- django/trunk/django/test/utils.py 2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/django/test/utils.py 2012-03-30 08:02:08 UTC (rev 17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
import warnings
from django.conf import settings, UserSettingsHolder
from django.core import mail
Modified: django/trunk/django/utils/archive.py
===================================================================
--- django/trunk/django/utils/archive.py 2012-03-29 18:53:27 UTC (rev
17827)
+++ django/trunk/django/utils/archive.py 2012-03-30 08:02:08 UTC (rev
17828)
@@ -21,7 +21,6 @@
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
Modified: django/trunk/django/utils/synch.py
===================================================================
--- django/trunk/django/utils/synch.py 2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/django/utils/synch.py 2012-03-30 08:02:08 UTC (rev 17828)
@@ -6,8 +6,6 @@
(Contributed to Django by eug...@lazutkin.com)
"""
-from __future__ import with_statement
-
import contextlib
try:
import threading
@@ -92,4 +90,4 @@
try:
yield
finally:
- self.writer_leaves()
\ No newline at end of file
+ self.writer_leaves()
Modified: django/trunk/django/views/static.py
===================================================================
--- django/trunk/django/views/static.py 2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/django/views/static.py 2012-03-30 08:02:08 UTC (rev 17828)
@@ -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
Modified: django/trunk/tests/modeltests/distinct_on_fields/tests.py
===================================================================
--- django/trunk/tests/modeltests/distinct_on_fields/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/modeltests/distinct_on_fields/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -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
Modified: django/trunk/tests/modeltests/empty/tests.py
===================================================================
--- django/trunk/tests/modeltests/empty/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/modeltests/empty/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -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
Modified: django/trunk/tests/modeltests/files/tests.py
===================================================================
--- django/trunk/tests/modeltests/files/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/modeltests/files/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
import shutil
import tempfile
Modified: django/trunk/tests/modeltests/lookup/tests.py
===================================================================
--- django/trunk/tests/modeltests/lookup/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/modeltests/lookup/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import
from datetime import datetime
from operator import attrgetter
Modified: django/trunk/tests/modeltests/many_to_many/tests.py
===================================================================
--- django/trunk/tests/modeltests/many_to_many/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/modeltests/many_to_many/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import
from django.test import TestCase
Modified: django/trunk/tests/modeltests/many_to_one/tests.py
===================================================================
--- django/trunk/tests/modeltests/many_to_one/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/modeltests/many_to_one/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import
from copy import deepcopy
from datetime import datetime
Modified: django/trunk/tests/modeltests/many_to_one_null/tests.py
===================================================================
--- django/trunk/tests/modeltests/many_to_one_null/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/modeltests/many_to_one_null/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
from django.test import TestCase
Modified: django/trunk/tests/modeltests/model_forms/tests.py
===================================================================
--- django/trunk/tests/modeltests/model_forms/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/modeltests/model_forms/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
import datetime
import os
Modified: django/trunk/tests/modeltests/prefetch_related/tests.py
===================================================================
--- django/trunk/tests/modeltests/prefetch_related/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/modeltests/prefetch_related/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -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
Modified: django/trunk/tests/modeltests/properties/tests.py
===================================================================
--- django/trunk/tests/modeltests/properties/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/modeltests/properties/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
from django.test import TestCase
Modified: django/trunk/tests/modeltests/select_related/tests.py
===================================================================
--- django/trunk/tests/modeltests/select_related/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/modeltests/select_related/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
from django.test import TestCase
Modified: django/trunk/tests/modeltests/serializers/tests.py
===================================================================
--- django/trunk/tests/modeltests/serializers/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/modeltests/serializers/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -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
Modified: django/trunk/tests/modeltests/timezones/tests.py
===================================================================
--- django/trunk/tests/modeltests/timezones/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/modeltests/timezones/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
import datetime
import os
import sys
Modified: django/trunk/tests/modeltests/transactions/tests.py
===================================================================
--- django/trunk/tests/modeltests/transactions/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/modeltests/transactions/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -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
Modified: django/trunk/tests/modeltests/user_commands/tests.py
===================================================================
--- django/trunk/tests/modeltests/user_commands/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/modeltests/user_commands/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
from StringIO import StringIO
from django.core import management
Modified: django/trunk/tests/modeltests/validation/__init__.py
===================================================================
--- django/trunk/tests/modeltests/validation/__init__.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/modeltests/validation/__init__.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
from django.core.exceptions import ValidationError
from django.test import TestCase
Modified: django/trunk/tests/modeltests/validation/test_unique.py
===================================================================
--- django/trunk/tests/modeltests/validation/test_unique.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/modeltests/validation/test_unique.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
import datetime
Modified: django/trunk/tests/regressiontests/admin_changelist/tests.py
===================================================================
--- django/trunk/tests/regressiontests/admin_changelist/tests.py
2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/admin_changelist/tests.py
2012-03-30 08:02:08 UTC (rev 17828)
@@ -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
Modified: django/trunk/tests/regressiontests/admin_scripts/tests.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/admin_scripts/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -3,7 +3,6 @@
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
Modified: django/trunk/tests/regressiontests/admin_views/tests.py
===================================================================
--- django/trunk/tests/regressiontests/admin_views/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/admin_views/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,5 +1,5 @@
# coding: utf-8
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
import os
import re
Modified: django/trunk/tests/regressiontests/admin_widgets/tests.py
===================================================================
--- django/trunk/tests/regressiontests/admin_widgets/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/admin_widgets/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,5 +1,5 @@
# encoding: utf-8
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
from datetime import datetime
Modified: django/trunk/tests/regressiontests/backends/tests.py
===================================================================
--- django/trunk/tests/regressiontests/backends/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/backends/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -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
Modified: django/trunk/tests/regressiontests/bug8245/tests.py
===================================================================
--- django/trunk/tests/regressiontests/bug8245/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/regressiontests/bug8245/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
from django.contrib import admin
from django.utils.unittest import TestCase
@@ -19,4 +17,4 @@
# the first time, not an AlreadyRegistered error.
with self.assertRaises(Exception) as cm:
admin.autodiscover()
- self.assertEqual(str(cm.exception), "Bad admin module")
\ No newline at end of file
+ self.assertEqual(str(cm.exception), "Bad admin module")
Modified: django/trunk/tests/regressiontests/bulk_create/tests.py
===================================================================
--- django/trunk/tests/regressiontests/bulk_create/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/bulk_create/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
from operator import attrgetter
Modified: django/trunk/tests/regressiontests/cache/tests.py
===================================================================
--- django/trunk/tests/regressiontests/cache/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/regressiontests/cache/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -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
Modified: django/trunk/tests/regressiontests/comment_tests/tests/model_tests.py
===================================================================
--- django/trunk/tests/regressiontests/comment_tests/tests/model_tests.py
2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/comment_tests/tests/model_tests.py
2012-03-30 08:02:08 UTC (rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import
from django.contrib.comments.models import Comment
Modified:
django/trunk/tests/regressiontests/comment_tests/tests/templatetag_tests.py
===================================================================
--- django/trunk/tests/regressiontests/comment_tests/tests/templatetag_tests.py
2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/comment_tests/tests/templatetag_tests.py
2012-03-30 08:02:08 UTC (rev 17828)
@@ -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
Modified: django/trunk/tests/regressiontests/csrf_tests/tests.py
===================================================================
--- django/trunk/tests/regressiontests/csrf_tests/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/csrf_tests/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
-from __future__ import with_statement
from django.conf import settings
from django.core.context_processors import csrf
Modified: django/trunk/tests/regressiontests/defaultfilters/tests.py
===================================================================
--- django/trunk/tests/regressiontests/defaultfilters/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/defaultfilters/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
-from __future__ import with_statement
import datetime
import decimal
Modified: django/trunk/tests/regressiontests/defer_regress/tests.py
===================================================================
--- django/trunk/tests/regressiontests/defer_regress/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/defer_regress/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
from operator import attrgetter
Modified: django/trunk/tests/regressiontests/forms/tests/models.py
===================================================================
--- django/trunk/tests/regressiontests/forms/tests/models.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/forms/tests/models.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
import datetime
Modified: django/trunk/tests/regressiontests/forms/tests/regressions.py
===================================================================
--- django/trunk/tests/regressiontests/forms/tests/regressions.py
2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/forms/tests/regressions.py
2012-03-30 08:02:08 UTC (rev 17828)
@@ -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
Modified: django/trunk/tests/regressiontests/i18n/commands/compilation.py
===================================================================
--- django/trunk/tests/regressiontests/i18n/commands/compilation.py
2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/i18n/commands/compilation.py
2012-03-30 08:02:08 UTC (rev 17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
import os
try:
from cStringIO import StringIO
Modified: django/trunk/tests/regressiontests/i18n/commands/extraction.py
===================================================================
--- django/trunk/tests/regressiontests/i18n/commands/extraction.py
2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/i18n/commands/extraction.py
2012-03-30 08:02:08 UTC (rev 17828)
@@ -1,5 +1,4 @@
# -*- encoding: utf-8 -*-
-from __future__ import with_statement
import os
import re
Modified: django/trunk/tests/regressiontests/i18n/contenttypes/tests.py
===================================================================
--- django/trunk/tests/regressiontests/i18n/contenttypes/tests.py
2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/i18n/contenttypes/tests.py
2012-03-30 08:02:08 UTC (rev 17828)
@@ -1,5 +1,4 @@
# coding: utf-8
-from __future__ import with_statement
import os
Modified: django/trunk/tests/regressiontests/i18n/patterns/tests.py
===================================================================
--- django/trunk/tests/regressiontests/i18n/patterns/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/i18n/patterns/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
import os
import warnings
Modified: django/trunk/tests/regressiontests/i18n/tests.py
===================================================================
--- django/trunk/tests/regressiontests/i18n/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/regressiontests/i18n/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -1,5 +1,5 @@
# -*- encoding: utf-8 -*-
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
import datetime
import decimal
Modified: django/trunk/tests/regressiontests/logging_tests/tests.py
===================================================================
--- django/trunk/tests/regressiontests/logging_tests/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/logging_tests/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -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.utils.log import CallbackFilter, RequireDebugFalse, getLogger
-
# logging config prior to using filter with mail_admins
OLD_LOGGING = {
'version': 1,
Modified: django/trunk/tests/regressiontests/model_formsets_regress/tests.py
===================================================================
--- django/trunk/tests/regressiontests/model_formsets_regress/tests.py
2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/model_formsets_regress/tests.py
2012-03-30 08:02:08 UTC (rev 17828)
@@ -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
Modified: django/trunk/tests/regressiontests/modeladmin/tests.py
===================================================================
--- django/trunk/tests/regressiontests/modeladmin/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/modeladmin/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import
from datetime import date
Modified: django/trunk/tests/regressiontests/requests/tests.py
===================================================================
--- django/trunk/tests/regressiontests/requests/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/requests/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
import time
import warnings
from datetime import datetime, timedelta
Modified: django/trunk/tests/regressiontests/select_related_onetoone/tests.py
===================================================================
--- django/trunk/tests/regressiontests/select_related_onetoone/tests.py
2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/select_related_onetoone/tests.py
2012-03-30 08:02:08 UTC (rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
from django.test import TestCase
Modified: django/trunk/tests/regressiontests/serializers_regress/tests.py
===================================================================
--- django/trunk/tests/regressiontests/serializers_regress/tests.py
2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/serializers_regress/tests.py
2012-03-30 08:02:08 UTC (rev 17828)
@@ -6,9 +6,7 @@
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
Modified: django/trunk/tests/regressiontests/settings_tests/tests.py
===================================================================
--- django/trunk/tests/regressiontests/settings_tests/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/settings_tests/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
import os
from django.conf import settings, global_settings
Modified: django/trunk/tests/regressiontests/staticfiles_tests/tests.py
===================================================================
--- django/trunk/tests/regressiontests/staticfiles_tests/tests.py
2012-03-29 18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/staticfiles_tests/tests.py
2012-03-30 08:02:08 UTC (rev 17828)
@@ -1,5 +1,4 @@
# -*- encoding: utf-8 -*-
-from __future__ import with_statement
import codecs
import os
Modified: django/trunk/tests/regressiontests/templates/response.py
===================================================================
--- django/trunk/tests/regressiontests/templates/response.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/templates/response.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
import os
import pickle
import time
Modified: django/trunk/tests/regressiontests/templates/tests.py
===================================================================
--- django/trunk/tests/regressiontests/templates/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/templates/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
from django.conf import settings
Modified: django/trunk/tests/regressiontests/test_utils/tests.py
===================================================================
--- django/trunk/tests/regressiontests/test_utils/tests.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/test_utils/tests.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -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
Modified: django/trunk/tests/regressiontests/text/tests.py
===================================================================
--- django/trunk/tests/regressiontests/text/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/regressiontests/text/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -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
Modified: django/trunk/tests/regressiontests/views/tests/debug.py
===================================================================
--- django/trunk/tests/regressiontests/views/tests/debug.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/views/tests/debug.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -1,4 +1,4 @@
-from __future__ import with_statement, absolute_import
+from __future__ import absolute_import
import inspect
import os
Modified: django/trunk/tests/regressiontests/views/tests/i18n.py
===================================================================
--- django/trunk/tests/regressiontests/views/tests/i18n.py 2012-03-29
18:53:27 UTC (rev 17827)
+++ django/trunk/tests/regressiontests/views/tests/i18n.py 2012-03-30
08:02:08 UTC (rev 17828)
@@ -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
Modified: django/trunk/tests/regressiontests/wsgi/tests.py
===================================================================
--- django/trunk/tests/regressiontests/wsgi/tests.py 2012-03-29 18:53:27 UTC
(rev 17827)
+++ django/trunk/tests/regressiontests/wsgi/tests.py 2012-03-30 08:02:08 UTC
(rev 17828)
@@ -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
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
