Removed most of absolute_import imports

Should be unneeded with Python 2.7 and up.
Added some unicode_literals along the way.

django/contrib/admindocs/tests/test_fields.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import unittest
 

django/contrib/comments/views/comments.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django import http
 from django.conf import settings
 from django.contrib import comments

django/contrib/comments/views/moderation.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django import template
 from django.conf import settings
 from django.contrib import comments

django/contrib/formtools/tests/urls.py

@@ -2,8 +2,6 @@
 This is a URLconf to be loaded by tests.py. Add any URLs needed for tests only.
 """
 
-from __future__ import absolute_import
-
 from django.conf.urls import patterns, url
 from django.contrib.formtools.tests.tests import TestFormPreview
 

django/contrib/gis/geoip/__init__.py

@@ -11,8 +11,6 @@
  Grab GeoIP.dat.gz and GeoLiteCity.dat.gz, and unzip them in the directory
  corresponding to settings.GEOIP_PATH.
 """
-from __future__ import absolute_import
-
 try:
     from .base import GeoIP, GeoIPException
     HAS_GEOIP = True

django/contrib/gis/tests/distapp/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from unittest import skipUnless
 

django/contrib/gis/tests/geo3d/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import os
 import re

django/contrib/gis/tests/geoadmin/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from unittest import skipUnless
 

django/contrib/gis/tests/geoapp/feeds.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from django.contrib.gis import feeds
 

django/contrib/gis/tests/geoapp/sitemaps.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.contrib.gis.sitemaps import GeoRSSSitemap, KMLSitemap, KMZSitemap
 
 from .feeds import feed_dict

django/contrib/gis/tests/geoapp/test_feeds.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from unittest import skipUnless
 from xml.dom import minidom

django/contrib/gis/tests/geoapp/test_regress.py

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 from datetime import datetime
 from unittest import skipUnless

django/contrib/gis/tests/geoapp/test_sitemaps.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from io import BytesIO
 from unittest import skipUnless

django/contrib/gis/tests/geoapp/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import re
 import unittest

django/contrib/gis/tests/geoapp/urls.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from django.conf.urls import patterns
 

django/contrib/gis/tests/geogapp/tests.py

@@ -1,7 +1,7 @@
 """
 Tests for geography support in PostGIS 1.5+
 """
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import os
 from unittest import skipUnless

django/contrib/gis/tests/inspectapp/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import os
 from unittest import skipUnless

django/contrib/gis/tests/layermap/tests.py

@@ -1,5 +1,5 @@
 # coding: utf-8
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 from copy import copy
 from decimal import Decimal

django/contrib/gis/tests/relatedapp/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from unittest import skipUnless
 

django/contrib/messages/__init__.py

@@ -1,4 +1,2 @@
-from __future__ import absolute_import
-
 from django.contrib.messages.api import *
 from django.contrib.messages.constants import *

django/core/cache/utils.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import hashlib
 from django.utils.encoding import force_bytes

django/core/management/utils.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import os
 from subprocess import PIPE, Popen

django/core/serializers/json.py

@@ -4,6 +4,7 @@ Serialize data to/from JSON
 
 # Avoid shadowing the standard library json module
 from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import datetime
 import decimal

django/db/models/sql/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.db.models.sql.datastructures import EmptyResultSet
 from django.db.models.sql.subqueries import *
 from django.db.models.sql.query import *

django/db/models/sql/where.py

@@ -2,8 +2,6 @@
 Code to manage the creation and SQL rendering of 'where' constraints.
 """
 
-from __future__ import absolute_import
-
 import collections
 import datetime
 from itertools import repeat

django/forms/__init__.py

@@ -2,8 +2,6 @@
 Django validation and HTML form handling.
 """
 
-from __future__ import absolute_import
-
 from django.core.exceptions import ValidationError
 from django.forms.fields import *
 from django.forms.forms import *

django/forms/extras/__init__.py

@@ -1,3 +1 @@
-from __future__ import absolute_import
-
 from django.forms.extras.widgets import *

django/forms/fields.py

@@ -2,7 +2,7 @@
 Field classes.
 """
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import copy
 import datetime

django/forms/forms.py

@@ -2,7 +2,7 @@
 Form classes
 """
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import copy
 import warnings

django/forms/formsets.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 from django.core.exceptions import ValidationError
 from django.forms import Form

django/forms/models.py

