Commit 7da3923b authored by Tim Graham's avatar Tim Graham
Browse files

Sorted imports in __init__.py files.

parent 4a66a692

django/apps/__init__.py

+4 −2
Original line number Diff line number Diff line 
from .config import AppConfig   # NOQA

from .registry import apps      # NOQA
 
from .config import AppConfig

from .registry import apps



__all__ = ['AppConfig', 'apps']

django/conf/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ a list of all possible variables. 


import importlib

import os

import time     # Needed for Windows

import time

import warnings



from django.conf import global_settings

django/conf/urls/__init__.py

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

import warnings

from importlib import import_module



from django.core.urlresolvers import (RegexURLPattern,

    RegexURLResolver, LocaleRegexURLResolver)

from django.core.exceptions import ImproperlyConfigured

from django.core.urlresolvers import (

    LocaleRegexURLResolver, RegexURLPattern, RegexURLResolver,

)

from django.utils import six

from django.utils.deprecation import (

    RemovedInDjango20Warning, RemovedInDjango110Warning,

django/contrib/admin/__init__.py

+8 −6
Original line number Diff line number Diff line 
# ACTION_CHECKBOX_NAME is unused, but should stay since its import from here

# has been referenced in documentation.

from django.contrib.admin.decorators import register

from django.contrib.admin.filters import (

    AllValuesFieldListFilter, BooleanFieldListFilter, ChoicesFieldListFilter,

    DateFieldListFilter, FieldListFilter, ListFilter, RelatedFieldListFilter,

    RelatedOnlyFieldListFilter, SimpleListFilter,

)

from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME

from django.contrib.admin.options import (HORIZONTAL, VERTICAL,

    ModelAdmin, StackedInline, TabularInline)

from django.contrib.admin.filters import (ListFilter, SimpleListFilter,

    FieldListFilter, BooleanFieldListFilter, RelatedFieldListFilter,

    ChoicesFieldListFilter, DateFieldListFilter, AllValuesFieldListFilter,

    RelatedOnlyFieldListFilter)

from django.contrib.admin.options import (

    HORIZONTAL, VERTICAL, ModelAdmin, StackedInline, TabularInline,

)

from django.contrib.admin.sites import AdminSite, site

from django.utils.module_loading import autodiscover_modules

django/contrib/auth/management/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ from django.contrib.auth import get_permission_codename 
from django.core import exceptions

from django.core.management.base import CommandError

from django.db import DEFAULT_DB_ALIAS, router

from django.utils.encoding import DEFAULT_LOCALE_ENCODING

from django.utils import six

from django.utils.encoding import DEFAULT_LOCALE_ENCODING





def _get_all_permissions(opts, ctype):