[1.7.x] Fixed possible "RuntimeError: maximum recursion depth exceeded" building docs.

Backport of 6a71ac61bd8ebd57f036e076a4f7f29cf2d88c00 from master

.editorconfig

@@ -1,41 +0,0 @@
-# http://editorconfig.org
-
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-insert_final_newline = true
-trim_trailing_whitespace = true
-end_of_line = lf
-charset = utf-8
-
-# Docstrings and comments use max_line_length = 79
-[*.py]
-max_line_length = 119
-
-# Use 2 spaces for the HTML files
-[*.html]
-indent_size = 2
-
-# The JSON files contain newlines inconsistently
-[*.json]
-indent_size = 2
-insert_final_newline = ignore
-
-[**/admin/js/vendor/**]
-indent_style = ignore
-indent_size = ignore
-
-# Minified JavaScript files shouldn't be changed
-[**.min.js]
-indent_style = ignore
-insert_final_newline = ignore
-
-# Makefiles always use tabs for indentation
-[Makefile]
-indent_style = tab
-
-# Batch files use tabs for indentation
-[*.bat]
-indent_style = tab

.eslintignore

@@ -1,4 +0,0 @@
-**/*.min.js
-**/vendor/**/*.js
-django/contrib/gis/templates/**/*.js
-node_modules/**.js

.eslintrc

@@ -1,33 +0,0 @@
-{
-    "rules": {
-        "camelcase": [0, {"properties": "always"}],
-        "comma-spacing": [2, {"before": false, "after": true}],
-        "dot-notation": [2, {"allowKeywords": true}],
-        "curly": [2, "all"],
-        "indent": [2, 4],
-        "key-spacing": [2, {"beforeColon": false, "afterColon": true}],
-        "new-cap": [0, {"newIsCap": true, "capIsNew": true}],
-        "no-alert": [0],
-        "no-eval": [2],
-        "no-extend-native": [2, {"exceptions": ["Date", "String"]}],
-        "no-multi-spaces": [2],
-        "no-octal-escape": [2],
-        "no-underscore-dangle": [2],
-        "no-unused-vars": [2, {"vars": "local", "args": "none"}],
-        "no-script-url": [2],
-        "no-shadow": [2, {"hoist": "functions"}],
-        "quotes": [0, "single"],
-        "linebreak-style": [2, "unix"],
-        "semi": [2, "always"],
-        "space-before-blocks": [2, "always"],
-        "space-before-function-paren": [2, {"anonymous": "never", "named": "never"}],
-        "space-infix-ops": [2, {"int32Hint": false}],
-        "strict": [1, "function"]
-    },
-    "env": {
-        "browser": true
-    },
-    "globals": {
-        "django": false
-    }
-}

.gitattributes

@@ -1,7 +1,5 @@
 # Normalize line endings to avoid spurious failures in the core test suite on Windows.
 *html text eol=lf
 *css text eol=lf
-*js text eol=lf
 tests/staticfiles_tests/apps/test/static/test/*txt text eol=lf
 tests/staticfiles_tests/project/documents/test/*txt text eol=lf
-docs/releases/*.txt merge=union

.gitignore

@@ -1,11 +1,6 @@
-# If you need to exclude files such as those generated by an IDE, use
-# $GIT_DIR/info/exclude or the core.excludesFile configuration variable as
-# described in https://git-scm.com/docs/gitignore
-
 *.egg-info
 *.pot
 *.py[co]
-.tox/
 __pycache__
 MANIFEST
 dist/

.tx/config

@@ -27,6 +27,11 @@ file_filter = django/contrib/auth/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/auth/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
+[django.contrib-comments]
+file_filter = django/contrib/comments/locale/<lang>/LC_MESSAGES/django.po
+source_file = django/contrib/comments/locale/en/LC_MESSAGES/django.po
+source_lang = en
+
 [django.contrib-contenttypes]
 file_filter = django/contrib/contenttypes/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po
@@ -37,6 +42,11 @@ file_filter = django/contrib/flatpages/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/flatpages/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
+[django.contrib-formtools]
+file_filter = django/contrib/formtools/locale/<lang>/LC_MESSAGES/django.po
+source_file = django/contrib/formtools/locale/en/LC_MESSAGES/django.po
+source_lang = en
+
 [django.contrib-gis]
 file_filter = django/contrib/gis/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/gis/locale/en/LC_MESSAGES/django.po
@@ -47,9 +57,9 @@ file_filter = django/contrib/humanize/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/humanize/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-postgres]
-file_filter = django/contrib/postgres/locale/<lang>/LC_MESSAGES/django.po
-source_file = django/contrib/postgres/locale/en/LC_MESSAGES/django.po
+[django.contrib-messages]
+file_filter = django/contrib/messages/locale/<lang>/LC_MESSAGES/django.po
+source_file = django/contrib/messages/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
 [django.contrib-redirects]

CONTRIBUTING.rst

@@ -24,9 +24,3 @@ Django uses Trac to keep track of bugs, feature requests, and associated
 patches because GitHub doesn't provide adequate tooling for its community.
 Patches can be submitted as pull requests, but if you don't file a ticket,
 it's unlikely that we'll notice your contribution.
-
-Code of Conduct
-===============
-
-As a contributor, you can help us keep the Django community open and inclusive.
-Please read and follow our `Code of Conduct <https://www.djangoproject.com/conduct/>`_.

Gruntfile.js

@@ -1,13 +0,0 @@
-var globalThreshold = 50;  // Global code coverage threshold (as a percentage)
-
-module.exports = function(grunt) {
-    grunt.initConfig({
-        qunit: {
-            all: ['js_tests/tests.html']
-        }
-    });
-
-    grunt.loadNpmTasks('grunt-contrib-qunit');
-    grunt.registerTask('test', ['qunit']);
-    grunt.registerTask('default', ['test']);
-};

LICENSE.python

@@ -1,255 +0,0 @@
-A. HISTORY OF THE SOFTWARE
-==========================
-
-Python was created in the early 1990s by Guido van Rossum at Stichting
-Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
-as a successor of a language called ABC.  Guido remains Python's
-principal author, although it includes many contributions from others.
-
-In 1995, Guido continued his work on Python at the Corporation for
-National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
-in Reston, Virginia where he released several versions of the
-software.
-
-In May 2000, Guido and the Python core development team moved to
-BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
-year, the PythonLabs team moved to Digital Creations (now Zope
-Corporation, see http://www.zope.com).  In 2001, the Python Software
-Foundation (PSF, see http://www.python.org/psf/) was formed, a
-non-profit organization created specifically to own Python-related
-Intellectual Property.  Zope Corporation is a sponsoring member of
-the PSF.
-
-All Python releases are Open Source (see http://www.opensource.org for
-the Open Source Definition).  Historically, most, but not all, Python
-releases have also been GPL-compatible; the table below summarizes
-the various releases.
-
-    Release         Derived     Year        Owner       GPL-
-                    from                                compatible? (1)
-
-    0.9.0 thru 1.2              1991-1995   CWI         yes
-    1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes
-    1.6             1.5.2       2000        CNRI        no
-    2.0             1.6         2000        BeOpen.com  no
-    1.6.1           1.6         2001        CNRI        yes (2)
-    2.1             2.0+1.6.1   2001        PSF         no
-    2.0.1           2.0+1.6.1   2001        PSF         yes
-    2.1.1           2.1+2.0.1   2001        PSF         yes
-    2.1.2           2.1.1       2002        PSF         yes
-    2.1.3           2.1.2       2002        PSF         yes
-    2.2 and above   2.1.1       2001-now    PSF         yes
-
-Footnotes:
-
-(1) GPL-compatible doesn't mean that we're distributing Python under
-    the GPL.  All Python licenses, unlike the GPL, let you distribute
-    a modified version without making your changes open source.  The
-    GPL-compatible licenses make it possible to combine Python with
-    other software that is released under the GPL; the others don't.
-
-(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
-    because its license has a choice of law clause.  According to
-    CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
-    is "not incompatible" with the GPL.
-
-Thanks to the many outside volunteers who have worked under Guido's
-direction to make these releases possible.
-
-
-B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
-===============================================================
-
-PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
---------------------------------------------
-
-1. This LICENSE AGREEMENT is between the Python Software Foundation
-("PSF"), and the Individual or Organization ("Licensee") accessing and
-otherwise using this software ("Python") in source or binary form and
-its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, PSF hereby
-grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
-analyze, test, perform and/or display publicly, prepare derivative works,
-distribute, and otherwise use Python alone or in any derivative version,
-provided, however, that PSF's License Agreement and PSF's notice of copyright,
-i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015, 2016 Python Software Foundation; All Rights
-Reserved" are retained in Python alone or in any derivative version prepared by
-Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python.
-
-4. PSF is making Python available to Licensee on an "AS IS"
-basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between PSF and
-Licensee.  This License Agreement does not grant permission to use PSF
-trademarks or trade name in a trademark sense to endorse or promote
-products or services of Licensee, or any third party.
-
-8. By copying, installing or otherwise using Python, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-
-BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
--------------------------------------------
-
-BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
-
-1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
-office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
-Individual or Organization ("Licensee") accessing and otherwise using
-this software in source or binary form and its associated
-documentation ("the Software").
-
-2. Subject to the terms and conditions of this BeOpen Python License
-Agreement, BeOpen hereby grants Licensee a non-exclusive,
-royalty-free, world-wide license to reproduce, analyze, test, perform
-and/or display publicly, prepare derivative works, distribute, and
-otherwise use the Software alone or in any derivative version,
-provided, however, that the BeOpen Python License is retained in the
-Software, alone or in any derivative version prepared by Licensee.
-
-3. BeOpen is making the Software available to Licensee on an "AS IS"
-basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
-SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
-AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
-DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-5. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-6. This License Agreement shall be governed by and interpreted in all
-respects by the law of the State of California, excluding conflict of
-law provisions.  Nothing in this License Agreement shall be deemed to
-create any relationship of agency, partnership, or joint venture
-between BeOpen and Licensee.  This License Agreement does not grant
-permission to use BeOpen trademarks or trade names in a trademark
-sense to endorse or promote products or services of Licensee, or any
-third party.  As an exception, the "BeOpen Python" logos available at
-http://www.pythonlabs.com/logos.html may be used according to the
-permissions granted on that web page.
-
-7. By copying, installing or otherwise using the software, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-
-CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
----------------------------------------
-
-1. This LICENSE AGREEMENT is between the Corporation for National
-Research Initiatives, having an office at 1895 Preston White Drive,
-Reston, VA 20191 ("CNRI"), and the Individual or Organization
-("Licensee") accessing and otherwise using Python 1.6.1 software in
-source or binary form and its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, CNRI
-hereby grants Licensee a nonexclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use Python 1.6.1
-alone or in any derivative version, provided, however, that CNRI's
-License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
-1995-2001 Corporation for National Research Initiatives; All Rights
-Reserved" are retained in Python 1.6.1 alone or in any derivative
-version prepared by Licensee.  Alternately, in lieu of CNRI's License
-Agreement, Licensee may substitute the following text (omitting the
-quotes): "Python 1.6.1 is made available subject to the terms and
-conditions in CNRI's License Agreement.  This Agreement together with
-Python 1.6.1 may be located on the Internet using the following
-unique, persistent identifier (known as a handle): 1895.22/1013.  This
-Agreement may also be obtained from a proxy server on the Internet
-using the following URL: http://hdl.handle.net/1895.22/1013".
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python 1.6.1 or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python 1.6.1.
-
-4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
-basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. This License Agreement shall be governed by the federal
-intellectual property law of the United States, including without
-limitation the federal copyright law, and, to the extent such
-U.S. federal law does not apply, by the law of the Commonwealth of
-Virginia, excluding Virginia's conflict of law provisions.
-Notwithstanding the foregoing, with regard to derivative works based
-on Python 1.6.1 that incorporate non-separable material that was
-previously distributed under the GNU General Public License (GPL), the
-law of the Commonwealth of Virginia shall govern this License
-Agreement only as to issues arising under or with respect to
-Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
-License Agreement shall be deemed to create any relationship of
-agency, partnership, or joint venture between CNRI and Licensee.  This
-License Agreement does not grant permission to use CNRI trademarks or
-trade name in a trademark sense to endorse or promote products or
-services of Licensee, or any third party.
-
-8. By clicking on the "ACCEPT" button where indicated, or by copying,
-installing or otherwise using Python 1.6.1, Licensee agrees to be
-bound by the terms and conditions of this License Agreement.
-
-        ACCEPT
-
-
-CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
---------------------------------------------------
-
-Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
-The Netherlands.  All rights reserved.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Stichting Mathematisch
-Centrum or CWI not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

MANIFEST.in

@@ -1,17 +1,40 @@
+include README.rst
 include AUTHORS
-include Gruntfile.js
 include INSTALL
 include LICENSE
-include LICENSE.python
 include MANIFEST.in
-include package.json
-include *.rst
-graft django
-prune django/contrib/admin/bin
-graft docs
-graft extras
-graft js_tests
-graft scripts
-graft tests
-global-exclude __pycache__
-global-exclude *.py[co]
+include django/contrib/gis/gdal/LICENSE
+include django/contrib/gis/geos/LICENSE
+include django/dispatch/license.txt
+include django/dispatch/license.python.txt
+recursive-include docs *
+recursive-include scripts *
+recursive-include extras *
+recursive-include tests *
+recursive-include django/conf/app_template *
+recursive-include django/conf/locale *
+recursive-include django/conf/project_template *
+recursive-include django/contrib/*/locale *
+recursive-include django/contrib/admin/templates *
+recursive-include django/contrib/admin/static *
+recursive-include django/contrib/admindocs/templates *
+recursive-include django/contrib/auth/fixtures *
+recursive-include django/contrib/auth/templates *
+recursive-include django/contrib/auth/tests/templates *
+recursive-include django/contrib/comments/templates *
+recursive-include django/contrib/formtools/templates *
+recursive-include django/contrib/formtools/tests/templates *
+recursive-include django/contrib/formtools/tests/wizard/wizardtests/templates *
+recursive-include django/contrib/flatpages/fixtures *
+recursive-include django/contrib/flatpages/tests/templates *
+recursive-include django/contrib/gis/static *
+recursive-include django/contrib/gis/templates *
+recursive-include django/contrib/gis/tests/data *
+recursive-include django/contrib/gis/tests/distapp/fixtures *
+recursive-include django/contrib/gis/tests/geoapp/fixtures *
+recursive-include django/contrib/gis/tests/geogapp/fixtures *
+recursive-include django/contrib/gis/tests/relatedapp/fixtures *
+recursive-include django/contrib/sitemaps/templates *
+recursive-include django/contrib/sitemaps/tests/templates *
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]

