Commit a8b70d25 authored by Tim Graham's avatar Tim Graham
Browse files

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

Backport of 0ed7d155 from master
parent eb406aa6

django/apps/config.py

+2 −3
Original line number Diff line number Diff line 
from importlib import import_module

import os

from importlib import import_module



from django.core.exceptions import AppRegistryNotReady, ImproperlyConfigured

from django.utils.module_loading import module_has_submodule

from django.utils._os import upath



from django.utils.module_loading import module_has_submodule



MODELS_MODULE_NAME = 'models'

django/apps/registry.py

+2 −2
Original line number Diff line number Diff line 
from collections import Counter, defaultdict, OrderedDict

import os

import sys

import threading

import warnings

from collections import Counter, OrderedDict, defaultdict



from django.core.exceptions import AppRegistryNotReady, ImproperlyConfigured

from django.utils import lru_cache

from django.utils.deprecation import RemovedInDjango19Warning

from django.utils._os import upath

from django.utils.deprecation import RemovedInDjango19Warning



from .config import AppConfig

django/conf/project_template/project_name/settings.py

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ https://docs.djangoproject.com/en/{{ docs_version }}/ref/settings/ 


# Build paths inside the project like this: os.path.join(BASE_DIR, ...)

import os



BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

django/conf/project_template/project_name/wsgi.py

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +8,9 @@ https://docs.djangoproject.com/en/{{ docs_version }}/howto/deployment/wsgi/ 
"""



import os

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{ project_name }}.settings")



from django.core.wsgi import get_wsgi_application



os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{ project_name }}.settings")



application = get_wsgi_application()

django/contrib/admin/actions.py

+2 −2
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ 
Built-in, globally-available admin actions.

"""



from django.core.exceptions import PermissionDenied

from django.contrib import messages

from django.contrib.admin import helpers

from django.contrib.admin.utils import get_deleted_objects, model_ngettext

from django.core.exceptions import PermissionDenied

from django.db import router

from django.template.response import TemplateResponse

from django.utils.encoding import force_text

from django.utils.translation import ugettext_lazy, ugettext as _

from django.utils.translation import ugettext as _, ugettext_lazy





def delete_selected(modeladmin, request, queryset):