Commit de64c4d6 authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Merge remote-tracking branch 'core/master' into schema-alteration 

Conflicts:
	django/core/management/commands/flush.py
	django/core/management/commands/syncdb.py
	django/db/models/loading.py
	docs/internals/deprecation.txt
	docs/ref/django-admin.txt
	docs/releases/1.7.txt
parents fddc5957 b575d690

AUTHORS

+3 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ answer newbie questions, and generally made Django that much better: 
    Paul Collier <paul@paul-collier.com>

    Paul Collins <paul.collins.iii@gmail.com>

    Robert Coup

    Alex Couper <http://alexcouper.com/>

    Deric Crago <deric.crago@gmail.com>

    Brian Fabian Crain <http://www.bfc.do/>

    David Cramer <dcramer@gmail.com>
@@ -416,6 +417,7 @@ answer newbie questions, and generally made Django that much better: 
    Zain Memon

    Christian Metts

    michal@plovarna.cz

    Justin Michalicek <jmichalicek@gmail.com>

    Slawek Mikula <slawek dot mikula at gmail dot com>

    Katie Miller <katie@sub50.com>

    Shawn Milochik <shawn@milochik.com>
@@ -542,6 +544,7 @@ answer newbie questions, and generally made Django that much better: 
    smurf@smurf.noris.de

    Vsevolod Solovyov

    George Song <george@damacy.net>

    Jimmy Song <jaejoon@gmail.com>

    sopel

    Leo Soto <leo.soto@gmail.com>

    Thomas Sorrel

django/conf/__init__.py

+4 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ variable, and then from django.conf.global_settings; see the global settings fil 
a list of all possible variables.

"""



import importlib

import logging

import os

import sys
@@ -15,7 +16,6 @@ import warnings 
from django.conf import global_settings

from django.core.exceptions import ImproperlyConfigured

from django.utils.functional import LazyObject, empty

from django.utils import importlib

from django.utils.module_loading import import_by_path

from django.utils import six
@@ -107,6 +107,9 @@ class BaseSettings(object): 
        elif name == "ALLOWED_INCLUDE_ROOTS" and isinstance(value, six.string_types):

            raise ValueError("The ALLOWED_INCLUDE_ROOTS setting must be set "

                "to a tuple, not a string.")

        elif name == "INSTALLED_APPS" and len(value) != len(set(value)):

            raise ImproperlyConfigured("The INSTALLED_APPS setting must contain unique values.")



        object.__setattr__(self, name, value)

django/conf/urls/__init__.py

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



from django.core.urlresolvers import (RegexURLPattern,

    RegexURLResolver, LocaleRegexURLResolver)

from django.core.exceptions import ImproperlyConfigured

from django.utils.importlib import import_module

from django.utils import six

django/contrib/admin/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ def autodiscover(): 
    """



    import copy

    from importlib import import_module

    from django.conf import settings

    from django.utils.importlib import import_module

    from django.utils.module_loading import module_has_submodule



    for app in settings.INSTALLED_APPS:

django/contrib/admin/filters.py

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ class SimpleListFilter(ListFilter): 


    def lookups(self, request, model_admin):

        """

        Must be overriden to return a list of tuples (value, verbose value)

        Must be overridden to return a list of tuples (value, verbose value)

        """

        raise NotImplementedError