README.rst

@@ -1,23 +1,23 @@
 Django is a high-level Python Web framework that encourages rapid development
 and clean, pragmatic design. Thanks for checking it out.
 
-All documentation is in the "``docs``" directory and online at
+All documentation is in the "docs" directory and online at
 https://docs.djangoproject.com/en/stable/. If you're just getting started,
 here's how we recommend you read the docs:
 
-* First, read ``docs/intro/install.txt`` for instructions on installing Django.
+* First, read docs/intro/install.txt for instructions on installing Django.
 
-* Next, work through the tutorials in order (``docs/intro/tutorial01.txt``,
-  ``docs/intro/tutorial02.txt``, etc.).
+* Next, work through the tutorials in order (docs/intro/tutorial01.txt,
+  docs/intro/tutorial02.txt, etc.).
 
 * If you want to set up an actual deployment server, read
-  ``docs/howto/deployment/index.txt`` for instructions.
+  docs/howto/deployment/index.txt for instructions.
 
-* You'll probably want to read through the topical guides (in ``docs/topics``)
-  next; from there you can jump to the HOWTOs (in ``docs/howto``) for specific
-  problems, and check out the reference (``docs/ref``) for gory details.
+* You'll probably want to read through the topical guides (in docs/topics)
+  next; from there you can jump to the HOWTOs (in docs/howto) for specific
+  problems, and check out the reference (docs/ref) for gory details.
 
-* See ``docs/README`` for instructions on building an HTML version of the docs.
+* See docs/README for instructions on building an HTML version of the docs.
 
 Docs are updated rigorously. If you find any problems in the docs, or think
 they should be clarified in any way, please take 30 seconds to fill out a
@@ -25,19 +25,19 @@ ticket here: https://code.djangoproject.com/newticket
 
 To get more help:
 
-* Join the ``#django`` channel on irc.freenode.net. Lots of helpful people hang out
-  there. Read the archives at https://botbot.me/freenode/django/.
+* Join the #django channel on irc.freenode.net. Lots of helpful people hang out
+  there. Read the archives at http://django-irc-logs.com/.
 
 * Join the django-users mailing list, or read the archives, at
   https://groups.google.com/group/django-users.
 
 To contribute to Django:
 
-* Check out https://docs.djangoproject.com/en/dev/internals/contributing/ for
-  information about getting involved.
+* Check out https://www.djangoproject.com/community/ for information about
+  getting involved.
 
 To run Django's test suite:
 
 * Follow the instructions in the "Unit tests" section of
-  ``docs/internals/contributing/writing-code/unit-tests.txt``, published online at
+  docs/internals/contributing/writing-code/unit-tests.txt, published online at
   https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/unit-tests/#running-the-unit-tests

django/__init__.py

@@ -1,27 +1,21 @@
-from __future__ import unicode_literals
-
-from django.utils.version import get_version
-
-VERSION = (1, 11, 30, 'alpha', 0)
-
-__version__ = get_version(VERSION)
+VERSION = (1, 7, 11, 'final', 0)
 
 
-def setup(set_prefix=True):
+def get_version(*args, **kwargs):
+    # Don't litter django/__init__.py with all the get_version stuff.
+    # Only import if it's actually called.
+    from django.utils.version import get_version
+    return get_version(*args, **kwargs)
+
+
+def setup():
     """
     Configure the settings (this happens as a side effect of accessing the
     first setting), configure logging and populate the app registry.
-    Set the thread-local urlresolvers script prefix if `set_prefix` is True.
     """
     from django.apps import apps
     from django.conf import settings
-    from django.urls import set_script_prefix
-    from django.utils.encoding import force_text
     from django.utils.log import configure_logging
 
     configure_logging(settings.LOGGING_CONFIG, settings.LOGGING)
-    if set_prefix:
-        set_script_prefix(
-            '/' if settings.FORCE_SCRIPT_NAME is None else force_text(settings.FORCE_SCRIPT_NAME)
-        )
     apps.populate(settings.INSTALLED_APPS)

django/__main__.py

@@ -1,9 +0,0 @@
-"""
-Invokes django-admin when the django module is run as a script.
-
-Example: python -m django check
-"""
-from django.core import management
-
-if __name__ == "__main__":
-    management.execute_from_command_line()

django/apps/__init__.py

@@ -1,4 +1,2 @@
-from .config import AppConfig
-from .registry import apps
-
-__all__ = ['AppConfig', 'apps']
+from .config import AppConfig   # NOQA
+from .registry import apps      # NOQA

django/apps/config.py

@@ -1,9 +1,10 @@
-import os
 from importlib import import_module
+import os
 
-from django.core.exceptions import ImproperlyConfigured
-from django.utils._os import upath
+from django.core.exceptions import AppRegistryNotReady, ImproperlyConfigured
 from django.utils.module_loading import module_has_submodule
+from django.utils._os import upath
+
 
 MODELS_MODULE_NAME = 'models'
 
@@ -21,10 +22,6 @@ class AppConfig(object):
         # from 'django/contrib/admin/__init__.pyc'>.
         self.module = app_module
 
-        # Reference to the Apps registry that holds this AppConfig. Set by the
-        # registry when it registers the AppConfig instance.
-        self.apps = None
-
         # The following attributes could be defined at the class level in a
         # subclass, hence the test-and-set pattern.
 
@@ -59,17 +56,13 @@ class AppConfig(object):
         """Attempt to determine app's filesystem path from its module."""
         # See #21874 for extended discussion of the behavior of this method in
         # various cases.
-        # Convert paths to list because Python 3's _NamespacePath does not
+        # Convert paths to list because Python 3.3 _NamespacePath does not
         # support indexing.
         paths = list(getattr(module, '__path__', []))
         if len(paths) != 1:
             filename = getattr(module, '__file__', None)
             if filename is not None:
                 paths = [os.path.dirname(filename)]
-            else:
-                # For unknown reasons, sometimes the list returned by __path__
-                # contains duplicates that must be removed (#25246).
-                paths = list(set(paths))
         if len(paths) > 1:
             raise ImproperlyConfigured(
                 "The app module %r has multiple filesystem locations (%r); "
@@ -117,6 +110,9 @@ class AppConfig(object):
 
         # If we're reaching this point, we must attempt to load the app config
         # class located at <mod_path>.<cls_name>
+
+        # Avoid django.utils.module_loading.import_by_path because it
+        # masks errors -- it reraises ImportError as ImproperlyConfigured.
         mod = import_module(mod_path)
         try:
             cls = getattr(mod, cls_name)
@@ -143,35 +139,34 @@ class AppConfig(object):
                 "'%s' must supply a name attribute." % entry)
 
         # Ensure app_name points to a valid module.
-        try:
-            app_module = import_module(app_name)
-        except ImportError:
-            raise ImproperlyConfigured(
-                "Cannot import '%s'. Check that '%s.%s.name' is correct." % (
-                    app_name, mod_path, cls_name,
-                )
-            )
+        app_module = import_module(app_name)
 
         # Entry is a path to an app config class.
         return cls(app_name, app_module)
 
-    def get_model(self, model_name, require_ready=True):
+    def check_models_ready(self):
+        """
+        Raises an exception if models haven't been imported yet.
+        """
+        if self.models is None:
+            raise AppRegistryNotReady(
+                "Models for app '%s' haven't been imported yet." % self.label)
+
+    def get_model(self, model_name):
         """
         Returns the model with the given case-insensitive model_name.
 
         Raises LookupError if no model exists with this name.
         """
-        if require_ready:
-            self.apps.check_models_ready()
-        else:
-            self.apps.check_apps_ready()
+        self.check_models_ready()
         try:
             return self.models[model_name.lower()]
         except KeyError:
             raise LookupError(
                 "App '%s' doesn't have a '%s' model." % (self.label, model_name))
 
-    def get_models(self, include_auto_created=False, include_swapped=False):
+    def get_models(self, include_auto_created=False,
+                   include_deferred=False, include_swapped=False):
         """
         Returns an iterable of models.
 
@@ -179,23 +174,28 @@ class AppConfig(object):
 
         - auto-created models for many-to-many relations without
           an explicit intermediate table,
+        - models created to satisfy deferred attribute queries,
         - models that have been swapped out.
 
         Set the corresponding keyword argument to True to include such models.
         Keyword arguments aren't documented; they're a private API.
         """
