angler-fishThe Vulnerability History Project

[1.8.x] Sorted imports with isort; refs #23860.

      Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
by Lindsey the Elephant Seal 2015-02-09 18:19:34 UTC
commit a8b70d251d238b4e6cfc7bb4296da15494f8dff3
Django VCC CVE-2016-2513 VCC Unsafe-URLS's CVE-2017-7233
django/apps/config.py
+3 -2
django/apps/registry.py
+2 -2
django/conf/project_template/project_name/settings.py
-1
django/conf/project_template/project_name/wsgi.py
+1 -3
django/contrib/admin/actions.py
+2 -2
django/contrib/admin/apps.py
+1 -1
django/contrib/admin/checks.py
+2 -6
django/contrib/admin/filters.py
+6 -8
django/contrib/admin/forms.py
+1
django/contrib/admin/helpers.py
+5 -6
django/contrib/admin/migrations/0001_initial.py
+2 -2
django/contrib/admin/models.py
+5 -4
django/contrib/admin/options.py
+21 -23
django/contrib/admin/sites.py
+7 -8
django/contrib/admin/templatetags/admin_list.py
+9 -10
django/contrib/admin/util.py
+1 -1
django/contrib/admin/utils.py
+1 -1
django/contrib/admin/validation.py
+2 -4
django/contrib/admin/views/main.py
+11 -15
django/contrib/admin/widgets.py
+5 -7
django/contrib/admindocs/apps.py
+1
django/contrib/admindocs/middleware.py
+1 -1
django/contrib/admindocs/utils.py
+2 -3
django/contrib/admindocs/views.py
+8 -10
django/contrib/auth/admin.py
+8 -8
django/contrib/auth/apps.py
+1 -1
django/contrib/auth/backends.py
-1
django/contrib/auth/decorators.py
+1 -2
django/contrib/auth/forms.py
+6 -7
django/contrib/auth/handlers/modwsgi.py
+1 -1
django/contrib/auth/hashers.py
+7 -7
django/contrib/auth/migrations/0001_initial.py
+2 -2
django/contrib/auth/migrations/0002_alter_permission_name_max_length.py
+1 -1
django/contrib/auth/migrations/0003_alter_user_email_max_length.py
+1 -1
django/contrib/auth/migrations/0004_alter_user_username_opts.py
+1 -1
django/contrib/auth/migrations/0005_alter_user_last_login_null.py
+1 -1
django/contrib/auth/models.py
+10 -9
django/contrib/auth/tests/backend_alias.py
+1 -3
django/contrib/auth/tests/custom_user.py
+8 -3
django/contrib/auth/tests/settings.py
+1
django/contrib/auth/tests/test_auth_backends.py
+4 -7
django/contrib/auth/tests/test_basic.py
+1 -1
django/contrib/auth/tests/test_context_processors.py
+2 -2
django/contrib/auth/tests/test_forms.py
+5 -7
django/contrib/auth/tests/test_handlers.py
+4 -5
django/contrib/auth/tests/test_hashers.py
+4 -6
django/contrib/auth/tests/test_management.py
+7 -10
django/contrib/auth/tests/test_models.py
+1 -3
django/contrib/auth/tests/test_signals.py
+2 -1
django/contrib/auth/tests/test_templates.py
+4 -3
django/contrib/auth/tests/test_tokens.py
+2 -2
django/contrib/auth/tests/test_views.py
+11 -12
django/contrib/auth/tests/urls.py
+5 -5
django/contrib/auth/tests/urls_admin.py
+2 -2
django/contrib/auth/tokens.py
+2 -3
django/contrib/auth/views.py
+11 -14
django/contrib/contenttypes/admin.py
+1 -1
django/contrib/contenttypes/checks.py
+1 -1
django/contrib/contenttypes/fields.py
+5 -4
django/contrib/contenttypes/forms.py
+1 -1
django/contrib/contenttypes/generic.py
+6 -6
django/contrib/contenttypes/migrations/0001_initial.py
+1 -1
django/contrib/contenttypes/migrations/0002_remove_content_type_name.py
+1 -1
django/contrib/contenttypes/models.py
+1 -1
django/contrib/contenttypes/tests/tests.py
+1 -4
django/contrib/flatpages/admin.py
+1 -1
django/contrib/flatpages/apps.py
+1
django/contrib/flatpages/middleware.py
+1 -1
django/contrib/flatpages/migrations/0001_initial.py
+1 -1
django/contrib/flatpages/models.py
+2 -2
django/contrib/flatpages/templatetags/flatpages.py
+1
django/contrib/flatpages/tests/settings.py
+1
django/contrib/flatpages/tests/test_csrf.py
+2 -1
django/contrib/flatpages/tests/test_models.py
+1 -1
django/contrib/flatpages/tests/test_templatetags.py
+1 -1
django/contrib/gis/admin/options.py
+1 -1
django/contrib/gis/admin/widgets.py
+5 -3
django/contrib/gis/apps.py
+1
django/contrib/gis/db/backends/mysql/base.py
+1 -2
django/contrib/gis/db/backends/mysql/features.py
+1 -2
django/contrib/gis/db/backends/mysql/operations.py
+1 -2
django/contrib/gis/db/backends/mysql/schema.py
+1 -1
django/contrib/gis/db/backends/oracle/adapter.py
-1
django/contrib/gis/db/backends/oracle/base.py
+1 -2
django/contrib/gis/db/backends/oracle/features.py
+1 -2
django/contrib/gis/db/backends/oracle/introspection.py
+1 -3
django/contrib/gis/db/backends/oracle/operations.py
+2 -2
django/contrib/gis/db/backends/postgis/base.py
+3 -2
django/contrib/gis/db/backends/postgis/features.py
+3 -2
django/contrib/gis/db/backends/postgis/introspection.py
+1 -2
django/contrib/gis/db/backends/postgis/models.py
+1 -1
django/contrib/gis/db/backends/postgis/operations.py
+2 -4
django/contrib/gis/db/backends/spatialite/adapter.py
+1 -1
django/contrib/gis/db/backends/spatialite/features.py
+1 -2
django/contrib/gis/db/backends/spatialite/introspection.py
+1 -3
django/contrib/gis/db/backends/spatialite/models.py
+2 -2
django/contrib/gis/db/backends/spatialite/operations.py
+2 -3
django/contrib/gis/db/backends/spatialite/schema.py
+1 -1
django/contrib/gis/db/backends/util.py
+1 -1
django/contrib/gis/db/models/aggregates.py
+1 -1
django/contrib/gis/db/models/fields.py
+3 -3
django/contrib/gis/db/models/lookups.py
+1 -2
django/contrib/gis/db/models/manager.py
+1 -1
django/contrib/gis/db/models/query.py
+7 -5
django/contrib/gis/db/models/sql/aggregates.py
+1
django/contrib/gis/forms/fields.py
+2 -2
django/contrib/gis/forms/widgets.py
+3 -2
django/contrib/gis/gdal/datasource.py
+3 -1
django/contrib/gis/gdal/driver.py
+1 -1
django/contrib/gis/gdal/envelope.py
-1
django/contrib/gis/gdal/feature.py
+5 -1
django/contrib/gis/gdal/field.py
-1
django/contrib/gis/gdal/geometries.py
+11 -7
django/contrib/gis/gdal/geomtype.py
+1
django/contrib/gis/gdal/layer.py
+10 -9
django/contrib/gis/gdal/libgdal.py
+1 -1
django/contrib/gis/gdal/prototypes/ds.py
+3 -6
django/contrib/gis/gdal/prototypes/errcheck.py
+1 -3
django/contrib/gis/gdal/prototypes/generation.py
+2 -4
django/contrib/gis/gdal/prototypes/geom.py
+3 -6
django/contrib/gis/gdal/prototypes/raster.py
+3 -5
django/contrib/gis/gdal/prototypes/srs.py
+3 -6
django/contrib/gis/gdal/raster/source.py
+4 -5
django/contrib/gis/gdal/srs.py
+1
django/contrib/gis/gdal/tests/test_ds.py
+1 -3
django/contrib/gis/gdal/tests/test_geom.py
+5 -7
django/contrib/gis/geoip/base.py
+5 -5
django/contrib/gis/geoip/libgeoip.py
-1
django/contrib/gis/geoip/prototypes.py
+2 -3
django/contrib/gis/geoip/tests.py
+2 -1
django/contrib/gis/geometry/backend/geos.py
+1 -2
django/contrib/gis/geometry/test_data.py
+1
django/contrib/gis/geos/collections.py
+3 -4
django/contrib/gis/geos/coordseq.py
+2 -3
django/contrib/gis/geos/factory.py
+2 -1
django/contrib/gis/geos/geometry.py
+21 -13
django/contrib/gis/geos/io.py
+1 -3
django/contrib/gis/geos/libgeos.py
+1 -1
django/contrib/gis/geos/linestring.py
+1 -1
django/contrib/gis/geos/mutable_list.py
+1 -1
django/contrib/gis/geos/point.py
+1 -2
django/contrib/gis/geos/polygon.py
+3 -4
django/contrib/gis/geos/prototypes/coordseq.py
+3 -6
django/contrib/gis/geos/prototypes/errcheck.py
+1 -1
django/contrib/gis/geos/prototypes/geom.py
+2 -4
django/contrib/gis/geos/prototypes/io.py
+3 -5
django/contrib/gis/geos/prototypes/misc.py
+1 -2
django/contrib/gis/geos/prototypes/predicates.py
-1
django/contrib/gis/geos/prototypes/prepared.py
+1 -4
django/contrib/gis/geos/prototypes/threadsafe.py
+1 -4
django/contrib/gis/geos/prototypes/topology.py
+1 -4
django/contrib/gis/geos/tests/test_geos.py
+4 -2
django/contrib/gis/geos/tests/test_io.py
+1 -1
django/contrib/gis/management/commands/inspectdb.py
+1 -2
django/contrib/gis/maps/google/gmap.py
+2 -3
django/contrib/gis/maps/google/overlays.py
+3 -5
django/contrib/gis/maps/google/zoom.py
+2 -3
django/contrib/gis/measure.py
+1 -1
django/contrib/gis/serializers/geojson.py
+1 -3
django/contrib/gis/sitemaps/kml.py
+2 -2
django/contrib/gis/sitemaps/views.py
+2 -2
django/contrib/gis/tests/distapp/tests.py
+3 -5
django/contrib/gis/tests/geo3d/tests.py
+1 -1
django/contrib/gis/tests/geoadmin/models.py
+1 -1
django/contrib/gis/tests/geoapp/sitemaps.py
+1
django/contrib/gis/tests/geoapp/test_feeds.py
+2 -2
django/contrib/gis/tests/geoapp/test_sitemaps.py
+2 -3
django/contrib/gis/tests/geoapp/tests.py
+2 -4
django/contrib/gis/tests/geoapp/urls.py
+2 -1
django/contrib/gis/tests/gis_migrations/migrations/0001_initial.py
+1 -1
django/contrib/gis/tests/gis_migrations/test_commands.py
+1 -1
django/contrib/gis/tests/gis_migrations/test_operations.py
+1 -1
django/contrib/gis/tests/inspectapp/tests.py
+2 -2
django/contrib/gis/tests/layermap/tests.py
+3 -3
django/contrib/gis/tests/test_geoforms.py
+1 -1
django/contrib/gis/tests/test_measure.py
+1 -1
django/contrib/gis/tests/test_spatialrefsys.py
+3 -3
django/contrib/gis/utils/layermapping.py
+6 -9
django/contrib/gis/utils/ogrinspect.py
+2 -4
django/contrib/gis/utils/srs.py
+1 -1
django/contrib/humanize/apps.py
+1
django/contrib/humanize/templatetags/humanize.py
+1 -1
django/contrib/humanize/tests.py
+8 -9
django/contrib/messages/apps.py
+1
django/contrib/messages/storage/base.py
+2 -1
django/contrib/messages/storage/cookie.py
+2 -2
django/contrib/messages/storage/session.py
+1 -3
django/contrib/messages/tests/base.py
+2 -2
django/contrib/messages/tests/test_api.py
+2 -1
django/contrib/messages/tests/test_cookie.py
+3 -4
django/contrib/messages/tests/test_fallback.py
+6 -9
django/contrib/messages/tests/test_mixins.py
+1 -1
django/contrib/messages/tests/test_session.py
+2 -2
django/contrib/messages/tests/urls.py
+3 -4
django/contrib/postgres/fields/array.py
+2 -1
django/contrib/postgres/fields/hstore.py
+2 -1
django/contrib/postgres/fields/ranges.py
+4 -3
django/contrib/postgres/forms/array.py
+3 -5
django/contrib/postgres/forms/hstore.py
+1
django/contrib/postgres/forms/ranges.py
+4 -3
django/contrib/postgres/signals.py
+2 -2
django/contrib/postgres/validators.py
+2 -2
django/contrib/redirects/apps.py
+1
django/contrib/redirects/middleware.py
+1 -1
django/contrib/redirects/migrations/0001_initial.py
+1 -1
django/contrib/redirects/models.py
+2 -2
django/contrib/sessions/apps.py
+1
django/contrib/sessions/backends/base.py
+6 -5
django/contrib/sessions/backends/cache.py
+1 -1
django/contrib/sessions/backends/cached_db.py
+2 -1
django/contrib/sessions/backends/db.py
+4 -3
django/contrib/sessions/backends/file.py
+4 -5
django/contrib/sessions/backends/signed_cookies.py
+2 -1
django/contrib/sessions/middleware.py
+1 -1
django/contrib/sessions/migrations/0001_initial.py
+1 -1
django/contrib/sessions/models.py
+2 -1
django/contrib/sessions/serializers.py
-1
django/contrib/sessions/tests.py
+11 -13
django/contrib/sitemaps/apps.py
+1
django/contrib/sitemaps/management/commands/ping_google.py
+1 -1
django/contrib/sitemaps/tests/test_flatpages.py
+1 -1
django/contrib/sitemaps/tests/test_generic.py
+1 -1
django/contrib/sitemaps/tests/test_http.py
+3 -3
django/contrib/sitemaps/tests/urls/http.py
+3 -5
django/contrib/sitemaps/views.py
+1 -1
django/contrib/sites/apps.py
+1
django/contrib/sites/migrations/0001_initial.py
+2 -2
django/contrib/sites/models.py
+2 -1
django/contrib/sites/tests.py
+1 -1
django/contrib/staticfiles/apps.py
+1
django/contrib/staticfiles/finders.py
+7 -8
django/contrib/staticfiles/handlers.py
+4 -3
django/contrib/staticfiles/management/commands/collectstatic.py
+4 -3
django/contrib/staticfiles/management/commands/findstatic.py
+2 -2
django/contrib/staticfiles/management/commands/runserver.py
+2 -2
django/contrib/staticfiles/storage.py
+7 -10
django/contrib/staticfiles/templatetags/staticfiles.py
+1 -1
django/contrib/staticfiles/testing.py
+2 -1
django/contrib/staticfiles/utils.py
+1 -2
django/contrib/staticfiles/views.py
+2 -1
django/contrib/syndication/apps.py
+1
django/contrib/syndication/views.py
+4 -3
django/contrib/webdesign/apps.py
+1
django/core/cache/backends/base.py
+1 -1
django/core/cache/backends/db.py
+7 -7
django/core/cache/backends/dummy.py
+1 -1
django/core/cache/backends/filebased.py
+1 -3
django/core/cache/backends/locmem.py
+4 -5
django/core/cache/backends/memcached.py
+3 -5
django/core/cache/utils.py
-1
django/core/checks/compatibility/django_1_7_0.py
+1 -1
django/core/checks/messages.py
+2 -1
django/core/checks/security/base.py
+2 -1
django/core/checks/security/csrf.py
+2 -1
django/core/checks/security/sessions.py
+1 -1
django/core/context_processors.py
+2 -1
django/core/files/move.py
+1
django/core/files/storage.py
+8 -7
django/core/files/temp.py
-1
django/core/files/uploadedfile.py
+1 -1
django/core/files/uploadhandler.py
+1 -3
django/core/handlers/base.py
+4 -5
django/core/handlers/wsgi.py
+6 -4
django/core/mail/backends/filebased.py
+1 -2
django/core/mail/backends/smtp.py
+1 -1
django/core/mail/message.py
+8 -8
django/core/management/base.py
+5 -5
django/core/management/color.py
+2 -1
django/core/management/commands/createcachetable.py
+1 -3
django/core/management/commands/dbshell.py
+1 -1
django/core/management/commands/dumpdata.py
+3 -2
django/core/management/commands/flush.py
+3 -3
django/core/management/commands/inspectdb.py
+2 -2
django/core/management/commands/loaddata.py
+5 -7
django/core/management/commands/makemessages.py
+5 -6
django/core/management/commands/makemigrations.py
+4 -6
django/core/management/commands/migrate.py
+5 -7
django/core/management/commands/runserver.py
+7 -6
django/core/management/commands/showmigrations.py
+1 -1
django/core/management/commands/sql.py
+1 -1
django/core/management/commands/sqlall.py
+1 -1
django/core/management/commands/sqlclear.py
+1 -1
django/core/management/commands/sqlcustom.py
+1 -1
django/core/management/commands/sqldropindexes.py
+1 -1
django/core/management/commands/sqlflush.py
+1 -1
django/core/management/commands/sqlindexes.py
+1 -1
django/core/management/commands/sqlmigrate.py
+1 -1
django/core/management/commands/sqlsequencereset.py
+1 -1
django/core/management/commands/squashmigrations.py
+5 -5
django/core/management/commands/syncdb.py
+1 -1
django/core/management/commands/test.py
+1 -1
django/core/management/templates.py
+6 -4
django/core/management/utils.py
+2 -2
django/core/serializers/json.py
+4 -4
django/core/serializers/python.py
+1 -1
django/core/serializers/pyyaml.py
+4 -6
django/core/serializers/xml_serializer.py
+5 -6
django/core/servers/basehttp.py
+1 -1
django/core/urlresolvers.py
+5 -4
django/core/validators.py
+3 -2
django/db/backends/base/base.py
+4 -3
django/db/backends/base/creation.py
+1
django/db/backends/base/introspection.py
+1
django/db/backends/base/operations.py
+1 -1
django/db/backends/dummy/base.py
+1 -1
django/db/backends/mysql/base.py
+10 -10
django/db/backends/mysql/introspection.py
+4 -4
django/db/backends/oracle/base.py
+7 -7
django/db/backends/oracle/creation.py
+1
django/db/backends/oracle/operations.py
+1 -1
django/db/backends/oracle/schema.py
+3 -3
django/db/backends/postgresql_psycopg2/base.py
+9 -9
django/db/backends/postgresql_psycopg2/introspection.py
+1 -1
django/db/backends/postgresql_psycopg2/operations.py
+2 -2
django/db/backends/postgresql_psycopg2/schema.py
+2 -2
django/db/backends/sqlite3/base.py
+7 -7
django/db/backends/sqlite3/introspection.py
+1
django/db/backends/sqlite3/operations.py
+3 -3
django/db/backends/sqlite3/schema.py
+2 -2
django/db/backends/util.py
+1 -1
django/db/backends/utils.py
+1
django/db/migrations/autodetector.py
+5 -4
django/db/migrations/executor.py
+1 -2
django/db/migrations/graph.py
-1
django/db/migrations/loader.py
+2 -1
django/db/migrations/migration.py
-1
django/db/migrations/operations/base.py
-1
django/db/migrations/operations/fields.py
-1
django/db/migrations/operations/models.py
+2 -2
django/db/migrations/state.py
+4 -5
django/db/migrations/writer.py
+3 -2
django/db/models/aggregates.py
+1 -1
django/db/models/deletion.py
+1 -1
django/db/models/expressions.py
+1 -1
django/db/models/fields/files.py
+5 -5
django/db/models/fields/related.py
+10 -11
django/db/models/loading.py
+1
django/db/models/lookups.py
+1 -1
django/db/models/manager.py
+1 -1
django/db/models/options.py
+3 -5
django/db/models/query.py
+9 -12
django/db/models/query_utils.py
+3 -1
django/db/models/sql/aggregates.py
+2 -1
django/db/models/sql/compiler.py
+5 -6
django/db/models/sql/query.py
+13 -16
django/db/models/sql/subqueries.py
+1
django/db/models/sql/where.py
+5 -3
django/db/transaction.py
+2 -2
django/db/utils.py
+5 -4
django/dispatch/weakref_backports.py
+1
django/forms/extras/widgets.py
+5 -4
django/forms/fields.py
+13 -13
django/forms/forms.py
+7 -8
django/forms/formsets.py
+4 -3
django/forms/models.py
+10 -11
django/forms/util.py
+1 -1
django/forms/utils.py
+11 -9
django/forms/widgets.py
+3 -3
django/http/cookie.py
+2 -2
django/http/multipartparser.py
+2 -4
django/http/request.py
+4 -5
django/http/response.py
+4 -4
django/middleware/cache.py
+3 -5
django/middleware/common.py
+4 -3
django/middleware/csrf.py
+2 -1
django/middleware/gzip.py
+1 -1
django/middleware/locale.py
+3 -4
django/shortcuts.py
+7 -9
django/template/backends/base.py
+1 -2
django/template/backends/django.py
+2 -1
django/template/backends/jinja2.py
+2 -2
django/template/base.py
+14 -16
django/template/context.py
+2 -1
django/template/debug.py
+3 -5
django/template/defaultfilters.py
+12 -13
django/template/defaulttags.py
+14 -15
django/template/engine.py
+3 -1
django/template/loader.py
+5 -3
django/template/loader_tags.py
+3 -4
django/template/loaders/cached.py
-1
django/template/loaders/eggs.py
+5 -5
django/template/response.py
+1 -1
django/template/utils.py
+3 -2
django/templatetags/cache.py
+2 -4
django/templatetags/future.py
+3 -4
django/templatetags/i18n.py
+4 -5
django/templatetags/l10n.py
+2 -1
django/templatetags/tz.py
+4 -3
django/test/client.py
+9 -10
django/test/html.py
+4 -3
django/test/runner.py
+1 -1
django/test/signals.py
+2 -2
django/test/testcases.py
+12 -15
django/test/utils.py
+5 -5
django/utils/_os.py
+2 -2
django/utils/autoreload.py
+1 -2
django/utils/cache.py
+1 -1
django/utils/crypto.py
+9 -8
django/utils/dateformat.py
+5 -7
django/utils/dateparse.py
+2 -2
django/utils/dates.py
+1 -1
django/utils/datetime_safe.py
+1 -3
django/utils/deconstruct.py
+1 -3
django/utils/decorators.py
+1 -1
django/utils/dictconfig.py
+5 -5
django/utils/encoding.py
+2 -3
django/utils/feedgenerator.py
+3 -3
django/utils/formats.py
+6 -8
django/utils/functional.py
+1 -1
django/utils/html.py
+5 -6
django/utils/html_parser.py
+1 -2
django/utils/http.py
+4 -4
django/utils/importlib.py
+2 -1
django/utils/ipv6.py
+1 -1
django/utils/jslex.py
-1
django/utils/log.py
+4 -3
django/utils/module_loading.py
+2 -3
django/utils/numberformat.py
+1 -1
django/utils/safestring.py
+1 -1
django/utils/text.py
+5 -5
django/utils/timezone.py
+6 -6
django/utils/translation/trans_real.py
+7 -9
django/utils/tzinfo.py
+2 -4
django/views/csrf.py
-1
django/views/debug.py
+7 -6
django/views/decorators/cache.py
+2 -5
django/views/decorators/csrf.py
+2 -3
django/views/decorators/gzip.py
+1 -1
django/views/decorators/http.py
+3 -7
django/views/decorators/vary.py
-1
django/views/defaults.py
+1 -1
django/views/generic/base.py
+2 -2
django/views/generic/dates.py
+4 -9
django/views/generic/detail.py
+1 -1
django/views/generic/edit.py
+3 -4
django/views/generic/list.py
+2 -2
django/views/i18n.py
+5 -7
django/views/static.py
+4 -6
docs/_ext/applyxrefs.py
+1 -1
docs/_ext/djangodocs.py
+4 -3
docs/_ext/literals_to_xrefs.py
+1 -1
scripts/manage_translations.py
+3 -2
setup.py
+2 -2
tests/admin_autodiscover/admin.py
+1
tests/admin_changelist/admin.py
+3 -2
tests/admin_changelist/tests.py
+13 -16
tests/admin_changelist/urls.py
+1
tests/admin_checks/models.py
+2 -2
tests/admin_checks/tests.py
+1 -1
tests/admin_custom_urls/tests.py
+1 -1
tests/admin_custom_urls/urls.py
+1
tests/admin_docs/tests.py
+2 -2
tests/admin_docs/views.py
+1 -1
tests/admin_filters/models.py
+1 -3
tests/admin_filters/tests.py
+5 -7
tests/admin_inlines/admin.py
+1 -1
tests/admin_inlines/models.py
+1 -2
tests/admin_inlines/tests.py
+5 -3
tests/admin_inlines/urls.py
+1
tests/admin_ordering/tests.py
+3 -5
tests/admin_registration/tests.py
+1 -1
tests/admin_scripts/app_with_import/models.py
+1 -1
tests/admin_scripts/complex_app/admin/foo.py
+1
tests/admin_scripts/tests.py
+7 -9
tests/admin_scripts/urls.py
-1
tests/admin_utils/tests.py
+6 -10
tests/admin_validation/tests.py
+1 -1
tests/admin_views/admin.py
+27 -26
tests/admin_views/custom_has_permission_admin.py
+1 -1
tests/admin_views/customadmin.py
+3 -3
tests/admin_views/models.py
+2 -2
tests/admin_views/tests.py
+34 -35
tests/admin_views/urls.py
+2 -1
tests/admin_widgets/models.py
+1 -1
tests/admin_widgets/tests.py
+11 -9
tests/admin_widgets/urls.py
+1
tests/aggregation/tests.py
+7 -6
tests/aggregation_regress/models.py
+1 -1
tests/aggregation_regress/tests.py
+4 -6
tests/annotations/tests.py
+4 -4
tests/apps/models.py
+1
tests/apps/tests.py
+5 -4
tests/backends/models.py
+1 -1
tests/backends/tests.py
+8 -12
tests/basic/tests.py
+7 -8
tests/builtin_server/tests.py
+2 -1
tests/bulk_create/tests.py
+3 -4
tests/cache/models.py
+2 -1
tests/cache/tests.py
+18 -21
tests/check_framework/test_model_field_deprecation.py
+1 -1
tests/check_framework/test_security.py
+4 -1
tests/check_framework/tests.py
+3 -4
tests/choices/models.py
+1
tests/commands_sql/tests.py
+3 -5
tests/commands_sql_migrations/migrations/0001_initial.py
+1 -1
tests/commands_sql_migrations/tests.py
+3 -4
tests/conditional_processing/tests.py
+1
tests/conditional_processing/urls.py
+1
tests/conditional_processing/views.py
+2 -2
tests/contenttypes_tests/tests.py
+3 -3
tests/context_processors/urls.py
+1
tests/csrf_tests/tests.py
+2 -5
tests/custom_columns/tests.py
+1 -1
tests/custom_lookups/tests.py
+3 -3
tests/custom_managers/models.py
+1 -3
tests/custom_managers/tests.py
+3 -5
tests/custom_pk/models.py
+1 -1
tests/custom_pk/tests.py
+2 -2
tests/dates/tests.py
+1 -1
tests/datetimes/tests.py
+6 -5
tests/db_functions/tests.py
+3 -3
tests/db_typecasts/tests.py
+1
tests/decorators/tests.py
+8 -16
tests/defer/tests.py
+1 -3
tests/defer_regress/tests.py
+4 -6
tests/delete/tests.py
+5 -6
tests/delete_regress/models.py
+1 -1
tests/delete_regress/tests.py
+5 -7
tests/deprecation/tests.py
+1 -1
tests/dispatch/tests.py
+1
tests/distinct_on_fields/tests.py
+1 -1
tests/expressions/tests.py
+7 -11
tests/expressions_case/tests.py
+4 -4
tests/extra_regress/tests.py
+2 -2
tests/field_subclassing/fields.py
+3 -1
tests/field_subclassing/models.py
+3 -2
tests/field_subclassing/tests.py
+1 -1
tests/file_storage/models.py
+1 -1
tests/file_storage/tests.py
+8 -7
tests/file_storage/urls.py
+1
tests/file_uploads/tests.py
+4 -2
tests/file_uploads/urls.py
+1
tests/file_uploads/views.py
+1 -1
tests/files/tests.py
+5 -5
tests/fixtures/tests.py
+3 -5
tests/fixtures_migration/tests.py
+1 -1
tests/fixtures_regress/tests.py
+16 -17
tests/force_insert_update/tests.py
+3 -4
tests/foreign_object/models.py
+1 -2
tests/foreign_object/tests.py
+5 -8
tests/forms_tests/models.py
+1
tests/forms_tests/tests/test_error_messages.py
+3 -3
tests/forms_tests/tests/test_extra.py
+3 -4
tests/forms_tests/tests/test_fields.py
+13 -11
tests/forms_tests/tests/test_forms.py
+6 -6
tests/forms_tests/tests/test_formsets.py
+2 -4
tests/forms_tests/tests/test_input_formats.py
+3 -2
tests/forms_tests/tests/test_media.py
+2 -2
tests/forms_tests/tests/test_regressions.py
+2 -2
tests/forms_tests/tests/test_utils.py
+3 -3
tests/forms_tests/tests/test_widgets.py
+4 -4
tests/forms_tests/tests/tests.py
+3 -7
tests/forms_tests/urls.py
+1
tests/from_db_value/tests.py
+1 -1
tests/generic_inline_admin/admin.py
+3 -3
tests/generic_inline_admin/models.py
+1 -1
tests/generic_inline_admin/tests.py
+3 -5
tests/generic_relations/models.py
+1 -1
tests/generic_relations/tests.py
+4 -5
tests/generic_relations_regress/models.py
+3 -2
tests/generic_relations_regress/tests.py
+6 -5
tests/generic_views/test_base.py
+3 -5
tests/generic_views/test_edit.py
+2 -2
tests/generic_views/test_list.py
+2 -2
tests/generic_views/urls.py
+3 -1
tests/generic_views/views.py
+1 -1
tests/get_earliest_or_latest/tests.py
+1 -1
tests/get_object_or_404/tests.py
+2 -2
tests/get_or_create/tests.py
+5 -7
tests/handlers/tests.py
+4 -5
tests/http_utils/tests.py
+2 -4
tests/httpwrappers/tests.py
+8 -9
tests/i18n/contenttypes/tests.py
+2 -1
tests/i18n/patterns/tests.py
+3 -5
tests/i18n/patterns/urls/default.py
+1
tests/i18n/patterns/urls/included.py
+1
tests/i18n/patterns/urls/namespace.py
+1
tests/i18n/patterns/urls/path_unused.py
+1
tests/i18n/patterns/urls/wrong.py
+1
tests/i18n/patterns/urls/wrong_namespace.py
+1
tests/i18n/test_compilation.py
+6 -7
tests/i18n/test_extraction.py
+6 -6
tests/i18n/tests.py
+25 -20
tests/i18n/urls.py
+1
tests/indexes/models.py
+2 -1
tests/initial_sql_regress/tests.py
+1 -1
tests/inline_formsets/tests.py
+1 -1
tests/introspection/tests.py
+1 -1
tests/invalid_models_tests/test_models.py
+1 -1
tests/invalid_models_tests/test_relative_fields.py
+1 -1
tests/known_related_objects/tests.py
+1 -1
tests/logging_tests/tests.py
+5 -4
tests/logging_tests/views.py
+1 -1
tests/lookup/tests.py
+1 -1
tests/m2m_and_m2o/tests.py
+1 -1
tests/m2m_intermediary/tests.py
+1 -1
tests/m2m_regress/tests.py
+2 -4
tests/m2m_signals/tests.py
+1 -1
tests/m2m_through/tests.py
+3 -5
tests/m2m_through_regress/tests.py
+3 -4
tests/mail/tests.py
+8 -9
tests/managers_regress/models.py
+2 -2
tests/managers_regress/tests.py
+12 -2
tests/many_to_one/tests.py
+4 -6
tests/max_lengths/tests.py
+1 -1
tests/middleware/test_security.py
+1 -1
tests/middleware/tests.py
+6 -8
tests/middleware/views.py
+5 -5
tests/middleware_exceptions/tests.py
+1 -1
tests/migrate_signals/tests.py
+2 -1
tests/migration_test_data_persistence/migrations/0001_initial.py
+1 -1
tests/migration_test_data_persistence/tests.py
+1 -2
tests/migrations/migrations_test_apps/lookuperror_a/migrations/0001_initial.py
+1 -1
tests/migrations/migrations_test_apps/lookuperror_a/migrations/0002_a2.py
+1 -1
tests/migrations/migrations_test_apps/lookuperror_a/migrations/0003_a3.py
+1 -1
tests/migrations/migrations_test_apps/lookuperror_a/migrations/0004_a4.py
+1 -1
tests/migrations/migrations_test_apps/lookuperror_b/migrations/0001_initial.py
+1 -1
tests/migrations/migrations_test_apps/lookuperror_b/migrations/0002_b2.py
+1 -1
tests/migrations/migrations_test_apps/lookuperror_b/migrations/0003_b3.py
+1 -1
tests/migrations/migrations_test_apps/lookuperror_c/migrations/0001_initial.py
+1 -1
tests/migrations/migrations_test_apps/lookuperror_c/migrations/0002_c2.py
+1 -1
tests/migrations/migrations_test_apps/lookuperror_c/migrations/0003_c3.py
+1 -1
tests/migrations/migrations_test_apps/unmigrated_app/models.py
-1
tests/migrations/test_autodetector.py
+5 -5
tests/migrations/test_commands.py
+1 -1
tests/migrations/test_executor.py
+2 -2
tests/migrations/test_graph.py
+1 -3
tests/migrations/test_loader.py
+3 -2
tests/migrations/test_migrations_custom_user/0001_initial.py
+1 -1
tests/migrations/test_migrations_no_changes/0003_third.py
+1 -1
tests/migrations/test_migrations_no_default/0001_initial.py
+1 -1
tests/migrations/test_multidb.py
+6 -6
tests/migrations/test_operations.py
+5 -5
tests/migrations/test_optimizer.py
+3 -2
tests/migrations/test_state.py
+3 -6
tests/migrations/test_writer.py
+9 -11
tests/model_fields/models.py
+10 -12
tests/model_fields/test_field_flags.py
+4 -2
tests/model_fields/test_uuid.py
+1 -1
tests/model_fields/tests.py
+14 -14
tests/model_forms/models.py
+2 -1
tests/model_forms/tests.py
+12 -18
tests/model_formsets/tests.py
+7 -11
tests/model_formsets_regress/tests.py
+4 -7
tests/model_inheritance/models.py
-1
tests/model_inheritance/same_model_name/models.py
+2 -2
tests/model_inheritance/tests.py
+3 -4
tests/model_inheritance_regress/tests.py
+6 -8
tests/model_meta/models.py
+3 -4
tests/model_meta/results.py
+3 -1
tests/model_meta/test_legacy.py
+1 -1
tests/model_meta/tests.py
+5 -7
tests/model_options/models/tablespaces.py
-1
tests/model_options/test_default_related_name.py
+1 -1
tests/model_options/test_tablespaces.py
+2 -3
tests/model_package/tests.py
+2 -2
tests/model_permalink/views.py
+5 -5
tests/model_regress/models.py
+1
tests/model_regress/test_pickle.py
+1 -1
tests/model_regress/tests.py
+4 -6
tests/model_validation/tests.py
+2 -2
tests/modeladmin/tests.py
+6 -8
tests/multiple_database/models.py
+1 -1
tests/multiple_database/tests.py
+2 -2
tests/nested_foreign_keys/tests.py
+1 -3
tests/null_fk/tests.py
+2 -3
tests/null_fk_ordering/tests.py
+1 -1
tests/null_queries/tests.py
+2 -2
tests/one_to_one/tests.py
+3 -5
tests/order_with_respect_to/tests.py
+3 -2
tests/pagination/custom.py
+1 -1
tests/pagination/tests.py
+4 -5
tests/postgres_tests/array_default_migrations/0001_initial.py
+1 -1
tests/postgres_tests/array_default_migrations/0002_integerarraymodel_field_2.py
+1 -1
tests/postgres_tests/migrations/0001_setup_extensions.py
+1 -3
tests/postgres_tests/migrations/0002_create_test_models.py
+1 -1
tests/postgres_tests/models.py
+2 -2
tests/postgres_tests/test_array.py
+5 -4
tests/postgres_tests/test_ranges.py
+4 -6
tests/prefetch_related/models.py
+1 -1
tests/prefetch_related/tests.py
+5 -7
tests/proxy_model_inheritance/tests.py
+2 -3
tests/proxy_models/admin.py
+1 -1
tests/proxy_models/models.py
-1
tests/proxy_models/tests.py
+8 -8
tests/proxy_models/urls.py
+1
tests/queries/tests.py
+18 -20
tests/queryset_pickle/models.py
+1 -1
tests/queryset_pickle/tests.py
+2 -2
tests/raw_query/tests.py
+1 -1
tests/requests/tests.py
+5 -7
tests/resolve_url/tests.py
+2 -2
tests/reverse_lookup/tests.py
+1 -1
tests/runtests.py
+5 -6
tests/schema/fields.py
+3 -2
tests/schema/tests.py
+5 -11
tests/select_for_update/tests.py
+4 -4
tests/select_related/models.py
+2 -4
tests/select_related/tests.py
+3 -3
tests/select_related_onetoone/tests.py
+3 -4
tests/select_related_regress/tests.py
+3 -5
tests/serializers/tests.py
+11 -15
tests/serializers_regress/models.py
+2 -3
tests/serializers_regress/tests.py
+20 -22
tests/servers/tests.py
+4 -2
tests/servers/urls.py
+1
tests/servers/views.py
-1
tests/settings_tests/tests.py
+3 -5
tests/shortcuts/tests.py
+1 -1
tests/shortcuts/views.py
+2 -1
tests/signing/tests.py
+1 -1
tests/sites_framework/migrations/0001_initial.py
+1 -1
tests/sites_framework/tests.py
+2 -3
tests/staticfiles_tests/storage.py
+1 -2
tests/staticfiles_tests/test_liveserver.py
+4 -2
tests/staticfiles_tests/tests.py
+8 -7
tests/string_lookup/tests.py
+1 -2
tests/swappable_models/tests.py
+3 -2
tests/syndication_tests/tests.py
+6 -6
tests/syndication_tests/urls.py
+1
tests/template_backends/test_django.py
+3 -3
tests/template_backends/test_jinja2.py
+3 -2
tests/template_loader/tests.py
+3 -4
tests/template_tests/alternate_urls.py
+1
tests/template_tests/filter_tests/test_autoescape.py
+1 -1
tests/template_tests/filter_tests/test_date.py
+1 -1
tests/template_tests/filter_tests/test_time.py
+1 -1
tests/template_tests/filter_tests/test_timesince.py
+1 -1
tests/template_tests/filter_tests/test_timeuntil.py
+1 -1
tests/template_tests/syntax_tests/test_autoescape.py
+1 -1
tests/template_tests/syntax_tests/test_basic.py
+2 -1
tests/template_tests/syntax_tests/test_exceptions.py
+1 -1
tests/template_tests/syntax_tests/test_extends.py
+1
tests/template_tests/syntax_tests/test_filter_syntax.py
+1 -1
tests/template_tests/syntax_tests/test_if.py
+2 -2
tests/template_tests/syntax_tests/test_include.py
+2 -1
tests/template_tests/syntax_tests/test_numpy.py
+1 -1
tests/template_tests/syntax_tests/test_ssi.py
+2 -4
tests/template_tests/syntax_tests/test_static.py
+1 -1
tests/template_tests/syntax_tests/test_url.py
+1 -1
tests/template_tests/templatetags/bad_tag.py
+1
tests/template_tests/templatetags/inclusion.py
+1
tests/template_tests/test_context.py
+1 -3
tests/template_tests/test_loaders.py
+10 -8
tests/template_tests/test_parser.py
+1 -3
tests/template_tests/test_response.py
+5 -7
tests/template_tests/test_unicode.py
+2 -2
tests/template_tests/tests.py
+5 -8
tests/template_tests/urls.py
+1 -1
tests/template_tests/utils.py
+2 -1
tests/test_client/tests.py
+2 -1
tests/test_client/urls.py
+1
tests/test_client/views.py
+3 -3
tests/test_client_regress/models.py
+1 -1
tests/test_client_regress/tests.py
+8 -10
tests/test_client_regress/urls.py
+1 -1
tests/test_client_regress/views.py
+1 -1
tests/test_runner/test_discover_runner.py
+1 -1
tests/test_runner/tests.py
+2 -5
tests/test_utils/tests.py
+2 -4
tests/test_utils/urls.py
+1
tests/timezones/tests.py
+13 -19
tests/transactions/tests.py
+3 -7
tests/unmanaged_models/models.py
-1
tests/unmanaged_models/tests.py
+1 -1
tests/update/tests.py
+1 -1
tests/update_only_fields/tests.py
+2 -2
tests/urlpatterns_reverse/extra_urls.py
+2 -1
tests/urlpatterns_reverse/included_named_urls.py
+2 -1
tests/urlpatterns_reverse/included_named_urls2.py
+1
tests/urlpatterns_reverse/included_namespace_urls.py
+2 -1
tests/urlpatterns_reverse/included_no_kwargs_urls.py
+1
tests/urlpatterns_reverse/included_urls.py
+1
tests/urlpatterns_reverse/included_urls2.py
+1
tests/urlpatterns_reverse/named_urls.py
+2 -1
tests/urlpatterns_reverse/namespace_urls.py
+1 -1
tests/urlpatterns_reverse/reverse_lazy_urls.py
+1 -1
tests/urlpatterns_reverse/tests.py
+9 -11
tests/urlpatterns_reverse/urlconf_inner.py
+1 -1
tests/urlpatterns_reverse/urlconf_outer.py
+2 -1
tests/urlpatterns_reverse/urls.py
+2 -1
tests/urlpatterns_reverse/urls_error_handlers_callables.py
+1
tests/urlpatterns_reverse/urls_without_full_import.py
+2 -1
tests/urlpatterns_reverse/views.py
+3 -2
tests/user_commands/tests.py
+2 -2
tests/utils_tests/test_archive.py
+2 -1
tests/utils_tests/test_autoreload.py
+2 -2
tests/utils_tests/test_baseconv.py
+1 -3
tests/utils_tests/test_datastructures.py
+3 -5
tests/utils_tests/test_dateformat.py
+4 -5
tests/utils_tests/test_dateparse.py
+2 -4
tests/utils_tests/test_datetime_safe.py
+1 -4
tests/utils_tests/test_decorators.py
+1 -1
tests/utils_tests/test_encoding.py
+3 -3
tests/utils_tests/test_functional.py
+1 -1
tests/utils_tests/test_html.py
+1 -1
tests/utils_tests/test_http.py
+3 -2
tests/utils_tests/test_ipv6.py
+1 -1
tests/utils_tests/test_module/another_bad_module.py
-1
tests/utils_tests/test_module/another_good_module.py
-1
tests/utils_tests/test_module_loading.py
+4 -5
tests/utils_tests/test_safestring.py
+6 -6
tests/utils_tests/test_termcolors.py
+2 -4
tests/utils_tests/test_timesince.py
+1 -1
tests/utils_tests/test_timezone.py
+3 -3
tests/utils_tests/test_tzinfo.py
+1
tests/validation/test_unique.py
+3 -4
tests/validation/tests.py
+2 -4
tests/validators/tests.py
+3 -2
tests/view_tests/default_urls.py
+1
tests/view_tests/generic_urls.py
+1 -1
tests/view_tests/templatetags/debugtags.py
+1
tests/view_tests/tests/test_csrf.py
+1 -1
tests/view_tests/tests/test_debug.py
+6 -7
tests/view_tests/tests/test_i18n.py
+3 -4
tests/view_tests/tests/test_static.py
+1 -1
tests/view_tests/urls.py
+2 -1
tests/view_tests/views.py
+6 -10
tests/wsgi/urls.py
+1 -1
expand_less