@@ -3,7 +3,7 @@ Helper functions for creating Form classes from Django models
 and database field objects.
 """
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import warnings
 

django/forms/widgets.py

@@ -2,7 +2,7 @@
 HTML Widget classes
 """
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import copy
 from itertools import chain

django/http/cookie.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 from django.utils.encoding import force_str
 from django.utils import six

django/http/request.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import copy
 import os

django/http/response.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import datetime
 import time

django/template/base.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import re
 from functools import partial

tests/admin_changelist/admin.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.contrib import admin
 from django.core.paginator import Paginator
 

tests/admin_changelist/tests.py

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

tests/admin_custom_urls/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 import warnings
 
 from django.contrib.admin.util import quote

tests/admin_docs/urls.py

@@ -1,6 +1,3 @@
-# coding: utf-8
-from __future__ import absolute_import
-
 from django.conf.urls import patterns
 
 from . import views

tests/admin_filters/tests.py

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

tests/admin_inlines/admin.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.contrib import admin
 from django import forms
 

tests/admin_inlines/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase
 from django.contrib.admin.helpers import InlineAdminForm

tests/admin_inlines/urls.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.conf.urls import patterns, include
 
 from . import admin

tests/admin_ordering/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 from django.test import TestCase, RequestFactory
 from django.contrib import admin

tests/admin_registration/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from django.contrib import admin
 from django.core.exceptions import ImproperlyConfigured

tests/admin_scripts/complex_app/admin/foo.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.contrib import admin
 
 from ..models.foo import Foo

tests/admin_scripts/complex_app/models/bar.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.db import models
 
 from ..admin import foo

tests/admin_scripts/simple_app/models.py

@@ -1,3 +1 @@
-from __future__ import absolute_import
-
 from ..complex_app.models.bar import Bar

tests/admin_util/tests.py

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

tests/admin_validation/tests.py

@@ -1,9 +1,10 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from django import forms
 from django.contrib import admin
 from django.core.exceptions import ImproperlyConfigured
 from django.test import TestCase
+from django.test.utils import str_prefix
 
 from .models import Song, Book, Album, TwoAlbumFKAndAnE, State, City
 
@@ -185,7 +186,8 @@ class ValidationTestCase(TestCase):
             readonly_fields = ("title", "nonexistant")
 
         self.assertRaisesMessage(ImproperlyConfigured,
-            "SongAdmin.readonly_fields[1], 'nonexistant' is not a callable or an attribute of 'SongAdmin' or found in the model 'Song'.",
+            str_prefix("SongAdmin.readonly_fields[1], %(_)s'nonexistant' is not a callable "
+                       "or an attribute of 'SongAdmin' or found in the model 'Song'."),
             SongAdmin.validate,
             Song)
 
@@ -195,7 +197,8 @@ class ValidationTestCase(TestCase):
             readonly_fields=['i_dont_exist'] # Missing attribute
 
         self.assertRaisesMessage(ImproperlyConfigured,
-            "CityInline.readonly_fields[0], 'i_dont_exist' is not a callable or an attribute of 'CityInline' or found in the model 'City'.",
+            str_prefix("CityInline.readonly_fields[0], %(_)s'i_dont_exist' is not a callable "
+                       "or an attribute of 'CityInline' or found in the model 'City'."),
             CityInline.validate,
             City)
 

tests/admin_views/admin.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import tempfile
 import os

tests/admin_views/customadmin.py

@@ -1,7 +1,7 @@
 """
 A second, custom AdminSite -- see tests.CustomAdminSiteTests.
 """
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from django.conf.urls import patterns
 from django.contrib import admin

tests/admin_views/tests.py

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

tests/admin_views/urls.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.conf.urls import patterns, include
 
 from . import views, customadmin, admin

tests/admin_widgets/tests.py

@@ -1,5 +1,5 @@
 # encoding: utf-8
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 from datetime import datetime, timedelta
 from unittest import TestCase

tests/admin_widgets/urls.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.conf.urls import patterns, include
 
 from . import  widgetadmin

tests/admin_widgets/widgetadmin.py

@@ -1,8 +1,3 @@
-"""
-
-"""
-from __future__ import absolute_import
-
 from django.contrib import admin
 
 from . import models
@@ -47,4 +42,4 @@ site.register(models.Bee)
 
 site.register(models.Advisor)
 