-        self.apps.check_models_ready()
+        self.check_models_ready()
         for model in self.models.values():
+            if model._deferred and not include_deferred:
+                continue
             if model._meta.auto_created and not include_auto_created:
                 continue
             if model._meta.swapped and not include_swapped:
                 continue
             yield model
 
-    def import_models(self):
+    def import_models(self, all_models):
         # Dictionary of models for this app, primarily maintained in the
         # 'all_models' attribute of the Apps this AppConfig is attached to.
-        self.models = self.apps.all_models[self.label]
+        # Injected as a parameter because it gets populated when models are
+        # imported, which might happen before populate() imports models.
+        self.models = all_models
 
         if module_has_submodule(self.module, MODELS_MODULE_NAME):
             models_module_name = '%s.%s' % (self.name, MODELS_MODULE_NAME)

django/apps/registry.py

@@ -1,11 +1,13 @@
+from collections import Counter, defaultdict, OrderedDict
+import os
 import sys
 import threading
 import warnings
-from collections import Counter, OrderedDict, defaultdict
-from functools import partial
 
 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 .config import AppConfig
 
@@ -46,10 +48,8 @@ class Apps(object):
         # Lock for thread-safe population.
         self._lock = threading.Lock()
 
-        # Maps ("app_label", "modelname") tuples to lists of functions to be
-        # called when the corresponding model is ready. Used by this class's
-        # `lazy_model_operation()` and `do_pending_operations()` methods.
-        self._pending_operations = defaultdict(list)
+        # Pending lookups for lazy relations.
+        self._pending_lookups = {}
 
         # Populate apps and models, unless it's the master registry.
         if installed_apps is not None:
@@ -77,7 +77,7 @@ class Apps(object):
             if self.app_configs:
                 raise RuntimeError("populate() isn't reentrant")
 
-            # Phase 1: initialize app configs and import app modules.
+            # Load app configs and app modules.
             for entry in installed_apps:
                 if isinstance(entry, AppConfig):
                     app_config = entry
@@ -89,7 +89,6 @@ class Apps(object):
                         "duplicates: %s" % app_config.label)
 
                 self.app_configs[app_config.label] = app_config
-                app_config.apps = self
 
             # Check for duplicate app names.
             counts = Counter(
@@ -103,15 +102,15 @@ class Apps(object):
 
             self.apps_ready = True
 
-            # Phase 2: import models modules.
+            # Load models.
             for app_config in self.app_configs.values():
-                app_config.import_models()
+                all_models = self.all_models[app_config.label]
+                app_config.import_models(all_models)
 
             self.clear_cache()
 
             self.models_ready = True
 
-            # Phase 3: run ready() methods of app configs.
             for app_config in self.get_app_configs():
                 app_config.ready()
 
@@ -148,16 +147,12 @@ class Apps(object):
         try:
             return self.app_configs[app_label]
         except KeyError:
-            message = "No installed app with label '%s'." % app_label
-            for app_config in self.get_app_configs():
-                if app_config.name == app_label:
-                    message += " Did you mean '%s'?" % app_config.label
-                    break
-            raise LookupError(message)
+            raise LookupError("No installed app with label '%s'." % app_label)
 
     # This method is performance-critical at least for Django's test suite.
     @lru_cache.lru_cache(maxsize=None)
-    def get_models(self, include_auto_created=False, include_swapped=False):
+    def get_models(self, app_mod=None, include_auto_created=False,
+                   include_deferred=False, include_swapped=False):
         """
         Returns a list of all installed models.
 
@@ -165,18 +160,30 @@ class Apps(object):
 
         - auto-created models for many-to-many relations without
           an explicit intermediate table,
+        - models created to satisfy deferred attribute queries,
         - models that have been swapped out.
 
         Set the corresponding keyword argument to True to include such models.
         """
         self.check_models_ready()
+        if app_mod:
+            warnings.warn(
+                "The app_mod argument of get_models is deprecated.",
+                RemovedInDjango19Warning, stacklevel=2)
+            app_label = app_mod.__name__.split('.')[-2]
+            try:
+                return list(self.get_app_config(app_label).get_models(
+                    include_auto_created, include_deferred, include_swapped))
+            except LookupError:
+                return []
 
         result = []
         for app_config in self.app_configs.values():
-            result.extend(list(app_config.get_models(include_auto_created, include_swapped)))
+            result.extend(list(app_config.get_models(
+                include_auto_created, include_deferred, include_swapped)))
         return result
 
-    def get_model(self, app_label, model_name=None, require_ready=True):
+    def get_model(self, app_label, model_name=None):
         """
         Returns the model matching the given app_label and model_name.
 
@@ -189,20 +196,10 @@ class Apps(object):
         model exists with this name in the application. Raises ValueError if
         called with a single argument that doesn't contain exactly one dot.
         """
-        if require_ready:
-            self.check_models_ready()
-        else:
-            self.check_apps_ready()
-
+        self.check_models_ready()
         if model_name is None:
             app_label, model_name = app_label.split('.')
-
-        app_config = self.get_app_config(app_label)
-
-        if not require_ready and app_config.models is None:
-            app_config.import_models()
-
-        return app_config.get_model(model_name, require_ready=require_ready)
+        return self.get_app_config(app_label).get_model(model_name.lower())
 
     def register_model(self, app_label, model):
         # Since this method is called when models are imported, it cannot
@@ -223,7 +220,6 @@ class Apps(object):
                     "Conflicting '%s' models in application '%s': %s and %s." %
                     (model_name, app_label, app_models[model_name], model))
         app_models[model_name] = model
-        self.do_pending_operations(model)
         self.clear_cache()
 
     def is_installed(self, app_name):
@@ -244,7 +240,9 @@ class Apps(object):
         Returns the app config for the inner application in case of nesting.
         Returns None if the object isn't in any registered app config.
         """
-        self.check_apps_ready()
+        # In Django 1.7 and 1.8, it's allowed to call this method at import
+        # time, even while the registry is being populated. In Django 1.9 and
+        # later, that should be forbidden with `self.check_apps_ready()`.
         candidates = []
         for app_config in self.app_configs.values():
             if object_name.startswith(app_config.name):
@@ -268,28 +266,6 @@ class Apps(object):
                 "Model '%s.%s' not registered." % (app_label, model_name))
         return model
 
-    @lru_cache.lru_cache(maxsize=None)
-    def get_swappable_settings_name(self, to_string):
-        """
-        For a given model string (e.g. "auth.User"), return the name of the
-        corresponding settings name if it refers to a swappable model. If the
-        referred model is not swappable, return None.
-
-        This method is decorated with lru_cache because it's performance
-        critical when it comes to migrations. Since the swappable settings don't
-        change after Django has loaded the settings, there is no reason to get
-        the respective settings attribute over and over again.
-        """
-        for model in self.get_models(include_swapped=True):
-            swapped = model._meta.swapped
-            # Is this model swapped out for the model given by to_string?
-            if swapped and swapped == to_string:
-                return model._meta.swappable
-            # Is this model swappable and the one given by to_string?
-            if model._meta.swappable and model._meta.label == to_string:
-                return model._meta.swappable
-        return None
-
     def set_available_apps(self, available):
         """
         Restricts the set of installed apps used by get_app_config[s].
@@ -305,10 +281,8 @@ class Apps(object):
         available = set(available)
         installed = set(app_config.name for app_config in self.get_app_configs())
         if not available.issubset(installed):
