Merge remote-tracking branch 'core/master' into schema-alteration (b62e8236) · Commits · Dom Sekotill / django

.gitattributes

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		# Normalize line endings to avoid spurious failures in the core test suite on Windows.
		*html text eol=lf
		No newline at end of file

AUTHORS

+6 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ answer newbie questions, and generally made Django that much better:
		James Bennett
		Danilo Bargen
		Shai Berger <shai@platonix.com>
		berto
		Julian Bez
		Arvis Bickovskis <viestards.lists@gmail.com>
		Natalia Bidart <nataliabidart@gmail.com>
		@@ -231,6 +232,7 @@ answer newbie questions, and generally made Django that much better:
		Simon Greenhill <dev@simon.net.nz>
		Owen Griffiths
		Espen Grindhaug <http://grindhaug.org/>
		Mike Grouchy <http://mikegrouchy.com/>
		Janos Guljas
		Thomas Güttler <hv@tbz-pariv.de>
		Horst Gutmann <zerok@zerokspot.com>
		@@ -380,6 +382,7 @@ answer newbie questions, and generally made Django that much better:
		Christian Metts
		michal@plovarna.cz
		Slawek Mikula <slawek dot mikula at gmail dot com>
		Katie Miller <katie@sub50.com>
		Shawn Milochik <shawn@milochik.com>
		mitakummaa@gmail.com
		Taylor Mitchell <taylor.mitchell@gmail.com>
		@@ -510,6 +513,7 @@ answer newbie questions, and generally made Django that much better:
		Johan C. Stöver <johan@nilling.nl>
		Nowell Strite <http://nowell.strite.org/>
		Thomas Stromberg <tstromberg@google.com>
		Ben Sturmfels <ben@sturm.com.au>
		Travis Swicegood <travis@domain51.com>
		Pascal Varet
		SuperJared
		@@ -528,6 +532,7 @@ answer newbie questions, and generally made Django that much better:
		Terry Huang <terryh.tp@gmail.com>
		Travis Terry <tdterry7@gmail.com>
		thebjorn <bp@datakortet.no>
		Lowe Thiderman <lowe.thiderman@gmail.com>
		Zach Thompson <zthompson47@gmail.com>
		Michael Thornhill <michael.thornhill@gmail.com>
		Deepak Thukral <deep.thukral@gmail.com>
		@@ -585,6 +590,7 @@ answer newbie questions, and generally made Django that much better:
		Gasper Zejn <zejn@kiberpipa.org>
		Jarek Zgoda <jarek.zgoda@gmail.com>
		Cheng Zhang
		Hannes Struß <x@hannesstruss.de>

		A big THANK YOU goes to:

django/init.py

+1 −1

Original line number	Diff line number	Diff line
		VERSION = (1, 5, 0, 'alpha', 0)
		VERSION = (1, 6, 0, 'alpha', 0)

		def get_version(args, *kwargs):
		# Don't litter django/__init__.py with all the get_version stuff.

django/bin/daily_cleanup.py

+7 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,13 @@ Can be run as a cronjob to clean out old data from the database (only expired
		sessions at the moment).
		"""

		import warnings

		from django.core import management

		if __name__ == "__main__":
		management.call_command('cleanup')
		warnings.warn(
		"The `daily_cleanup` script has been deprecated "
		"in favor of `django-admin.py clearsessions`.",
		PendingDeprecationWarning)
		management.call_command('clearsessions')

django/conf/init.py

+11 −3

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 logging
		import os
		import time # Needed for Windows
		import warnings
		@@ -55,6 +56,15 @@ class LazySettings(LazyObject):
		"""
		Setup logging from LOGGING_CONFIG and LOGGING settings.
		"""
		try:
		# Route warnings through python logging
		logging.captureWarnings(True)
		# Allow DeprecationWarnings through the warnings filters
		warnings.simplefilter("default", DeprecationWarning)
		except AttributeError:
		# No captureWarnings on Python 2.6, DeprecationWarnings are on anyway
		pass

		if self.LOGGING_CONFIG:
		from django.utils.log import DEFAULT_LOGGING
		# First find the logging configuration function ...
		@@ -83,6 +93,7 @@ class LazySettings(LazyObject):
		for name, value in options.items():
		setattr(holder, name, value)
		self._wrapped = holder
		self._configure_logging()

		@property
		def configured(self):
		@@ -99,9 +110,6 @@ class BaseSettings(object):
		def __setattr__(self, name, value):
		if name in ("MEDIA_URL", "STATIC_URL") and value and not value.endswith('/'):
		raise ImproperlyConfigured("If set, %s must end with a slash" % name)
		elif name == "ADMIN_MEDIA_PREFIX":
		warnings.warn("The ADMIN_MEDIA_PREFIX setting has been removed; "
		"use STATIC_URL instead.", DeprecationWarning)
		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.")