-site.register(models.School, SchoolAdmin)
+site.register(models.School, SchoolAdmin)

tests/aggregation/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import datetime
 from decimal import Decimal

tests/aggregation_regress/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import datetime
 import pickle

tests/app_loading/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import copy
 import os

tests/backends/tests.py

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

tests/basic/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 from datetime import datetime
 import threading

tests/bug639/tests.py

@@ -4,8 +4,6 @@ gets called *again* for each FileField. This test will fail if calling a
 ModelForm's save() method causes Model.save() to be called more than once.
 """
 
-from __future__ import absolute_import
-
 import os
 import shutil
 import unittest

tests/bug8245/admin.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.contrib import admin
 
 from .models import Story

tests/bulk_create/tests.py

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

tests/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 absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import hashlib
 import os

tests/choices/tests.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.test import TestCase
 
 from .models import Person

tests/comment_tests/tests/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.contrib.auth.models import User
 from django.contrib.comments.forms import CommentForm
 from django.contrib.comments.models import Comment

tests/comment_tests/tests/test_app_api.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.conf import settings
 from django.contrib import comments
 from django.contrib.comments.models import Comment

tests/comment_tests/tests/test_comment_form.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import time
 
 from django.conf import settings

tests/comment_tests/tests/test_comment_utils_moderators.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.contrib.comments.models import Comment
 from django.contrib.comments.moderation import (moderator, CommentModerator,
     AlreadyModerated)

tests/comment_tests/tests/test_comment_view.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 import re
 

tests/comment_tests/tests/test_feeds.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from xml.etree import ElementTree as ET
 
 from django.conf import settings

tests/comment_tests/tests/test_models.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.contrib.comments.models import Comment
 
 from . import CommentTestCase

tests/comment_tests/tests/test_moderation_views.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 from django.contrib.auth.models import User, Permission
 from django.contrib.comments import signals

tests/comment_tests/tests/test_templatetags.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.contrib.comments.forms import CommentForm
 from django.contrib.comments.models import Comment
 from django.contrib.contenttypes.models import ContentType

tests/comment_tests/urls.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.conf.urls import patterns, url
 from django.contrib.comments.feeds import LatestCommentFeed
 

tests/conditional_processing/views.py

@@ -1,6 +1,3 @@
-# -*- coding:utf-8 -*-
-from __future__ import absolute_import
-
 from django.views.decorators.http import condition, etag, last_modified
 from django.http import HttpResponse
 

tests/contenttypes_tests/models.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible

tests/contenttypes_tests/tests.py

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

tests/contenttypes_tests/urls.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 from django.conf.urls import patterns
 

tests/context_processors/urls.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.conf.urls import patterns, url
 
 from . import views

tests/custom_columns/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from django.core.exceptions import FieldError
 from django.test import TestCase

tests/custom_columns_regress/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from django.core.exceptions import FieldError
 from django.test import TestCase

tests/custom_managers/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from django.test import TestCase
 from django.utils import six

tests/custom_managers_regress/tests.py

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

tests/custom_methods/tests.py

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

tests/custom_pk/models.py

@@ -6,7 +6,7 @@ By default, Django adds an ``"id"`` field to each model. But you can override
 this behavior by explicitly adding ``primary_key=True`` to a field.
 """
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 from django.db import models
 

tests/custom_pk/tests.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
 
 from django.db import transaction, IntegrityError
 from django.test import TestCase, skipIfDBFeature

tests/datatypes/tests.py

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

tests/dates/tests.py

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

tests/datetimes/tests.py

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

tests/defer/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from django.db.models.query_utils import DeferredAttribute, InvalidQuery
 from django.test import TestCase

tests/defer_regress/tests.py

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

tests/delete/tests.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from django.db import models, IntegrityError, connection
 from django.test import TestCase, skipUnlessDBFeature, skipIfDBFeature

tests/delete_regress/tests.py

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

tests/dispatch/tests/__init__.py

@@ -2,7 +2,5 @@
 Unit-tests for the dispatch project
 """
 
-from __future__ import absolute_import
-
 from .test_dispatcher import DispatcherTests, ReceiverTestCase
 from .test_saferef import SaferefTests

tests/distinct_on_fields/tests.py

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

tests/empty/tests.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.core.exceptions import ImproperlyConfigured
 from django.db.models.loading import get_app
 from django.test import TestCase