-            raise ValueError(
-                "Available apps isn't a subset of installed apps, extra apps: %s"
-                % ", ".join(available - installed)
-            )
+            raise ValueError("Available apps isn't a subset of installed "
+                "apps, extra apps: %s" % ", ".join(available - installed))
 
         self.stored_app_configs.append(self.app_configs)
         self.app_configs = OrderedDict(
@@ -363,63 +337,105 @@ class Apps(object):
 
         This is mostly used in tests.
         """
-        # Call expire cache on each model. This will purge
-        # the relation tree and the fields cache.
         self.get_models.cache_clear()
-        if self.ready:
-            # Circumvent self.get_models() to prevent that the cache is refilled.
-            # This particularly prevents that an empty value is cached while cloning.
-            for app_config in self.app_configs.values():
-                for model in app_config.get_models(include_auto_created=True):
-                    model._meta._expire_cache()
 
-    def lazy_model_operation(self, function, *model_keys):
+    ### DEPRECATED METHODS GO BELOW THIS LINE ###
+
+    def load_app(self, app_name):
         """
-        Take a function and a number of ("app_label", "modelname") tuples, and
-        when all the corresponding models have been imported and registered,
-        call the function with the model classes as its arguments.
-
-        The function passed to this method must accept exactly n models as
-        arguments, where n=len(model_keys).
+        Loads the app with the provided fully qualified name, and returns the
+        model module.
         """
-        # Base case: no arguments, just execute the function.
-        if not model_keys:
-            function()
-        # Recursive case: take the head of model_keys, wait for the
-        # corresponding model class to be imported and registered, then apply
-        # that argument to the supplied function. Pass the resulting partial
-        # to lazy_model_operation() along with the remaining model args and
-        # repeat until all models are loaded and all arguments are applied.
-        else:
-            next_model, more_models = model_keys[0], model_keys[1:]
+        warnings.warn(
+            "load_app(app_name) is deprecated.",
+            RemovedInDjango19Warning, stacklevel=2)
+        app_config = AppConfig.create(app_name)
+        app_config.import_models(self.all_models[app_config.label])
+        self.app_configs[app_config.label] = app_config
+        self.clear_cache()
+        return app_config.models_module
 
-            # This will be executed after the class corresponding to next_model
-            # has been imported and registered. The `func` attribute provides
-            # duck-type compatibility with partials.
-            def apply_next_model(model):
-                next_function = partial(apply_next_model.func, model)
-                self.lazy_model_operation(next_function, *more_models)
-            apply_next_model.func = function
+    def app_cache_ready(self):
+        warnings.warn(
+            "app_cache_ready() is deprecated in favor of the ready property.",
+            RemovedInDjango19Warning, stacklevel=2)
+        return self.ready
 
-            # If the model has already been imported and registered, partially
-            # apply it to the function now. If not, add it to the list of
-            # pending operations for the model, where it will be executed with
-            # the model class as its sole argument once the model is ready.
-            try:
-                model_class = self.get_registered_model(*next_model)
-            except LookupError:
-                self._pending_operations[next_model].append(apply_next_model)
-            else:
-                apply_next_model(model_class)
-
-    def do_pending_operations(self, model):
+    def get_app(self, app_label):
         """
-        Take a newly-prepared model and pass it to each function waiting for
-        it. This is called at the very end of `Apps.register_model()`.
+        Returns the module containing the models for the given app_label.
         """
-        key = model._meta.app_label, model._meta.model_name
-        for function in self._pending_operations.pop(key, []):
-            function(model)
+        warnings.warn(
+            "get_app_config(app_label).models_module supersedes get_app(app_label).",
+            RemovedInDjango19Warning, stacklevel=2)
+        try:
+            models_module = self.get_app_config(app_label).models_module
+        except LookupError as exc:
+            # Change the exception type for backwards compatibility.
+            raise ImproperlyConfigured(*exc.args)
+        if models_module is None:
+            raise ImproperlyConfigured(
+                "App '%s' doesn't have a models module." % app_label)
+        return models_module
+
+    def get_apps(self):
+        """
+        Returns a list of all installed modules that contain models.
+        """
+        warnings.warn(
+            "[a.models_module for a in get_app_configs()] supersedes get_apps().",
+            RemovedInDjango19Warning, stacklevel=2)
+        app_configs = self.get_app_configs()
+        return [app_config.models_module for app_config in app_configs
+                if app_config.models_module is not None]
+
+    def _get_app_package(self, app):
+        return '.'.join(app.__name__.split('.')[:-1])
+
+    def get_app_package(self, app_label):
+        warnings.warn(
+            "get_app_config(label).name supersedes get_app_package(label).",
+            RemovedInDjango19Warning, stacklevel=2)
+        return self._get_app_package(self.get_app(app_label))
+
+    def _get_app_path(self, app):
+        if hasattr(app, '__path__'):        # models/__init__.py package
+            app_path = app.__path__[0]
+        else:                               # models.py module
+            app_path = app.__file__
+        return os.path.dirname(upath(app_path))
+
+    def get_app_path(self, app_label):
+        warnings.warn(
+            "get_app_config(label).path supersedes get_app_path(label).",
+            RemovedInDjango19Warning, stacklevel=2)
+        return self._get_app_path(self.get_app(app_label))
+
+    def get_app_paths(self):
+        """
+        Returns a list of paths to all installed apps.
+
+        Useful for discovering files at conventional locations inside apps
+        (static files, templates, etc.)
+        """
+        warnings.warn(
+            "[a.path for a in get_app_configs()] supersedes get_app_paths().",
+            RemovedInDjango19Warning, stacklevel=2)
+        self.check_apps_ready()
+        app_paths = []
+        for app in self.get_apps():
+            app_paths.append(self._get_app_path(app))
+        return app_paths
+
+    def register_models(self, app_label, *models):
+        """
+        Register a set of models as belonging to an app.
+        """
+        warnings.warn(
+            "register_models(app_label, *models) is deprecated.",
+            RemovedInDjango19Warning, stacklevel=2)
+        for model in models:
+            self.register_model(app_label, model)
 
 
 apps = Apps(installed_apps=None)

django/bin/django-2to3.py

@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+# This works exactly like 2to3, except that it uses Django's fixers rather
+# than 2to3's built-in fixers.
+
+import sys
+from lib2to3.main import main
+
+sys.exit(main("django.utils.2to3_fixes"))

django/bin/profiling/gather_profile_stats.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+
+"""
+gather_profile_stats.py /path/to/dir/of/profiles
+
+Note that the aggregated profiles must be read with pstats.Stats, not
+hotshot.stats (the formats are incompatible)
+"""
+
+from hotshot import stats
+import os
+import pstats
+import sys
+
+
+def gather_stats(p):
+    profiles = {}
+    for f in os.listdir(p):
+        if f.endswith('.agg.prof'):
+            path = f[:-9]
+            prof = pstats.Stats(os.path.join(p, f))
+        elif f.endswith('.prof'):
+            bits = f.split('.')
+            path = ".".join(bits[:-3])
+            prof = stats.load(os.path.join(p, f))
+        else:
+            continue
+        print("Processing %s" % f)
+        if path in profiles:
+            profiles[path].add(prof)
+        else:
+            profiles[path] = prof
+        os.unlink(os.path.join(p, f))
+    for (path, prof) in profiles.items():
+        prof.dump_stats(os.path.join(p, "%s.agg.prof" % path))
+
+if __name__ == '__main__':
+    gather_stats(sys.argv[1])

django/bin/unique-messages.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+
+import os
+import sys
+
+
+def unique_messages():
+    basedir = None
+
+    if os.path.isdir(os.path.join('conf', 'locale')):
+        basedir = os.path.abspath(os.path.join('conf', 'locale'))
+    elif os.path.isdir('locale'):
+        basedir = os.path.abspath('locale')
+    else:
+        print("This script should be run from the Django Git tree or your project or app tree.")
+        sys.exit(1)
+
+    for (dirpath, dirnames, filenames) in os.walk(basedir):
+        for f in filenames:
+            if f.endswith('.po'):
+                sys.stderr.write('processing file %s in %s\n' % (f, dirpath))
+                pf = os.path.splitext(os.path.join(dirpath, f))[0]
+                cmd = 'msguniq "%s.po"' % pf
+                stdout = os.popen(cmd)
+                msg = stdout.read()
+                with open('%s.po' % pf, 'w') as fp:
+                    fp.write(msg)
+
+if __name__ == "__main__":
+    unique_messages()

django/conf/__init__.py

@@ -8,11 +8,12 @@ a list of all possible variables.
 
 import importlib
 import os
-import time
+import time     # Needed for Windows
 
 from django.conf import global_settings
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.functional import LazyObject, empty
+from django.utils import six
 
 ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
 
@@ -40,41 +41,10 @@ class LazySettings(LazyObject):
 
         self._wrapped = Settings(settings_module)
 
-    def __repr__(self):
-        # Hardcode the class name as otherwise it yields 'Settings'.
-        if self._wrapped is empty:
-            return '<LazySettings [Unevaluated]>'
-        return '<LazySettings "%(settings_module)s">' % {
-            'settings_module': self._wrapped.SETTINGS_MODULE,
-        }
-
     def __getattr__(self, name):
-        """
-        Return the value of a setting and cache it in self.__dict__.
-        """
         if self._wrapped is empty:
             self._setup(name)
-        val = getattr(self._wrapped, name)
-        self.__dict__[name] = val
-        return val
-
-    def __setattr__(self, name, value):
-        """
-        Set the value of setting. Clear all cached values if _wrapped changes
-        (@override_settings does this) or clear single values when set.
-        """
-        if name == '_wrapped':
-            self.__dict__.clear()
-        else:
-            self.__dict__.pop(name, None)
-        super(LazySettings, self).__setattr__(name, value)
-
-    def __delattr__(self, name):
-        """
-        Delete a setting and clear it from cache if needed.
-        """
-        super(LazySettings, self).__delattr__(name)
-        self.__dict__.pop(name, None)
+        return getattr(self._wrapped, name)
 
     def configure(self, default_settings=global_settings, **options):
         """
@@ -97,7 +67,20 @@ class LazySettings(LazyObject):
         return self._wrapped is not empty
 
 
-class Settings(object):
+class BaseSettings(object):
+    """
+    Common logic for settings whether set by a module or by the user.
+    """
+    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 == "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.")
+        object.__setattr__(self, name, value)
+
+
+class Settings(BaseSettings):
     def __init__(self, settings_module):
         # update this dict from global settings (but only for ALL_CAPS settings)
         for setting in dir(global_settings):
@@ -107,21 +90,24 @@ class Settings(object):
         # store the settings module in case someone later cares
         self.SETTINGS_MODULE = settings_module
 
-        mod = importlib.import_module(self.SETTINGS_MODULE)
+        try:
+            mod = importlib.import_module(self.SETTINGS_MODULE)
+        except ImportError as e:
+            raise ImportError(
+                "Could not import settings '%s' (Is it on sys.path? Is there an import error in the settings file?): %s"
+                % (self.SETTINGS_MODULE, e)
+            )
 
-        tuple_settings = (
-            "INSTALLED_APPS",
-            "TEMPLATE_DIRS",
-            "LOCALE_PATHS",
-        )
+        tuple_settings = ("INSTALLED_APPS", "TEMPLATE_DIRS")
         self._explicit_settings = set()
         for setting in dir(mod):
             if setting.isupper():
                 setting_value = getattr(mod, setting)
 
                 if (setting in tuple_settings and
-                        not isinstance(setting_value, (list, tuple))):
-                    raise ImproperlyConfigured("The %s setting must be a list or a tuple. " % setting)
+                        isinstance(setting_value, six.string_types)):
+                    raise ImproperlyConfigured("The %s setting must be a tuple. "
+                            "Please fix your settings." % setting)
                 setattr(self, setting, setting_value)
                 self._explicit_settings.add(setting)
 
@@ -143,14 +129,8 @@ class Settings(object):
     def is_overridden(self, setting):
         return setting in self._explicit_settings
 
-    def __repr__(self):
-        return '<%(cls)s "%(settings_module)s">' % {
-            'cls': self.__class__.__name__,
-            'settings_module': self.SETTINGS_MODULE,
-        }
 
-
-class UserSettingsHolder(object):
+class UserSettingsHolder(BaseSettings):
     """
     Holder for user configured settings.
     """
@@ -181,10 +161,7 @@ class UserSettingsHolder(object):
             super(UserSettingsHolder, self).__delattr__(name)
 
     def __dir__(self):
-        return sorted(
-            s for s in list(self.__dict__) + dir(self.default_settings)
-            if s not in self._deleted
-        )
+        return list(self.__dict__) + dir(self.default_settings)
 
     def is_overridden(self, setting):
         deleted = (setting in self._deleted)
@@ -192,10 +169,4 @@ class UserSettingsHolder(object):
         set_on_default = getattr(self.default_settings, 'is_overridden', lambda s: False)(setting)
         return (deleted or set_locally or set_on_default)
 
-    def __repr__(self):
-        return '<%(cls)s>' % {
-            'cls': self.__class__.__name__,
-        }
-
-
 settings = LazySettings()

django/conf/app_template/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

django/conf/app_template/admin.py-tpl

@@ -1,3 +0,0 @@
-{{ unicode_literals }}from django.contrib import admin
-
-# Register your models here.

django/conf/app_template/apps.py-tpl

@@ -1,5 +0,0 @@
-{{ unicode_literals }}from django.apps import AppConfig
-
-
-class {{ camel_case_app_name }}Config(AppConfig):
-    name = '{{ app_name }}'

django/conf/app_template/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

django/conf/app_template/models.py-tpl

@@ -1,3 +0,0 @@
-{{ unicode_literals }}from django.db import models
-
-# Create your models here.

django/conf/app_template/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

django/conf/app_template/tests.py-tpl

@@ -1,3 +0,0 @@
-{{ unicode_literals }}from django.test import TestCase
-
-# Create your tests here.

django/conf/app_template/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

django/conf/app_template/views.py-tpl

@@ -1,3 +0,0 @@
-{{ unicode_literals }}from django.shortcuts import render
-
-# Create your views here.

django/conf/global_settings.py

@@ -1,48 +1,40 @@
-# -*- coding: utf-8 -*-
-"""
-Default Django settings. Override these with settings in the module pointed to
-by the DJANGO_SETTINGS_MODULE environment variable.
-"""
-from __future__ import unicode_literals
-
+# Default Django settings. Override these with settings in the module
+# pointed-to by the DJANGO_SETTINGS_MODULE environment variable.
 
 # This is defined here as a do-nothing function because we can't import
 # django.utils.translation -- that module depends on the settings.
-def gettext_noop(s):
-    return s
-
+gettext_noop = lambda s: s
 
 ####################
 # CORE             #
 ####################
 
 DEBUG = False
+TEMPLATE_DEBUG = False
 
 # Whether the framework should propagate raw exceptions rather than catching
 # them. This is useful under some testing situations and should never be used
 # on a live site.
 DEBUG_PROPAGATE_EXCEPTIONS = False
 
-# Whether to use the "ETag" header. This saves bandwidth but slows down performance.
-# Deprecated (RemovedInDjango21Warning) in favor of ConditionalGetMiddleware
-# which sets the ETag regardless of this setting.
+# Whether to use the "Etag" header. This saves bandwidth but slows down performance.
 USE_ETAGS = False
 
 # People who get code error notifications.
-# In the format [('Full Name', 'email@example.com'), ('Full Name', 'anotheremail@example.com')]
-ADMINS = []
+# In the format (('Full Name', 'email@example.com'), ('Full Name', 'anotheremail@example.com'))
+ADMINS = ()
 
-# List of IP addresses, as strings, that:
+# Tuple of IP addresses, as strings, that:
 #   * See debug comments, when DEBUG is true
 #   * Receive x-headers
-INTERNAL_IPS = []
+INTERNAL_IPS = ()
 
 # Hosts/domain names that are valid for this site.
 # "*" matches anything, ".example.com" matches example.com and all subdomains
 ALLOWED_HOSTS = []
 
 # Local time zone for this installation. All choices can be found here:
-# https://en.wikipedia.org/wiki/List_of_tz_zones_by_name (although not all
+# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name (although not all
 # systems may support all possibilities). When USE_TZ is True, this is
 # interpreted as the default user time zone.
 TIME_ZONE = 'America/Chicago'
@@ -55,7 +47,7 @@ USE_TZ = False
 LANGUAGE_CODE = 'en-us'
 
 # Languages we provide translations for, out of the box.
-LANGUAGES = [
+LANGUAGES = (
     ('af', gettext_noop('Afrikaans')),
     ('ar', gettext_noop('Arabic')),
     ('ast', gettext_noop('Asturian')),
@@ -70,7 +62,6 @@ LANGUAGES = [
     ('cy', gettext_noop('Welsh')),
     ('da', gettext_noop('Danish')),
     ('de', gettext_noop('German')),
-    ('dsb', gettext_noop('Lower Sorbian')),
     ('el', gettext_noop('Greek')),
     ('en', gettext_noop('English')),
     ('en-au', gettext_noop('Australian English')),
@@ -78,7 +69,6 @@ LANGUAGES = [
     ('eo', gettext_noop('Esperanto')),
     ('es', gettext_noop('Spanish')),
     ('es-ar', gettext_noop('Argentinian Spanish')),
-    ('es-co', gettext_noop('Colombian Spanish')),
     ('es-mx', gettext_noop('Mexican Spanish')),
     ('es-ni', gettext_noop('Nicaraguan Spanish')),
     ('es-ve', gettext_noop('Venezuelan Spanish')),
@@ -89,12 +79,10 @@ LANGUAGES = [
     ('fr', gettext_noop('French')),
     ('fy', gettext_noop('Frisian')),
     ('ga', gettext_noop('Irish')),
-    ('gd', gettext_noop('Scottish Gaelic')),
     ('gl', gettext_noop('Galician')),
     ('he', gettext_noop('Hebrew')),
     ('hi', gettext_noop('Hindi')),
     ('hr', gettext_noop('Croatian')),
-    ('hsb', gettext_noop('Upper Sorbian')),
     ('hu', gettext_noop('Hungarian')),
     ('ia', gettext_noop('Interlingua')),
     ('id', gettext_noop('Indonesian')),
@@ -115,7 +103,7 @@ LANGUAGES = [
     ('mn', gettext_noop('Mongolian')),
     ('mr', gettext_noop('Marathi')),
     ('my', gettext_noop('Burmese')),
-    ('nb', gettext_noop('Norwegian Bokmål')),
+    ('nb', gettext_noop('Norwegian Bokmal')),
     ('ne', gettext_noop('Nepali')),
     ('nl', gettext_noop('Dutch')),
     ('nn', gettext_noop('Norwegian Nynorsk')),
@@ -142,17 +130,19 @@ LANGUAGES = [
     ('uk', gettext_noop('Ukrainian')),
     ('ur', gettext_noop('Urdu')),
     ('vi', gettext_noop('Vietnamese')),
+    ('zh-cn', gettext_noop('Simplified Chinese')),
     ('zh-hans', gettext_noop('Simplified Chinese')),
     ('zh-hant', gettext_noop('Traditional Chinese')),
-]
+    ('zh-tw', gettext_noop('Traditional Chinese')),
+)
 
 # Languages using BiDi (right-to-left) layout
-LANGUAGES_BIDI = ["he", "ar", "fa", "ur"]
+LANGUAGES_BIDI = ("he", "ar", "fa", "ur")
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
-LOCALE_PATHS = []
+LOCALE_PATHS = ()
 
 # Settings for language cookie
 LANGUAGE_COOKIE_NAME = 'django_language'
@@ -181,6 +171,9 @@ FILE_CHARSET = 'utf-8'
 # Email address that error messages come from.
 SERVER_EMAIL = 'root@localhost'
 
+# Whether to send broken-link emails. Deprecated, must be removed in 1.8.
+SEND_BROKEN_LINK_EMAILS = False
+
 # Database connection info. If left empty, will default to the dummy backend.
 DATABASES = {}
 
@@ -199,25 +192,43 @@ EMAIL_HOST = 'localhost'
 # Port for sending email.
 EMAIL_PORT = 25
 
-# Whether to send SMTP 'Date' header in the local time zone or in UTC.
-EMAIL_USE_LOCALTIME = False
-
 # Optional SMTP authentication information for EMAIL_HOST.
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
 EMAIL_USE_TLS = False
 EMAIL_USE_SSL = False
-EMAIL_SSL_CERTFILE = None
-EMAIL_SSL_KEYFILE = None
-EMAIL_TIMEOUT = None
 
 # List of strings representing installed apps.
-INSTALLED_APPS = []
+INSTALLED_APPS = ()
 
-TEMPLATES = []
+# List of locations of the template source files, in search order.
+TEMPLATE_DIRS = ()
 
-# Default form rendering class.
-FORM_RENDERER = 'django.forms.renderers.DjangoTemplates'
+# List of callables that know how to import templates from various sources.
+# See the comments in django/core/template/loader.py for interface
+# documentation.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+    # 'django.template.loaders.eggs.Loader',
+)
+
+# List of processors used by RequestContext to populate the context.
+# Each one should be a callable that takes the request object as its
+# only parameter and returns a dictionary to add to the context.
+TEMPLATE_CONTEXT_PROCESSORS = (
+    'django.contrib.auth.context_processors.auth',
+    'django.core.context_processors.debug',
+    'django.core.context_processors.i18n',
+    'django.core.context_processors.media',
+    'django.core.context_processors.static',
+    'django.core.context_processors.tz',
+    # 'django.core.context_processors.request',
+    'django.contrib.messages.context_processors.messages',
+)
+
+# Output to use in template system for invalid (e.g. misspelled) variables.
+TEMPLATE_STRING_IF_INVALID = ''
 
 # Default email address to use for various automated correspondence from
 # the site managers.
@@ -240,27 +251,36 @@ FORCE_SCRIPT_NAME = None
 # that are not allowed to visit any page, systemwide. Use this for bad
 # robots/crawlers. Here are a few examples:
 #     import re
-#     DISALLOWED_USER_AGENTS = [
+#     DISALLOWED_USER_AGENTS = (
 #         re.compile(r'^NaverBot.*'),
 #         re.compile(r'^EmailSiphon.*'),
 #         re.compile(r'^SiteSucker.*'),
-#         re.compile(r'^sohu-search'),
-#     ]
-DISALLOWED_USER_AGENTS = []
+#         re.compile(r'^sohu-search')
+#     )
+DISALLOWED_USER_AGENTS = ()
 
 ABSOLUTE_URL_OVERRIDES = {}
 
+# Tuple of strings representing allowed prefixes for the {% ssi %} tag.
+# Example: ('/home/html', '/var/www')
+ALLOWED_INCLUDE_ROOTS = ()
+
+# If this is an admin settings module, this should be a list of
+# settings modules (in the format 'foo.bar.baz') for which this admin
+# is an admin.
+ADMIN_FOR = ()
+
 # List of compiled regular expression objects representing URLs that need not
 # be reported by BrokenLinkEmailsMiddleware. Here are a few examples:
 #    import re
-#    IGNORABLE_404_URLS = [
+#    IGNORABLE_404_URLS = (
 #        re.compile(r'^/apple-touch-icon.*\.png$'),
-#        re.compile(r'^/favicon.ico$'),
-#        re.compile(r'^/robots.txt$'),
-#        re.compile(r'^/phpmyadmin/'),
+#        re.compile(r'^/favicon.ico$),
+#        re.compile(r'^/robots.txt$),
+#        re.compile(r'^/phpmyadmin/),
 #        re.compile(r'\.(cgi|php|pl)$'),
-#    ]
-IGNORABLE_404_URLS = []
+#    )
+IGNORABLE_404_URLS = ()
 
 # A secret key for this particular Django installation. Used in secret-key
 # hashing algorithms. Set this in your settings, or Django will complain
@@ -287,39 +307,27 @@ STATIC_ROOT = None
 STATIC_URL = None
 
 # List of upload handler classes to be applied in order.
-FILE_UPLOAD_HANDLERS = [
+FILE_UPLOAD_HANDLERS = (
     'django.core.files.uploadhandler.MemoryFileUploadHandler',
     'django.core.files.uploadhandler.TemporaryFileUploadHandler',
-]
+)
 
 # Maximum size, in bytes, of a request before it will be streamed to the
 # file system instead of into memory.
 FILE_UPLOAD_MAX_MEMORY_SIZE = 2621440  # i.e. 2.5 MB
 
-# Maximum size in bytes of request data (excluding file uploads) that will be
-# read before a SuspiciousOperation (RequestDataTooBig) is raised.
-DATA_UPLOAD_MAX_MEMORY_SIZE = 2621440  # i.e. 2.5 MB
-
-# Maximum number of GET/POST parameters that will be read before a
-# SuspiciousOperation (TooManyFieldsSent) is raised.
-DATA_UPLOAD_MAX_NUMBER_FIELDS = 1000
-
-# Maximum number of files encoded in a multipart upload that will be read
-# before a SuspiciousOperation (TooManyFilesSent) is raised.
-DATA_UPLOAD_MAX_NUMBER_FILES = 100
-
 # Directory in which upload streamed files will be temporarily saved. A value of
 # `None` will make Django use the operating system's default temporary directory
 # (i.e. "/tmp" on *nix systems).
 FILE_UPLOAD_TEMP_DIR = None
 
 # The numeric mode to set newly-uploaded files to. The value should be a mode
-# you'd pass directly to os.chmod; see https://docs.python.org/3/library/os.html#files-and-directories.
+# you'd pass directly to os.chmod; see http://docs.python.org/lib/os-file-dir.html.
 FILE_UPLOAD_PERMISSIONS = None
 
 # The numeric mode to assign to newly-created directories, when uploading files.
 # The value should be a mode as you'd pass to os.chmod;
-# see https://docs.python.org/3/library/os.html#files-and-directories.
+# see http://docs.python.org/lib/os-file-dir.html.
 FILE_UPLOAD_DIRECTORY_PERMISSIONS = None
 
 # Python module path where user will place custom format definition.
@@ -363,30 +371,30 @@ SHORT_DATETIME_FORMAT = 'm/d/Y P'
 # See all available format string here:
 # http://docs.python.org/library/datetime.html#strftime-behavior
 # * Note that these format strings are different from the ones to display dates
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
     '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y',  # '2006-10-25', '10/25/2006', '10/25/06'
     '%b %d %Y', '%b %d, %Y',             # 'Oct 25 2006', 'Oct 25, 2006'
     '%d %b %Y', '%d %b, %Y',             # '25 Oct 2006', '25 Oct, 2006'
     '%B %d %Y', '%B %d, %Y',             # 'October 25 2006', 'October 25, 2006'
     '%d %B %Y', '%d %B, %Y',             # '25 October 2006', '25 October, 2006'
-]
+)
 
 # Default formats to be used when parsing times from input boxes, in order
 # See all available format string here:
 # http://docs.python.org/library/datetime.html#strftime-behavior
 # * Note that these format strings are different from the ones to display dates
-TIME_INPUT_FORMATS = [
+TIME_INPUT_FORMATS = (
     '%H:%M:%S',     # '14:30:59'
     '%H:%M:%S.%f',  # '14:30:59.000200'
     '%H:%M',        # '14:30'
-]
+)
 
 # Default formats to be used when parsing dates and times from input boxes,
 # in order
 # See all available format string here:
 # http://docs.python.org/library/datetime.html#strftime-behavior
 # * Note that these format strings are different from the ones to display dates
-DATETIME_INPUT_FORMATS = [
+DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
     '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
@@ -399,7 +407,7 @@ DATETIME_INPUT_FORMATS = [
     '%m/%d/%y %H:%M:%S.%f',  # '10/25/06 14:30:59.000200'
     '%m/%d/%y %H:%M',        # '10/25/06 14:30'
     '%m/%d/%y',              # '10/25/06'
-]
+)
 
 # First day of week, to be used on calendars
 # 0 means Sunday, 1 means Monday...
@@ -418,6 +426,10 @@ NUMBER_GROUPING = 0
 # Thousand separator symbol
 THOUSAND_SEPARATOR = ','
 
+# Do you want to manage transactions manually?
+# Hint: you really don't!
+TRANSACTIONS_MANAGED = False
+
 # The tablespaces to use for each model when not specified otherwise.
 DEFAULT_TABLESPACE = ''
 DEFAULT_INDEX_TABLESPACE = ''
@@ -426,10 +438,9 @@ DEFAULT_INDEX_TABLESPACE = ''
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 USE_X_FORWARDED_HOST = False
-USE_X_FORWARDED_PORT = False
 
-# The Python dotted path to the WSGI application that Django's internal server
-# (runserver) will use. If `None`, the return value of
+# The Python dotted path to the WSGI application that Django's internal servers
+# (runserver, runfcgi) will use. If `None`, the return value of
 # 'django.core.wsgi.get_wsgi_application' is used, thus preserving the same
 # behavior as previous versions of Django. Otherwise this should point to an
 # actual WSGI application object.
@@ -448,45 +459,30 @@ SECURE_PROXY_SSL_HEADER = None
 # MIDDLEWARE #
 ##############
 
-# List of middleware to use. Order is important; in the request phase, these
-# middleware will be applied in the order given, and in the response
-# phase the middleware will be applied in reverse order.
-MIDDLEWARE_CLASSES = [
+# List of middleware classes to use.  Order is important; in the request phase,
+# this middleware classes will be applied in the order given, and in the
+# response phase the middleware will be applied in reverse order.
+MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
-]
-
-MIDDLEWARE = None
+)
 
 ############
 # SESSIONS #
 ############
 
-# Cache to store session data if using the cache session backend.
-SESSION_CACHE_ALIAS = 'default'
-# Cookie name. This can be whatever you want.
-SESSION_COOKIE_NAME = 'sessionid'
-# Age of cookie, in seconds (default: 2 weeks).
-SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2
-# A string like ".example.com", or None for standard domain cookie.
-SESSION_COOKIE_DOMAIN = None
-# Whether the session cookie should be secure (https:// only).
-SESSION_COOKIE_SECURE = False
-# The path of the session cookie.
-SESSION_COOKIE_PATH = '/'
-# Whether to use the non-RFC standard httpOnly flag (IE, FF3+, others)
-SESSION_COOKIE_HTTPONLY = True
-# Whether to save the session data on every request.
-SESSION_SAVE_EVERY_REQUEST = False
-# Whether a user's session cookie expires when the Web browser is closed.
-SESSION_EXPIRE_AT_BROWSER_CLOSE = False
-# The module to store session data
-SESSION_ENGINE = 'django.contrib.sessions.backends.db'
-# Directory to store session files if using the file session module. If None,
-# the backend will use a sensible default.
-SESSION_FILE_PATH = None
-# class to serialize session data
-SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'
+SESSION_CACHE_ALIAS = 'default'                         # Cache to store session data if using the cache session backend.
+SESSION_COOKIE_NAME = 'sessionid'                       # Cookie name. This can be whatever you want.
+SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2               # Age of cookie, in seconds (default: 2 weeks).
+SESSION_COOKIE_DOMAIN = None                            # A string like ".example.com", or None for standard domain cookie.
+SESSION_COOKIE_SECURE = False                           # Whether the session cookie should be secure (https:// only).
+SESSION_COOKIE_PATH = '/'                               # The path of the session cookie.
+SESSION_COOKIE_HTTPONLY = True                          # Whether to use the non-RFC standard httpOnly flag (IE, FF3+, others)
+SESSION_SAVE_EVERY_REQUEST = False                      # Whether to save the session data on every request.
+SESSION_EXPIRE_AT_BROWSER_CLOSE = False                 # Whether a user's session cookie expires when the Web browser is closed.
+SESSION_ENGINE = 'django.contrib.sessions.backends.db'  # The module to store session data
+SESSION_FILE_PATH = None                                # Directory to store session files if using the file session module. If None, the backend will use a sensible default.
+SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'  # class to serialize session data
 
 #########
 # CACHE #
@@ -502,19 +498,29 @@ CACHE_MIDDLEWARE_KEY_PREFIX = ''
 CACHE_MIDDLEWARE_SECONDS = 600
 CACHE_MIDDLEWARE_ALIAS = 'default'
 
+####################
+# COMMENTS         #
+####################
+
+COMMENTS_ALLOW_PROFANITIES = False
+
+# The profanities that will trigger a validation error in
+# CommentDetailsForm.clean_comment. All of these should be in lowercase.
+PROFANITIES_LIST = ()
+
 ##################
 # AUTHENTICATION #
 ##################
 
 AUTH_USER_MODEL = 'auth.User'
 
-AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.ModelBackend']
+AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',)
 
 LOGIN_URL = '/accounts/login/'
 
-LOGIN_REDIRECT_URL = '/accounts/profile/'
+LOGOUT_URL = '/accounts/logout/'
 
-LOGOUT_REDIRECT_URL = None
+LOGIN_REDIRECT_URL = '/accounts/profile/'
 
 # The number of days a password reset link is valid for
 PASSWORD_RESET_TIMEOUT_DAYS = 3
@@ -522,15 +528,17 @@ PASSWORD_RESET_TIMEOUT_DAYS = 3
 # the first hasher in this list is the preferred algorithm.  any
 # password using different algorithms will be converted automatically
 # upon login
-PASSWORD_HASHERS = [
+PASSWORD_HASHERS = (
     'django.contrib.auth.hashers.PBKDF2PasswordHasher',
     'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
-    'django.contrib.auth.hashers.Argon2PasswordHasher',
     'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
     'django.contrib.auth.hashers.BCryptPasswordHasher',
-]
-
-AUTH_PASSWORD_VALIDATORS = []
+    'django.contrib.auth.hashers.SHA1PasswordHasher',
+    'django.contrib.auth.hashers.MD5PasswordHasher',
+    'django.contrib.auth.hashers.UnsaltedSHA1PasswordHasher',
+    'django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',
+    'django.contrib.auth.hashers.CryptPasswordHasher',
+)
 
 ###########
 # SIGNING #
@@ -553,9 +561,6 @@ CSRF_COOKIE_DOMAIN = None
 CSRF_COOKIE_PATH = '/'
 CSRF_COOKIE_SECURE = False
 CSRF_COOKIE_HTTPONLY = False
-CSRF_HEADER_NAME = 'HTTP_X_CSRFTOKEN'
-CSRF_TRUSTED_ORIGINS = []
-CSRF_USE_SESSIONS = False
 
 ############
 # MESSAGES #
@@ -597,25 +602,25 @@ TEST_NON_SERIALIZED_APPS = []
 ############
 
 # The list of directories to search for fixtures
-FIXTURE_DIRS = []
+FIXTURE_DIRS = ()
 
 ###############
 # STATICFILES #
 ###############
 
 # A list of locations of additional static files
-STATICFILES_DIRS = []
+STATICFILES_DIRS = ()
 
 # The default file storage backend used during the build process
 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
 
 # List of finder classes that know how to find static files in
 # various locations.
-STATICFILES_FINDERS = [
+STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
     # 'django.contrib.staticfiles.finders.DefaultStorageFinder',
-]
+)
 
 ##############
 # MIGRATIONS #
@@ -633,15 +638,3 @@ MIGRATION_MODULES = {}
 # serious issues like errors and criticals does not result in hiding the
 # message, but Django will not stop you from e.g. running server.
 SILENCED_SYSTEM_CHECKS = []
-
-#######################
-# SECURITY MIDDLEWARE #
-#######################
-SECURE_BROWSER_XSS_FILTER = False
-SECURE_CONTENT_TYPE_NOSNIFF = False
-SECURE_HSTS_INCLUDE_SUBDOMAINS = False
-SECURE_HSTS_PRELOAD = False
-SECURE_HSTS_SECONDS = 0
-SECURE_REDIRECT_EXEMPT = []
-SECURE_SSL_HOST = None
-SECURE_SSL_REDIRECT = False

django/conf/locale/__init__.py

@@ -1,14 +1,8 @@
 # -*- encoding: utf-8 -*-
 from __future__ import unicode_literals
 
-"""
-LANG_INFO is a dictionary structure to provide meta information about languages.
-
-About name_local: capitalize it as if your language name was appearing
-inside a sentence in your language.
-The 'fallback' key can be used to specify a special fallback logic which doesn't
-follow the traditional 'fr-ca' -> 'fr' fallback logic.
-"""
+# About name_local: capitalize it as if your language name was appearing
+# inside a sentence in your language.
 
 LANG_INFO = {
     'af': {
@@ -33,7 +27,7 @@ LANG_INFO = {
         'bidi': True,
         'code': 'az',
         'name': 'Azerbaijani',
-        'name_local': 'Azərbaycanca',
+        'name_local': 'azərbaycan dili',
     },
     'be': {
         'bidi': False,
@@ -95,12 +89,6 @@ LANG_INFO = {
         'name': 'German',
         'name_local': 'Deutsch',
     },
-    'dsb': {
-        'bidi': False,
-        'code': 'dsb',
-        'name': 'Lower Sorbian',
-        'name_local': 'dolnoserbski',
-    },
     'el': {
         'bidi': False,
         'code': 'el',
@@ -143,12 +131,6 @@ LANG_INFO = {
         'name': 'Argentinian Spanish',
         'name_local': 'español de Argentina',
     },
-    'es-co': {
-        'bidi': False,
-        'code': 'es-co',
-        'name': 'Colombian Spanish',
-        'name_local': 'español de Colombia',
-    },
     'es-mx': {
         'bidi': False,
         'code': 'es-mx',
@@ -209,12 +191,6 @@ LANG_INFO = {
         'name': 'Irish',
         'name_local': 'Gaeilge',
     },
-    'gd': {
-        'bidi': False,
-        'code': 'gd',
-        'name': 'Scottish Gaelic',
-        'name_local': 'Gàidhlig',
-    },
     'gl': {
         'bidi': False,
         'code': 'gl',
@@ -239,12 +215,6 @@ LANG_INFO = {
         'name': 'Croatian',
         'name_local': 'Hrvatski',
     },
-    'hsb': {
-        'bidi': False,
-        'code': 'hsb',
-        'name': 'Upper Sorbian',
-        'name_local': 'hornjoserbsce',
-    },
     'hu': {
         'bidi': False,
         'code': 'hu',
@@ -441,7 +411,7 @@ LANG_INFO = {
         'bidi': False,
         'code': 'sk',
         'name': 'Slovak',
-        'name_local': 'Slovensky',
+        'name_local': 'slovenský',
     },
     'sl': {
         'bidi': False,
@@ -534,7 +504,10 @@ LANG_INFO = {
         'name_local': 'Tiếng Việt',
     },
     'zh-cn': {
-        'fallback': ['zh-hans'],
+        'bidi': False,
+        'code': 'zh-cn',
+        'name': 'Simplified Chinese',
+        'name_local': '简体中文',
     },
     'zh-hans': {
         'bidi': False,
@@ -548,19 +521,10 @@ LANG_INFO = {
         'name': 'Traditional Chinese',
         'name_local': '繁體中文',
     },
-    'zh-hk': {
-        'fallback': ['zh-hant'],
-    },
-    'zh-mo': {
-        'fallback': ['zh-hant'],
-    },
-    'zh-my': {
-        'fallback': ['zh-hans'],
-    },
-    'zh-sg': {
-        'fallback': ['zh-hans'],
-    },
     'zh-tw': {
-        'fallback': ['zh-hant'],
-    },
+        'bidi': False,
+        'code': 'zh-tw',
+        'name': 'Traditional Chinese',
+        'name_local': '繁體中文',
+    }
 }

django/conf/locale/ar/formats.py

@@ -6,7 +6,7 @@ from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j F، Y'
-TIME_FORMAT = 'g:i A'
+TIME_FORMAT = 'g:i:s A'
 # DATETIME_FORMAT =
 YEAR_MONTH_FORMAT = 'F Y'
 MONTH_DAY_FORMAT = 'j F'

django/conf/locale/az/formats.py

@@ -5,10 +5,10 @@ from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATE_FORMAT = 'j E Y'
+DATE_FORMAT = 'j E Y г.'
 TIME_FORMAT = 'G:i'
-DATETIME_FORMAT = 'j E Y, G:i'
-YEAR_MONTH_FORMAT = 'F Y'
+DATETIME_FORMAT = 'j E Y г. G:i'
+YEAR_MONTH_FORMAT = 'F Y г.'
 MONTH_DAY_FORMAT = 'j F'
 SHORT_DATE_FORMAT = 'd.m.Y'
 SHORT_DATETIME_FORMAT = 'd.m.Y H:i'

django/conf/locale/bg/formats.py

@@ -6,7 +6,7 @@ from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'd F Y'
-TIME_FORMAT = 'H:i'
+TIME_FORMAT = 'H:i:s'
 # DATETIME_FORMAT =
 # YEAR_MONTH_FORMAT =
 MONTH_DAY_FORMAT = 'j F'

django/conf/locale/bn/formats.py

@@ -6,30 +6,19 @@ from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j F, Y'
-TIME_FORMAT = 'g:i A'
+TIME_FORMAT = 'g:i:s A'
 # DATETIME_FORMAT =
 YEAR_MONTH_FORMAT = 'F Y'
 MONTH_DAY_FORMAT = 'j F'
 SHORT_DATE_FORMAT = 'j M, Y'
 # SHORT_DATETIME_FORMAT =
-FIRST_DAY_OF_WEEK = 6  # Saturday
+# FIRST_DAY_OF_WEEK =
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
-    '%d/%m/%Y',  # 25/10/2016
-    '%d/%m/%y',  # 25/10/16
-    '%d-%m-%Y',  # 25-10-2016
-    '%d-%m-%y',  # 25-10-16
-]
-TIME_INPUT_FORMATS = [
-    '%H:%M:%S',  # 14:30:59
-    '%H:%M',  # 14:30
-]
-DATETIME_INPUT_FORMATS = [
-    '%d/%m/%Y %H:%M:%S',  # 25/10/2006 14:30:59
-    '%d/%m/%Y %H:%M',  # 25/10/2006 14:30
-]
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 # NUMBER_GROUPING =

django/conf/locale/ca/formats.py

@@ -6,7 +6,7 @@ from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = r'j \d\e F \d\e Y'
-TIME_FORMAT = 'G:i'
+TIME_FORMAT = 'G:i:s'
 DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\e\s G:i'
 YEAR_MONTH_FORMAT = r'F \d\e\l Y'
 MONTH_DAY_FORMAT = r'j \d\e F'
@@ -16,18 +16,18 @@ FIRST_DAY_OF_WEEK = 1  # Monday
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
     # '31/12/2009', '31/12/09'
     '%d/%m/%Y', '%d/%m/%y'
-]
-DATETIME_INPUT_FORMATS = [
+)
+DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
     '%d/%m/%Y %H:%M:%S.%f',
     '%d/%m/%Y %H:%M',
     '%d/%m/%y %H:%M:%S',
     '%d/%m/%y %H:%M:%S.%f',
     '%d/%m/%y %H:%M',
-]
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
 NUMBER_GROUPING = 3

django/conf/locale/cs/formats.py

@@ -6,28 +6,28 @@ from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j. E Y'
-TIME_FORMAT = 'G:i'
-DATETIME_FORMAT = 'j. E Y G:i'
+TIME_FORMAT = 'G:i:s'
+DATETIME_FORMAT = 'j. E Y G:i:s'
 YEAR_MONTH_FORMAT = 'F Y'
 MONTH_DAY_FORMAT = 'j. F'
 SHORT_DATE_FORMAT = 'd.m.Y'
-SHORT_DATETIME_FORMAT = 'd.m.Y G:i'
+SHORT_DATETIME_FORMAT = 'd.m.Y G:i:s'
 FIRST_DAY_OF_WEEK = 1  # Monday
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
     '%d.%m.%Y', '%d.%m.%y',     # '05.01.2006', '05.01.06'
     '%d. %m. %Y', '%d. %m. %y',  # '5. 1. 2006', '5. 1. 06'
     # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'
-]
+)
 # Kept ISO formats as one is in first position
-TIME_INPUT_FORMATS = [
+TIME_INPUT_FORMATS = (
     '%H:%M:%S',  # '04:30:59'
     '%H.%M',    # '04.30'
     '%H:%M',    # '04:30'
-]
-DATETIME_INPUT_FORMATS = [
+)
+DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',    # '05.01.2006 04:30:59'
     '%d.%m.%Y %H:%M:%S.%f',  # '05.01.2006 04:30:59.000200'
     '%d.%m.%Y %H.%M',       # '05.01.2006 04.30'
@@ -39,7 +39,7 @@ DATETIME_INPUT_FORMATS = [
     '%d. %m. %Y %H:%M',     # '05. 01. 2006 04:30'
     '%d. %m. %Y',           # '05. 01. 2006'
     '%Y-%m-%d %H.%M',       # '2006-01-05 04.30'
-]
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '\xa0'  # non-breaking space
 NUMBER_GROUPING = 3

django/conf/locale/cy/formats.py

@@ -16,10 +16,10 @@ FIRST_DAY_OF_WEEK = 1                   # 'Dydd Llun'
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
     '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06'
-]
-DATETIME_INPUT_FORMATS = [
+)
+DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',                # '2006-10-25 14:30:59'
     '%Y-%m-%d %H:%M:%S.%f',             # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',                   # '2006-10-25 14:30'
@@ -32,7 +32,7 @@ DATETIME_INPUT_FORMATS = [
     '%d/%m/%y %H:%M:%S.%f',             # '25/10/06 14:30:59.000200'
     '%d/%m/%y %H:%M',                   # '25/10/06 14:30'
     '%d/%m/%y',                         # '25/10/06'
-]
+)
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 NUMBER_GROUPING = 3

django/conf/locale/da/formats.py

@@ -16,14 +16,14 @@ FIRST_DAY_OF_WEEK = 1
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
     '%d.%m.%Y',                         # '25.10.2006'
-]
-DATETIME_INPUT_FORMATS = [
+)
+DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',                # '25.10.2006 14:30:59'
     '%d.%m.%Y %H:%M:%S.%f',             # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',                   # '25.10.2006 14:30'
-]
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
 NUMBER_GROUPING = 3

django/conf/locale/de/formats.py

@@ -6,26 +6,26 @@ from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j. F Y'
-TIME_FORMAT = 'H:i'
-DATETIME_FORMAT = 'j. F Y H:i'
+TIME_FORMAT = 'H:i:s'
+DATETIME_FORMAT = 'j. F Y H:i:s'
 YEAR_MONTH_FORMAT = 'F Y'
 MONTH_DAY_FORMAT = 'j. F'
 SHORT_DATE_FORMAT = 'd.m.Y'
-SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
+SHORT_DATETIME_FORMAT = 'd.m.Y H:i:s'
 FIRST_DAY_OF_WEEK = 1  # Monday
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
     '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06'
     # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'
-]
-DATETIME_INPUT_FORMATS = [
+)
+DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',    # '25.10.2006 14:30:59'
     '%d.%m.%Y %H:%M:%S.%f',  # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',       # '25.10.2006 14:30'
     '%d.%m.%Y',             # '25.10.2006'
-]
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
 NUMBER_GROUPING = 3

django/conf/locale/de_CH/formats.py

@@ -7,26 +7,26 @@
 from __future__ import unicode_literals
 
 DATE_FORMAT = 'j. F Y'
-TIME_FORMAT = 'H:i'
-DATETIME_FORMAT = 'j. F Y H:i'
+TIME_FORMAT = 'H:i:s'
+DATETIME_FORMAT = 'j. F Y H:i:s'
 YEAR_MONTH_FORMAT = 'F Y'
 MONTH_DAY_FORMAT = 'j. F'
 SHORT_DATE_FORMAT = 'd.m.Y'
-SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
+SHORT_DATETIME_FORMAT = 'd.m.Y H:i:s'
 FIRST_DAY_OF_WEEK = 1  # Monday
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
     '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06'
     # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'
-]
-DATETIME_INPUT_FORMATS = [
+)
+DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',    # '25.10.2006 14:30:59'
     '%d.%m.%Y %H:%M:%S.%f',  # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',       # '25.10.2006 14:30'
     '%d.%m.%Y',             # '25.10.2006'
-]
+)
 
 # these are the separators for non-monetary numbers. For monetary numbers,
 # the DECIMAL_SEPARATOR is a . (decimal point) and the THOUSAND_SEPARATOR is a

django/conf/locale/el/formats.py

@@ -16,10 +16,10 @@ FIRST_DAY_OF_WEEK = 0  # Sunday
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
     '%d/%m/%Y', '%d/%m/%y', '%Y-%m-%d',  # '25/10/2006', '25/10/06', '2006-10-25',
-]
-DATETIME_INPUT_FORMATS = [
+)
+DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',     # '25/10/2006 14:30:59'
     '%d/%m/%Y %H:%M:%S.%f',  # '25/10/2006 14:30:59.000200'
     '%d/%m/%Y %H:%M',        # '25/10/2006 14:30'
@@ -32,7 +32,7 @@ DATETIME_INPUT_FORMATS = [
     '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
     '%Y-%m-%d',              # '2006-10-25'
-]
+)
 DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = '.'
+THOUSAND_SEPARATOR = '\xa0'  # non-breaking space
 NUMBER_GROUPING = 3

django/conf/locale/en/formats.py

@@ -17,14 +17,14 @@ FIRST_DAY_OF_WEEK = 0  # Sunday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
 # Kept ISO formats as they are in first position
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
     '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y',  # '2006-10-25', '10/25/2006', '10/25/06'
     # '%b %d %Y', '%b %d, %Y',            # 'Oct 25 2006', 'Oct 25, 2006'
     # '%d %b %Y', '%d %b, %Y',            # '25 Oct 2006', '25 Oct, 2006'
     # '%B %d %Y', '%B %d, %Y',            # 'October 25 2006', 'October 25, 2006'
     # '%d %B %Y', '%d %B, %Y',            # '25 October 2006', '25 October, 2006'
-]
-DATETIME_INPUT_FORMATS = [
+)
+DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
     '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
@@ -37,7 +37,7 @@ DATETIME_INPUT_FORMATS = [
     '%m/%d/%y %H:%M:%S.%f',  # '10/25/06 14:30:59.000200'
     '%m/%d/%y %H:%M',        # '10/25/06 14:30'
     '%m/%d/%y',              # '10/25/06'
-]
+)
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 NUMBER_GROUPING = 3

django/conf/locale/en_AU/formats.py

@@ -6,24 +6,24 @@ from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j M Y'                   # '25 Oct 2006'
-TIME_FORMAT = 'P'                       # '2:30 p.m.'
-DATETIME_FORMAT = 'j M Y, P'            # '25 Oct 2006, 2:30 p.m.'
+TIME_FORMAT = 'P'                       # '2:30 pm'
+DATETIME_FORMAT = 'j M Y, P'            # '25 Oct 2006, 2:30 pm'
 YEAR_MONTH_FORMAT = 'F Y'               # 'October 2006'
 MONTH_DAY_FORMAT = 'j F'                # '25 October'
 SHORT_DATE_FORMAT = 'd/m/Y'             # '25/10/2006'
-SHORT_DATETIME_FORMAT = 'd/m/Y P'       # '25/10/2006 2:30 p.m.'
+SHORT_DATETIME_FORMAT = 'd/m/Y P'       # '25/10/2006 2:30 pm'
 FIRST_DAY_OF_WEEK = 0                   # Sunday
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
     '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06'
     # '%b %d %Y', '%b %d, %Y',          # 'Oct 25 2006', 'Oct 25, 2006'
     # '%d %b %Y', '%d %b, %Y',          # '25 Oct 2006', '25 Oct, 2006'
     # '%B %d %Y', '%B %d, %Y',          # 'October 25 2006', 'October 25, 2006'
     # '%d %B %Y', '%d %B, %Y',          # '25 October 2006', '25 October, 2006'
-]
-DATETIME_INPUT_FORMATS = [
+)
+DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',                # '2006-10-25 14:30:59'
     '%Y-%m-%d %H:%M:%S.%f',             # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',                   # '2006-10-25 14:30'
@@ -36,7 +36,7 @@ DATETIME_INPUT_FORMATS = [
     '%d/%m/%y %H:%M:%S.%f',             # '25/10/06 14:30:59.000200'
     '%d/%m/%y %H:%M',                   # '25/10/06 14:30'
     '%d/%m/%y',                         # '25/10/06'
-]
+)
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 NUMBER_GROUPING = 3

django/conf/locale/en_GB/formats.py

@@ -6,24 +6,24 @@ from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j M Y'                   # '25 Oct 2006'
-TIME_FORMAT = 'P'                       # '2:30 p.m.'
-DATETIME_FORMAT = 'j M Y, P'            # '25 Oct 2006, 2:30 p.m.'
+TIME_FORMAT = 'P'                       # '2:30 pm'
+DATETIME_FORMAT = 'j M Y, P'            # '25 Oct 2006, 2:30 pm'
 YEAR_MONTH_FORMAT = 'F Y'               # 'October 2006'
 MONTH_DAY_FORMAT = 'j F'                # '25 October'
 SHORT_DATE_FORMAT = 'd/m/Y'             # '25/10/2006'
-SHORT_DATETIME_FORMAT = 'd/m/Y P'       # '25/10/2006 2:30 p.m.'
-FIRST_DAY_OF_WEEK = 1                   # Monday
+SHORT_DATETIME_FORMAT = 'd/m/Y P'       # '25/10/2006 2:30 pm'
+FIRST_DAY_OF_WEEK = 0                   # Sunday
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
     '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06'
     # '%b %d %Y', '%b %d, %Y',          # 'Oct 25 2006', 'Oct 25, 2006'
     # '%d %b %Y', '%d %b, %Y',          # '25 Oct 2006', '25 Oct, 2006'
     # '%B %d %Y', '%B %d, %Y',          # 'October 25 2006', 'October 25, 2006'
     # '%d %B %Y', '%d %B, %Y',          # '25 October 2006', '25 October, 2006'
-]
-DATETIME_INPUT_FORMATS = [
+)
+DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',                # '2006-10-25 14:30:59'
     '%Y-%m-%d %H:%M:%S.%f',             # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',                   # '2006-10-25 14:30'
@@ -36,7 +36,7 @@ DATETIME_INPUT_FORMATS = [
     '%d/%m/%y %H:%M:%S.%f',             # '25/10/06 14:30:59.000200'
     '%d/%m/%y %H:%M',                   # '25/10/06 14:30'
     '%d/%m/%y',                         # '25/10/06'
-]
+)
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 NUMBER_GROUPING = 3

django/conf/locale/eo/formats.py

@@ -6,17 +6,17 @@ from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = r'j\-\a \d\e F Y'         # '26-a de julio 1887'
-TIME_FORMAT = 'H:i'                     # '18:59'
-DATETIME_FORMAT = r'j\-\a \d\e F Y\, \j\e H:i'  # '26-a de julio 1887, je 18:59'
+TIME_FORMAT = 'H:i:s'                   # '18:59:00'
+DATETIME_FORMAT = r'j\-\a \d\e F Y\, \j\e H:i:s'  # '26-a de julio 1887, je 18:59:00'
 YEAR_MONTH_FORMAT = r'F \d\e Y'         # 'julio de 1887'
 MONTH_DAY_FORMAT = r'j\-\a \d\e F'      # '26-a de julio'
 SHORT_DATE_FORMAT = 'Y-m-d'             # '1887-07-26'
-SHORT_DATETIME_FORMAT = 'Y-m-d H:i'     # '1887-07-26 18:59'
+SHORT_DATETIME_FORMAT = 'Y-m-d H:i:s'   # '1887-07-26 18:59:00'
 FIRST_DAY_OF_WEEK = 1  # Monday (lundo)
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
     '%Y-%m-%d',                         # '1887-07-26'
     '%y-%m-%d',                         # '87-07-26'
     '%Y %m %d',                         # '1887 07 26'
@@ -25,12 +25,12 @@ DATE_INPUT_FORMATS = [
     '%d-a de %B %Y',                    # '26-a de julio 1887'
     '%d %B %Y',                         # '26 julio 1887'
     '%d %m %Y',                         # '26 07 1887'
-]
-TIME_INPUT_FORMATS = [
+)
+TIME_INPUT_FORMATS = (
     '%H:%M:%S',                         # '18:59:00'
     '%H:%M',                            # '18:59'
-]
-DATETIME_INPUT_FORMATS = [
+)
+DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',                # '1887-07-26 18:59:00'
     '%Y-%m-%d %H:%M',                   # '1887-07-26 18:59'
     '%Y-%m-%d',                         # '1887-07-26'
@@ -46,7 +46,7 @@ DATETIME_INPUT_FORMATS = [
     '%y-%m-%d %H:%M:%S',                # '87-07-26 18:59:00'
     '%y-%m-%d %H:%M',                   # '87-07-26 18:59'
     '%y-%m-%d',                         # '87-07-26'
-]
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '\xa0'  # non-breaking space
 NUMBER_GROUPING = 3

django/conf/locale/es/formats.py

@@ -6,7 +6,7 @@ from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = r'j \d\e F \d\e Y'
-TIME_FORMAT = 'H:i'
+TIME_FORMAT = 'H:i:s'
 DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i'
 YEAR_MONTH_FORMAT = r'F \d\e Y'
 MONTH_DAY_FORMAT = r'j \d\e F'
@@ -16,18 +16,18 @@ FIRST_DAY_OF_WEEK = 1  # Monday
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
     # '31/12/2009', '31/12/09'
     '%d/%m/%Y', '%d/%m/%y'
-]
-DATETIME_INPUT_FORMATS = [
+)
+DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
     '%d/%m/%Y %H:%M:%S.%f',
     '%d/%m/%Y %H:%M',
     '%d/%m/%y %H:%M:%S',
     '%d/%m/%y %H:%M:%S.%f',
     '%d/%m/%y %H:%M',
-]
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
 NUMBER_GROUPING = 3

django/conf/locale/es_AR/formats.py

@@ -6,8 +6,8 @@ from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = r'j N Y'
-TIME_FORMAT = r'H:i'
-DATETIME_FORMAT = r'j N Y H:i'
+TIME_FORMAT = r'H:i:s'
+DATETIME_FORMAT = r'j N Y H:i:s'
 YEAR_MONTH_FORMAT = r'F Y'
 MONTH_DAY_FORMAT = r'j \d\e F'
 SHORT_DATE_FORMAT = r'd/m/Y'
@@ -16,18 +16,18 @@ FIRST_DAY_OF_WEEK = 0  # 0: Sunday, 1: Monday
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
     '%d/%m/%Y',  # '31/12/2009'
     '%d/%m/%y',  # '31/12/09'
-]
-DATETIME_INPUT_FORMATS = [
+)
+DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
     '%d/%m/%Y %H:%M:%S.%f',
     '%d/%m/%Y %H:%M',
     '%d/%m/%y %H:%M:%S',
     '%d/%m/%y %H:%M:%S.%f',
     '%d/%m/%y %H:%M',
-]
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
 NUMBER_GROUPING = 3

django/conf/locale/es_CO/formats.py

@@ -1,29 +0,0 @@
-# -*- encoding: utf-8 -*-
-# This file is distributed under the same license as the Django package.
-#
-from __future__ import unicode_literals
-
-DATE_FORMAT = r'j \d\e F \d\e Y'
-TIME_FORMAT = 'H:i'
-DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i'
-YEAR_MONTH_FORMAT = r'F \d\e Y'
-MONTH_DAY_FORMAT = r'j \d\e F'
-SHORT_DATE_FORMAT = 'd/m/Y'
-SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
-FIRST_DAY_OF_WEEK = 1
-DATE_INPUT_FORMATS = [
-    '%d/%m/%Y', '%d/%m/%y',  # '25/10/2006', '25/10/06'
-    '%Y%m%d',                # '20061025'
-
-]
-DATETIME_INPUT_FORMATS = [
-    '%d/%m/%Y %H:%M:%S',
-    '%d/%m/%Y %H:%M:%S.%f',
-    '%d/%m/%Y %H:%M',
-    '%d/%m/%y %H:%M:%S',
-    '%d/%m/%y %H:%M:%S.%f',
-    '%d/%m/%y %H:%M',
-]
-DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = '.'
-NUMBER_GROUPING = 3