[1.3.x] Fixed #21869 -- Fixed docs building with Sphinx 1.2.1.

Thanks tragiclifestories for the report. Backport of e1d18b9d2e from master
[1.3.x] Fixed djangodocs Sphinx extension to work with latest Sphinx
2014-07-18 13:07:52 +00:00 · 2014-07-18 13:07:31 +00:00 · 2014-07-18 13:05:52 +00:00 · 2014-07-18 13:03:38 +00:00 · 2014-02-01 10:38:57 -08:00 · 2014-01-31 17:15:13 -08:00
7371 changed files with 485257 additions and 615647 deletions
--- a/.editorconfig
+++ b/.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
--- a/.eslintignore
+++ b/.eslintignore
@ -1,4 +0,0 @@
-**/*.min.js
-**/vendor/**/*.js
-django/contrib/gis/templates/**/*.js
-node_modules/**.js
--- a/.eslintrc
+++ b/.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
-    }
-}
--- a/.gitattributes
+++ b/.gitattributes
@ -1,7 +0,0 @@
-# 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
--- a/.gitignore
+++ b/.gitignore
@ -1,18 +1,4 @@
-# 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/
 docs/_build/
-docs/locale/
-node_modules/
-tests/coverage_html/
-tests/.coverage
-build/
-tests/report/
--- a/.hgignore
+++ b/.hgignore
@ -3,13 +3,4 @@ syntax:glob
 *.egg-info
 *.pot
 *.py[co]
-__pycache__
-MANIFEST
-dist/
 docs/_build/
-docs/locale/
-node_modules/
-tests/coverage_html/
-tests/.coverage
-build/
-tests/report/
--- a/.tx/config
+++ b/.tx/config
@ -1,6 +1,5 @@
 [main]
-host = https://www.transifex.com
-lang_map = sr@latin:sr_Latn, zh_CN:zh_Hans, zh_TW:zh_Hant
+host = https://www.transifex.net

 [django.core]
 file_filter = django/conf/locale/<lang>/LC_MESSAGES/django.po
@ -27,6 +26,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 +41,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 +56,14 @@ 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-localflavor]
+file_filter = django/contrib/localflavor/locale/<lang>/LC_MESSAGES/django.po
+source_file = django/contrib/localflavor/locale/en/LC_MESSAGES/django.po
+source_lang = en
+
+[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]
--- a/1221
+++ b/1221
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@ -1,32 +0,0 @@
-======================
-Contributing to Django
-======================
-
-As an open source project, Django welcomes contributions of many forms.
-
-Examples of contributions include:
-
-* Code patches
-* Documentation improvements
-* Bug reports and patch reviews
-
-Extensive contribution guidelines are available in the repository at
-``docs/internals/contributing/``, or online at:
-
-https://docs.djangoproject.com/en/dev/internals/contributing/
-
-**Warning: non-trivial pull requests (anything more than fixing a typo) without
-Trac tickets will be closed!** `Please file a ticket`__ to suggest changes.
-
-__ https://code.djangoproject.com/newticket
-
-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/>`_.
--- a/Gruntfile.js
+++ b/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']);
-};
--- a/7
+++ b/7
@ -1,17 +1,16 @@
 Thanks for downloading Django.

-To install it, make sure you have Python 2.7 or greater installed. Then run
+To install it, make sure you have Python 2.4 or greater installed. Then run
 this command from the command prompt:

    python setup.py install

-If you're upgrading from a previous version, you need to remove it first.
-
 AS AN ALTERNATIVE, you can just copy the entire "django" directory to Python's
 site-packages directory, which is located wherever your Python installation
 lives. Some places you might check are:

-    /usr/lib/python2.7/site-packages (Unix, Python 2.7)
+    /usr/lib/python2.5/site-packages (Unix, Python 2.5)
+    /usr/lib/python2.4/site-packages (Unix, Python 2.4)
    C:\\PYTHON\site-packages         (Windows)

 For more detailed instructions, see docs/intro/install.txt.
--- a/6
+++ b/6
@ -4,10 +4,10 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

-    1. Redistributions of source code must retain the above copyright notice,
+    1. Redistributions of source code must retain the above copyright notice, 
       this list of conditions and the following disclaimer.
-
-    2. Redistributions in binary form must reproduce the above copyright
+    
+    2. Redistributions in binary form must reproduce the above copyright 
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.

--- a/LICENSE.python
+++ b/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.
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -1,17 +1,34 @@
+include README
 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/utils/simplejson/LICENSE.txt
+recursive-include docs *
+recursive-include scripts *
+recursive-include extras *
+recursive-include tests *
+recursive-include django/conf/locale *
+recursive-include django/contrib/*/locale *
+recursive-include django/contrib/admin/templates *
+recursive-include django/contrib/admin/media *
+recursive-include django/contrib/admindocs/templates *
+recursive-include django/contrib/auth/fixtures *
+recursive-include django/contrib/auth/tests/templates *
+recursive-include django/contrib/comments/templates *
+recursive-include django/contrib/databrowse/templates *
+recursive-include django/contrib/formtools/templates *
+recursive-include django/contrib/formtools/tests/templates *
+recursive-include django/contrib/flatpages/fixtures *
+recursive-include django/contrib/flatpages/tests/templates *
+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 *
--- a/46
+++ b/46
@ -0,0 +1,46 @@
+Django is a high-level Python Web framework that encourages rapid development
+and clean, pragmatic design.
+
+All documentation is in the "docs" directory and online at
+http://docs.djangoproject.com/en/dev/. 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.
+
+    * 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.
+
+    * 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.
+
+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 ticket
+here:
+
+http://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 http://django-irc-logs.com/.
+
+    * Join the django-users mailing list, or read the archives, at
+      http://groups.google.com/group/django-users.
+
+To contribute to Django:
+
+    * Check out http://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.txt, published online at
+      https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/unit-tests/#running-the-unit-tests
+
--- a/README.rst
+++ b/README.rst
@ -1,43 +0,0 @@
-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
-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.
-
-* 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.
-
-* 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.
-
-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
-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-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.
-
-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
-  https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/unit-tests/#running-the-unit-tests
--- a/django/init.py
+++ b/django/init.py
@ -1,27 +1,16 @@
-from __future__ import unicode_literals
+VERSION = (1, 3, 8, 'alpha', 0)

-from django.utils.version import get_version
-
-VERSION = (1, 11, 30, 'alpha', 0)
-
-__version__ = get_version(VERSION)
-
-
-def setup(set_prefix=True):
-    """
-    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)
+def get_version():
+    version = '%s.%s' % (VERSION[0], VERSION[1])
+    if VERSION[2]:
+        version = '%s.%s' % (version, VERSION[2])
+    if VERSION[3:] == ('alpha', 0):
+        version = '%s pre-alpha' % version
+    else:
+        if VERSION[3] != 'final':
+            version = '%s %s %s' % (version, VERSION[3], VERSION[4])
+    from django.utils.version import get_svn_revision
+    svn_rev = get_svn_revision()
+    if svn_rev != u'SVN-unknown':
+        version = "%s %s" % (version, svn_rev)
+    return version
--- a/django/main.py
+++ b/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()
--- a/django/apps/init.py
+++ b/django/apps/init.py
@ -1,4 +0,0 @@
-from .config import AppConfig
-from .registry import apps
-
-__all__ = ['AppConfig', 'apps']
--- a/django/apps/config.py
+++ b/django/apps/config.py
@ -1,207 +0,0 @@
-import os
-from importlib import import_module
-
-from django.core.exceptions import ImproperlyConfigured
-from django.utils._os import upath
-from django.utils.module_loading import module_has_submodule
-
-MODELS_MODULE_NAME = 'models'
-
-
-class AppConfig(object):
-    """
-    Class representing a Django application and its configuration.
-    """
-
-    def __init__(self, app_name, app_module):
-        # Full Python path to the application eg. 'django.contrib.admin'.
-        self.name = app_name
-
-        # Root module for the application eg. <module 'django.contrib.admin'
-        # 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.
-
-        # Last component of the Python path to the application eg. 'admin'.
-        # This value must be unique across a Django project.
-        if not hasattr(self, 'label'):
-            self.label = app_name.rpartition(".")[2]
-
-        # Human-readable name for the application eg. "Admin".
-        if not hasattr(self, 'verbose_name'):
-            self.verbose_name = self.label.title()
-
-        # Filesystem path to the application directory eg.
-        # u'/usr/lib/python2.7/dist-packages/django/contrib/admin'. Unicode on
-        # Python 2 and a str on Python 3.
-        if not hasattr(self, 'path'):
-            self.path = self._path_from_module(app_module)
-
-        # Module containing models eg. <module 'django.contrib.admin.models'
-        # from 'django/contrib/admin/models.pyc'>. Set by import_models().
-        # None if the application doesn't have a models module.
-        self.models_module = None
-
-        # Mapping of lower case model names to model classes. Initially set to
-        # None to prevent accidental access before import_models() runs.
-        self.models = None
-
-    def __repr__(self):
-        return '<%s: %s>' % (self.__class__.__name__, self.label)
-
-    def _path_from_module(self, module):
-        """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
-        # 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); "
-                "you must configure this app with an AppConfig subclass "
-                "with a 'path' class attribute." % (module, paths))
-        elif not paths:
-            raise ImproperlyConfigured(
-                "The app module %r has no filesystem location, "
-                "you must configure this app with an AppConfig subclass "
-                "with a 'path' class attribute." % (module,))
-        return upath(paths[0])
-
-    @classmethod
-    def create(cls, entry):
-        """
-        Factory that creates an app config from an entry in INSTALLED_APPS.
-        """
-        try:
-            # If import_module succeeds, entry is a path to an app module,
-            # which may specify an app config class with default_app_config.
-            # Otherwise, entry is a path to an app config class or an error.
-            module = import_module(entry)
-
-        except ImportError:
-            # Track that importing as an app module failed. If importing as an
-            # app config class fails too, we'll trigger the ImportError again.
-            module = None
-
-            mod_path, _, cls_name = entry.rpartition('.')
-
-            # Raise the original exception when entry cannot be a path to an
-            # app config class.
-            if not mod_path:
-                raise
-
-        else:
-            try:
-                # If this works, the app module specifies an app config class.
-                entry = module.default_app_config
-            except AttributeError:
-                # Otherwise, it simply uses the default app config class.
-                return cls(entry, module)
-            else:
-                mod_path, _, cls_name = entry.rpartition('.')
-
-        # If we're reaching this point, we must attempt to load the app config
-        # class located at <mod_path>.<cls_name>
-        mod = import_module(mod_path)
-        try:
-            cls = getattr(mod, cls_name)
-        except AttributeError:
-            if module is None:
-                # If importing as an app module failed, that error probably
-                # contains the most informative traceback. Trigger it again.
-                import_module(entry)
-            else:
-                raise
-
-        # Check for obvious errors. (This check prevents duck typing, but
-        # it could be removed if it became a problem in practice.)
-        if not issubclass(cls, AppConfig):
-            raise ImproperlyConfigured(
-                "'%s' isn't a subclass of AppConfig." % entry)
-
-        # Obtain app name here rather than in AppClass.__init__ to keep
-        # all error checking for entries in INSTALLED_APPS in one place.
-        try:
-            app_name = cls.name
-        except AttributeError:
-            raise ImproperlyConfigured(
-                "'%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,
-                )
-            )
-
-        # Entry is a path to an app config class.
-        return cls(app_name, app_module)
-
-    def get_model(self, model_name, require_ready=True):
-        """
-        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()
-        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):
-        """
-        Returns an iterable of models.
-
-        By default, the following models aren't included:
-
-        - auto-created models for many-to-many relations without
-          an explicit intermediate table,
-        - 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()
-        for model in self.models.values():
-            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):
-        # 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]
-
-        if module_has_submodule(self.module, MODELS_MODULE_NAME):
-            models_module_name = '%s.%s' % (self.name, MODELS_MODULE_NAME)
-            self.models_module = import_module(models_module_name)
-
-    def ready(self):
-        """
-        Override this method in subclasses to run code when Django starts.
-        """
--- a/django/apps/registry.py
+++ b/django/apps/registry.py
@ -1,425 +0,0 @@
-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 .config import AppConfig
-
-
-class Apps(object):
-    """
-    A registry that stores the configuration of installed applications.
-
-    It also keeps track of models eg. to provide reverse-relations.
-    """
-
-    def __init__(self, installed_apps=()):
-        # installed_apps is set to None when creating the master registry
-        # because it cannot be populated at that point. Other registries must
-        # provide a list of installed apps and are populated immediately.
-        if installed_apps is None and hasattr(sys.modules[__name__], 'apps'):
-            raise RuntimeError("You must supply an installed_apps argument.")
-
-        # Mapping of app labels => model names => model classes. Every time a
-        # model is imported, ModelBase.__new__ calls apps.register_model which
-        # creates an entry in all_models. All imported models are registered,
-        # regardless of whether they're defined in an installed application
-        # and whether the registry has been populated. Since it isn't possible
-        # to reimport a module safely (it could reexecute initialization code)
-        # all_models is never overridden or reset.
-        self.all_models = defaultdict(OrderedDict)
-
-        # Mapping of labels to AppConfig instances for installed apps.
-        self.app_configs = OrderedDict()
-
-        # Stack of app_configs. Used to store the current state in
-        # set_available_apps and set_installed_apps.
-        self.stored_app_configs = []
-
-        # Whether the registry is populated.
-        self.apps_ready = self.models_ready = self.ready = False
-
-        # 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)
-
-        # Populate apps and models, unless it's the master registry.
-        if installed_apps is not None:
-            self.populate(installed_apps)
-
-    def populate(self, installed_apps=None):
-        """
-        Loads application configurations and models.
-
-        This method imports each application module and then each model module.
-
-        It is thread safe and idempotent, but not reentrant.
-        """
-        if self.ready:
-            return
-
-        # populate() might be called by two threads in parallel on servers
-        # that create threads before initializing the WSGI callable.
-        with self._lock:
-            if self.ready:
-                return
-
-            # app_config should be pristine, otherwise the code below won't
-            # guarantee that the order matches the order in INSTALLED_APPS.
-            if self.app_configs:
-                raise RuntimeError("populate() isn't reentrant")
-
-            # Phase 1: initialize app configs and import app modules.
-            for entry in installed_apps:
-                if isinstance(entry, AppConfig):
-                    app_config = entry
-                else:
-                    app_config = AppConfig.create(entry)
-                if app_config.label in self.app_configs:
-                    raise ImproperlyConfigured(
-                        "Application labels aren't unique, "
-                        "duplicates: %s" % app_config.label)
-
-                self.app_configs[app_config.label] = app_config
-                app_config.apps = self
-
-            # Check for duplicate app names.
-            counts = Counter(
-                app_config.name for app_config in self.app_configs.values())
-            duplicates = [
-                name for name, count in counts.most_common() if count > 1]
-            if duplicates:
-                raise ImproperlyConfigured(
-                    "Application names aren't unique, "
-                    "duplicates: %s" % ", ".join(duplicates))
-
-            self.apps_ready = True
-
-            # Phase 2: import models modules.
-            for app_config in self.app_configs.values():
-                app_config.import_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()
-
-            self.ready = True
-
-    def check_apps_ready(self):
-        """
-        Raises an exception if all apps haven't been imported yet.
-        """
-        if not self.apps_ready:
-            raise AppRegistryNotReady("Apps aren't loaded yet.")
-
-    def check_models_ready(self):
-        """
-        Raises an exception if all models haven't been imported yet.
-        """
-        if not self.models_ready:
-            raise AppRegistryNotReady("Models aren't loaded yet.")
-
-    def get_app_configs(self):
-        """
-        Imports applications and returns an iterable of app configs.
-        """
-        self.check_apps_ready()
-        return self.app_configs.values()
-
-    def get_app_config(self, app_label):
-        """
-        Imports applications and returns an app config for the given label.
-
-        Raises LookupError if no application exists with this label.
-        """
-        self.check_apps_ready()
-        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)
-
-    # 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):
-        """
-        Returns a list of all installed models.
-
-        By default, the following models aren't included:
-
-        - auto-created models for many-to-many relations without
-          an explicit intermediate table,
-        - models that have been swapped out.
-
-        Set the corresponding keyword argument to True to include such models.
-        """
-        self.check_models_ready()
-
-        result = []
-        for app_config in self.app_configs.values():
-            result.extend(list(app_config.get_models(include_auto_created, include_swapped)))
-        return result
-
-    def get_model(self, app_label, model_name=None, require_ready=True):
-        """
-        Returns the model matching the given app_label and model_name.
-
-        As a shortcut, this function also accepts a single argument in the
-        form <app_label>.<model_name>.
-
-        model_name is case-insensitive.
-
-        Raises LookupError if no application exists with this label, or no
-        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()
-
-        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)
-
-    def register_model(self, app_label, model):
-        # Since this method is called when models are imported, it cannot
-        # perform imports because of the risk of import loops. It mustn't
-        # call get_app_config().
-        model_name = model._meta.model_name
-        app_models = self.all_models[app_label]
-        if model_name in app_models:
-            if (model.__name__ == app_models[model_name].__name__ and
-                    model.__module__ == app_models[model_name].__module__):
-                warnings.warn(
-                    "Model '%s.%s' was already registered. "
-                    "Reloading models is not advised as it can lead to inconsistencies, "
-                    "most notably with related models." % (app_label, model_name),
-                    RuntimeWarning, stacklevel=2)
-            else:
-                raise RuntimeError(
-                    "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):
-        """
-        Checks whether an application with this name exists in the registry.
-
-        app_name is the full name of the app eg. 'django.contrib.admin'.
-        """
-        self.check_apps_ready()
-        return any(ac.name == app_name for ac in self.app_configs.values())
-
-    def get_containing_app_config(self, object_name):
-        """
-        Look for an app config containing a given object.
-
-        object_name is the dotted Python path to the 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()
-        candidates = []
-        for app_config in self.app_configs.values():
-            if object_name.startswith(app_config.name):
-                subpath = object_name[len(app_config.name):]
-                if subpath == '' or subpath[0] == '.':
-                    candidates.append(app_config)
-        if candidates:
-            return sorted(candidates, key=lambda ac: -len(ac.name))[0]
-
-    def get_registered_model(self, app_label, model_name):
-        """
-        Similar to get_model(), but doesn't require that an app exists with
-        the given app_label.
-
-        It's safe to call this method at import time, even while the registry
-        is being populated.
-        """
-        model = self.all_models[app_label].get(model_name.lower())
-        if model is None:
-            raise LookupError(
-                "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].
-
-        available must be an iterable of application names.
-
-        set_available_apps() must be balanced with unset_available_apps().
-
-        Primarily used for performance optimization in TransactionTestCase.
-
-        This method is safe is the sense that it doesn't trigger any imports.
-        """
-        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)
-            )
-
-        self.stored_app_configs.append(self.app_configs)
-        self.app_configs = OrderedDict(
-            (label, app_config)
-            for label, app_config in self.app_configs.items()
-            if app_config.name in available)
-        self.clear_cache()
-
-    def unset_available_apps(self):
-        """
-        Cancels a previous call to set_available_apps().
-        """
-        self.app_configs = self.stored_app_configs.pop()
-        self.clear_cache()
-
-    def set_installed_apps(self, installed):
-        """
-        Enables a different set of installed apps for get_app_config[s].
-
-        installed must be an iterable in the same format as INSTALLED_APPS.
-
-        set_installed_apps() must be balanced with unset_installed_apps(),
-        even if it exits with an exception.
-
-        Primarily used as a receiver of the setting_changed signal in tests.
-
-        This method may trigger new imports, which may add new models to the
-        registry of all imported models. They will stay in the registry even
-        after unset_installed_apps(). Since it isn't possible to replay
-        imports safely (eg. that could lead to registering listeners twice),
-        models are registered when they're imported and never removed.
-        """
-        if not self.ready:
-            raise AppRegistryNotReady("App registry isn't ready yet.")
-        self.stored_app_configs.append(self.app_configs)
-        self.app_configs = OrderedDict()
-        self.apps_ready = self.models_ready = self.ready = False
-        self.clear_cache()
-        self.populate(installed)
-
-    def unset_installed_apps(self):
-        """
-        Cancels a previous call to set_installed_apps().
-        """
-        self.app_configs = self.stored_app_configs.pop()
-        self.apps_ready = self.models_ready = self.ready = True
-        self.clear_cache()
-
-    def clear_cache(self):
-        """
-        Clears all internal caches, for methods that alter the app registry.
-
-        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):
-        """
-        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).
-        """
-        # 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:]
-
-            # 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
-
-            # 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):
-        """
-        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()`.
-        """
-        key = model._meta.app_label, model._meta.model_name
-        for function in self._pending_operations.pop(key, []):
-            function(model)
-
-
-apps = Apps(installed_apps=None)
--- a/django/conf/locale/az/init.py
+++ b/django/conf/locale/az/init.py
--- a/django/bin/daily_cleanup.py
+++ b/django/bin/daily_cleanup.py
@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+"""
+Daily cleanup job.
+
+Can be run as a cronjob to clean out old data from the database (only expired
+sessions at the moment).
+"""
+
+from django.core import management
+
+if __name__ == "__main__":
+    management.call_command('cleanup')
--- a/django/conf/locale/de_CH/init.py
+++ b/django/conf/locale/de_CH/init.py
--- a/django/bin/profiling/gather_profile_stats.py
+++ b/django/bin/profiling/gather_profile_stats.py
@ -0,0 +1,36 @@
+#!/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 pstats
+import sys, os
+
+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])
--- a/django/bin/unique-messages.py
+++ b/django/bin/unique-messages.py
@ -0,0 +1,28 @@
+#!/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 svn 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()
+                open('%s.po' % pf, 'w').write(msg)
+
+if __name__ == "__main__":
+    unique_messages()
--- a/django/conf/init.py
+++ b/django/conf/init.py
@ -6,13 +6,14 @@ variable, and then from django.conf.global_settings; see the global settings fil
 a list of all possible variables.
 """

-import importlib
 import os
-import time
+import re
+import time     # Needed for Windows
+import warnings

 from django.conf import global_settings
-from django.core.exceptions import ImproperlyConfigured
-from django.utils.functional import LazyObject, empty
+from django.utils.functional import LazyObject
+from django.utils import importlib

 ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"

@ -23,110 +24,100 @@ class LazySettings(LazyObject):
    The user can manually configure settings prior to using them. Otherwise,
    Django uses the settings module pointed to by DJANGO_SETTINGS_MODULE.
    """
-    def _setup(self, name=None):
+    def _setup(self):
        """
        Load the settings module pointed to by the environment variable. This
        is used the first time we need any settings at all, if the user has not
        previously configured the settings manually.
        """
-        settings_module = os.environ.get(ENVIRONMENT_VARIABLE)
-        if not settings_module:
-            desc = ("setting %s" % name) if name else "settings"
-            raise ImproperlyConfigured(
-                "Requested %s, but settings are not configured. "
-                "You must either define the environment variable %s "
-                "or call settings.configure() before accessing settings."
-                % (desc, ENVIRONMENT_VARIABLE))
+        try:
+            settings_module = os.environ[ENVIRONMENT_VARIABLE]
+            if not settings_module: # If it's set but is an empty string.
+                raise KeyError
+        except KeyError:
+            # NOTE: This is arguably an EnvironmentError, but that causes
+            # problems with Python's interactive help.
+            raise ImportError("Settings cannot be imported, because environment variable %s is undefined." % ENVIRONMENT_VARIABLE)

        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)
-
    def configure(self, default_settings=global_settings, **options):
        """
        Called to manually configure the settings. The 'default_settings'
        parameter sets where to retrieve any unspecified values from (its
        argument must support attribute access (__getattr__)).
        """
-        if self._wrapped is not empty:
+        if self._wrapped != None:
            raise RuntimeError('Settings already configured.')
        holder = UserSettingsHolder(default_settings)
        for name, value in options.items():
            setattr(holder, name, value)
        self._wrapped = holder

-    @property
    def configured(self):
        """
        Returns True if the settings have already been configured.
        """
-        return self._wrapped is not empty
+        return bool(self._wrapped)
+    configured = property(configured)


-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('/'):
+            warnings.warn('If set, %s must end with a slash' % name,
+                          PendingDeprecationWarning)
+        elif name == "ALLOWED_INCLUDE_ROOTS" and isinstance(value, basestring):
+            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):
-            if setting.isupper():
+            if setting == setting.upper():
                setattr(self, setting, getattr(global_settings, setting))

        # 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, e:
+            raise ImportError("Could not import settings '%s' (Is it on sys.path?): %s" % (self.SETTINGS_MODULE, e))
+
+        # Settings that should be converted into tuples if they're mistakenly entered
+        # as strings.
+        tuple_settings = ("INSTALLED_APPS", "TEMPLATE_DIRS")

-        tuple_settings = (
-            "INSTALLED_APPS",
-            "TEMPLATE_DIRS",
-            "LOCALE_PATHS",
-        )
-        self._explicit_settings = set()
        for setting in dir(mod):
-            if setting.isupper():
+            if setting == setting.upper():
                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)
+                if setting in tuple_settings and type(setting_value) == str:
+                    setting_value = (setting_value,) # In case the user forgot the comma.
                setattr(self, setting, setting_value)
-                self._explicit_settings.add(setting)

-        if not self.SECRET_KEY:
-            raise ImproperlyConfigured("The SECRET_KEY setting must not be empty.")
+        # Expand entries in INSTALLED_APPS like "django.contrib.*" to a list
+        # of all those apps.
+        new_installed_apps = []
+        for app in self.INSTALLED_APPS:
+            if app.endswith('.*'):
+                app_mod = importlib.import_module(app[:-2])
+                appdir = os.path.dirname(app_mod.__file__)
+                app_subdirs = os.listdir(appdir)
+                app_subdirs.sort()
+                name_pattern = re.compile(r'[a-zA-Z]\w*')
+                for d in app_subdirs:
+                    if name_pattern.match(d) and os.path.isdir(os.path.join(appdir, d)):
+                        new_installed_apps.append('%s.%s' % (app[:-2], d))
+            else:
+                new_installed_apps.append(app)
+        self.INSTALLED_APPS = new_installed_apps

        if hasattr(time, 'tzset') and self.TIME_ZONE:
            # When we can, attempt to validate the timezone. If we can't find
@ -140,17 +131,18 @@ class Settings(object):
            os.environ['TZ'] = self.TIME_ZONE
            time.tzset()

-    def is_overridden(self, setting):
-        return setting in self._explicit_settings
+        # Settings are configured, so we can set up the logger if required
+        if self.LOGGING_CONFIG:
+            # First find the logging configuration function ...
+            logging_config_path, logging_config_func_name = self.LOGGING_CONFIG.rsplit('.', 1)
+            logging_config_module = importlib.import_module(logging_config_path)
+            logging_config_func = getattr(logging_config_module, logging_config_func_name)

-    def __repr__(self):
-        return '<%(cls)s "%(settings_module)s">' % {
-            'cls': self.__class__.__name__,
-            'settings_module': self.SETTINGS_MODULE,
-        }
+            # ... then invoke it with the logging settings
+            logging_config_func(self.LOGGING)


-class UserSettingsHolder(object):
+class UserSettingsHolder(BaseSettings):
    """
    Holder for user configured settings.
    """
@ -163,39 +155,16 @@ class UserSettingsHolder(object):
        Requests for configuration variables not in this class are satisfied
        from the module specified in default_settings (if possible).
        """
-        self.__dict__['_deleted'] = set()
        self.default_settings = default_settings

    def __getattr__(self, name):
-        if name in self._deleted:
-            raise AttributeError
        return getattr(self.default_settings, name)

-    def __setattr__(self, name, value):
-        self._deleted.discard(name)
-        super(UserSettingsHolder, self).__setattr__(name, value)
-
-    def __delattr__(self, name):
-        self._deleted.add(name)
-        if hasattr(self, name):
-            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
-        )
-
-    def is_overridden(self, setting):
-        deleted = (setting in self._deleted)
-        set_locally = (setting in self.__dict__)
-        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__,
-        }
+        return self.__dict__.keys() + dir(self.default_settings)

+    # For Python < 2.6:
+    __members__ = property(lambda self: self.__dir__())

 settings = LazySettings()
+
--- a/django/conf/app_template/init.py
+++ b/django/conf/app_template/init.py
--- a/django/conf/app_template/admin.py-tpl
+++ b/django/conf/app_template/admin.py-tpl
@ -1,3 +0,0 @@
-{{ unicode_literals }}from django.contrib import admin
-
-# Register your models here.
--- a/django/conf/app_template/apps.py-tpl
+++ b/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 }}'
--- a/django/conf/app_template/models.py
+++ b/django/conf/app_template/models.py
@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
--- a/django/conf/app_template/models.py-tpl
+++ b/django/conf/app_template/models.py-tpl
@ -1,3 +0,0 @@
-{{ unicode_literals }}from django.db import models
-
-# Create your models here.
--- a/django/conf/app_template/tests.py
+++ b/django/conf/app_template/tests.py
@ -0,0 +1,16 @@
+"""
+This file demonstrates writing tests using the unittest module. These will pass
+when you run "manage.py test".
+
+Replace this with more appropriate tests for your application.
+"""
+
+from django.test import TestCase
+
+
+class SimpleTest(TestCase):
+    def test_basic_addition(self):
+        """
+        Tests that 1 + 1 always equals 2.
+        """
+        self.assertEqual(1 + 1, 2)
--- a/django/conf/app_template/tests.py-tpl
+++ b/django/conf/app_template/tests.py-tpl
@ -1,3 +0,0 @@
-{{ unicode_literals }}from django.test import TestCase
-
-# Create your tests here.
--- a/django/conf/app_template/views.py
+++ b/django/conf/app_template/views.py
--- a/django/conf/app_template/views.py-tpl
+++ b/django/conf/app_template/views.py-tpl
@ -1,3 +0,0 @@
-{{ unicode_literals }}from django.shortcuts import render
-
-# Create your views here.
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@ -1,125 +1,96 @@
-# -*- 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
+# them. This is useful under some testing siutations 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 = []
+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
-# systems may support all possibilities). When USE_TZ is True, this is
-# interpreted as the default user time zone.
+# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name (although not all
+# systems may support all possibilities).
 TIME_ZONE = 'America/Chicago'

-# If you set this to True, Django will use timezone-aware datetimes.
-USE_TZ = False
-
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en-us'

-# Languages we provide translations for, out of the box.
-LANGUAGES = [
-    ('af', gettext_noop('Afrikaans')),
+# Languages we provide translations for, out of the box. The language name
+# should be the utf-8 encoded local name for the language.
+LANGUAGES = (
    ('ar', gettext_noop('Arabic')),
-    ('ast', gettext_noop('Asturian')),
    ('az', gettext_noop('Azerbaijani')),
    ('bg', gettext_noop('Bulgarian')),
-    ('be', gettext_noop('Belarusian')),
    ('bn', gettext_noop('Bengali')),
-    ('br', gettext_noop('Breton')),
    ('bs', gettext_noop('Bosnian')),
    ('ca', gettext_noop('Catalan')),
    ('cs', gettext_noop('Czech')),
    ('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')),
    ('en-gb', gettext_noop('British English')),
-    ('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')),
    ('et', gettext_noop('Estonian')),
    ('eu', gettext_noop('Basque')),
    ('fa', gettext_noop('Persian')),
    ('fi', gettext_noop('Finnish')),
    ('fr', gettext_noop('French')),
-    ('fy', gettext_noop('Frisian')),
+    ('fy-nl', 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')),
-    ('io', gettext_noop('Ido')),
    ('is', gettext_noop('Icelandic')),
    ('it', gettext_noop('Italian')),
    ('ja', gettext_noop('Japanese')),
    ('ka', gettext_noop('Georgian')),
-    ('kk', gettext_noop('Kazakh')),
    ('km', gettext_noop('Khmer')),
    ('kn', gettext_noop('Kannada')),
    ('ko', gettext_noop('Korean')),
-    ('lb', gettext_noop('Luxembourgish')),
    ('lt', gettext_noop('Lithuanian')),
    ('lv', gettext_noop('Latvian')),
    ('mk', gettext_noop('Macedonian')),
    ('ml', gettext_noop('Malayalam')),
    ('mn', gettext_noop('Mongolian')),
-    ('mr', gettext_noop('Marathi')),
-    ('my', gettext_noop('Burmese')),
-    ('nb', gettext_noop('Norwegian Bokmål')),
-    ('ne', gettext_noop('Nepali')),
    ('nl', gettext_noop('Dutch')),
+    ('no', gettext_noop('Norwegian')),
+    ('nb', gettext_noop('Norwegian Bokmal')),
    ('nn', gettext_noop('Norwegian Nynorsk')),
-    ('os', gettext_noop('Ossetic')),
    ('pa', gettext_noop('Punjabi')),
    ('pl', gettext_noop('Polish')),
    ('pt', gettext_noop('Portuguese')),
@ -132,41 +103,32 @@ LANGUAGES = [
    ('sr', gettext_noop('Serbian')),
    ('sr-latn', gettext_noop('Serbian Latin')),
    ('sv', gettext_noop('Swedish')),
-    ('sw', gettext_noop('Swahili')),
    ('ta', gettext_noop('Tamil')),
    ('te', gettext_noop('Telugu')),
    ('th', gettext_noop('Thai')),
    ('tr', gettext_noop('Turkish')),
-    ('tt', gettext_noop('Tatar')),
-    ('udm', gettext_noop('Udmurt')),
    ('uk', gettext_noop('Ukrainian')),
    ('ur', gettext_noop('Urdu')),
    ('vi', gettext_noop('Vietnamese')),
-    ('zh-hans', gettext_noop('Simplified Chinese')),
-    ('zh-hant', gettext_noop('Traditional Chinese')),
-]
+    ('zh-cn', gettext_noop('Simplified 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")

 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
-LOCALE_PATHS = []
-
-# Settings for language cookie
+LOCALE_PATHS = ()
 LANGUAGE_COOKIE_NAME = 'django_language'
-LANGUAGE_COOKIE_AGE = None
-LANGUAGE_COOKIE_DOMAIN = None
-LANGUAGE_COOKIE_PATH = '/'
-

 # If you set this to True, Django will format dates, numbers and calendars
-# according to user current locale.
+# according to user current locale
 USE_L10N = False

 # Not-necessarily-technical managers of the site. They get broken link
-# notifications and other various emails.
+# notifications and other various e-mails.
 MANAGERS = ADMINS

 # Default content type and charset to use for all HttpResponse objects, if a
@ -178,13 +140,27 @@ DEFAULT_CHARSET = 'utf-8'
 # Encoding of files read from disk (template and initial SQL files).
 FILE_CHARSET = 'utf-8'

-# Email address that error messages come from.
+# E-mail address that error messages come from.
 SERVER_EMAIL = 'root@localhost'

-# Database connection info. If left empty, will default to the dummy backend.
-DATABASES = {}
+# Whether to send broken-link e-mails.
+SEND_BROKEN_LINK_EMAILS = False

-# Classes used to implement DB routing behavior.
+# Database connection info.
+# Legacy format
+DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+DATABASE_NAME = ''             # Or path to database file if using sqlite3.
+DATABASE_USER = ''             # Not used with sqlite3.
+DATABASE_PASSWORD = ''         # Not used with sqlite3.
+DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
+DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
+DATABASE_OPTIONS = {}          # Set to empty dictionary for default.
+
+# New format
+DATABASES = {
+}
+
+# Classes used to implement db routing behaviour
 DATABASE_ROUTERS = []

 # The email backend to use. For possible shortcuts see django.core.mail.
@ -193,33 +169,49 @@ DATABASE_ROUTERS = []
 # to a module that defines an EmailBackend class.
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'

-# Host for sending email.
+# Host for sending e-mail.
 EMAIL_HOST = 'localhost'

-# Port for sending email.
+# Port for sending e-mail.
 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',
+)

-# Default email address to use for various automated correspondence from
+# 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.request',
+    'django.contrib.messages.context_processors.messages',
+)
+
+# Output to use in template system for invalid (e.g. misspelled) variables.
+TEMPLATE_STRING_IF_INVALID = ''
+
+# Default e-mail address to use for various automated correspondence from
 # the site managers.
 DEFAULT_FROM_EMAIL = 'webmaster@localhost'

@ -240,27 +232,28 @@ 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 = {}

-# 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 = [
-#        re.compile(r'^/apple-touch-icon.*\.png$'),
-#        re.compile(r'^/favicon.ico$'),
-#        re.compile(r'^/robots.txt$'),
-#        re.compile(r'^/phpmyadmin/'),
-#        re.compile(r'\.(cgi|php|pl)$'),
-#    ]
-IGNORABLE_404_URLS = []
+# Tuple of strings representing allowed prefixes for the {% ssi %} tag.
+# Example: ('/home/html', '/var/www')
+ALLOWED_INCLUDE_ROOTS = ()
+
+# If this is a 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 = ()
+
+# 404s that may be ignored.
+IGNORABLE_404_STARTS = ('/cgi-bin/', '/_vti_bin', '/_vti_inf')
+IGNORABLE_404_ENDS = ('mail.pl', 'mailform.pl', 'mail.cgi', 'mailform.cgi', 'favicon.ico', '.php')

 # A secret key for this particular Django installation. Used in secret-key
 # hashing algorithms. Set this in your settings, or Django will complain
@ -271,42 +264,30 @@ SECRET_KEY = ''
 DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'

 # Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/var/www/example.com/media/"
+# Example: "/home/media/media.lawrence.com/media/"
 MEDIA_ROOT = ''

 # URL that handles the media served from MEDIA_ROOT.
-# Examples: "http://example.com/media/", "http://media.example.com/"
+# Example: "http://media.lawrence.com/media/"
 MEDIA_URL = ''

-# Absolute path to the directory static files should be collected to.
-# Example: "/var/www/example.com/static/"
-STATIC_ROOT = None
+# Absolute path to the directory that holds static files.
+# Example: "/home/media/media.lawrence.com/static/"
+STATIC_ROOT = ''

 # URL that handles the static files served from STATIC_ROOT.
-# Example: "http://example.com/static/", "http://static.example.com/"
+# Example: "http://media.lawrence.com/static/"
 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
+FILE_UPLOAD_MAX_MEMORY_SIZE = 2621440 # i.e. 2.5 MB

 # 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
@ -314,14 +295,9 @@ DATA_UPLOAD_MAX_NUMBER_FILES = 100
 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.
-FILE_UPLOAD_DIRECTORY_PERMISSIONS = None
-
 # Python module path where user will place custom format definition.
 # The directory where this setting is pointing should contain subdirectories
 # named as the locales, containing a formats.py file
@ -363,43 +339,39 @@ 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 = [
-    '%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'
-]
+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'
    '%Y-%m-%d',              # '2006-10-25'
    '%m/%d/%Y %H:%M:%S',     # '10/25/2006 14:30:59'
-    '%m/%d/%Y %H:%M:%S.%f',  # '10/25/2006 14:30:59.000200'
    '%m/%d/%Y %H:%M',        # '10/25/2006 14:30'
    '%m/%d/%Y',              # '10/25/2006'
    '%m/%d/%y %H:%M:%S',     # '10/25/06 14:30:59'
-    '%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...
@ -411,133 +383,118 @@ DECIMAL_SEPARATOR = '.'
 # Boolean that sets whether to add thousand separator when formatting numbers
 USE_THOUSAND_SEPARATOR = False

-# Number of digits that will be together, when splitting them by
+# Number of digits that will be together, when spliting them by
 # THOUSAND_SEPARATOR. 0 means no grouping, 3 means splitting by thousands...
 NUMBER_GROUPING = 0

 # Thousand separator symbol
 THOUSAND_SEPARATOR = ','

+# Do you want to manage transactions manually?
+# Hint: you really don't!
+TRANSACTIONS_MANAGED = False
+
+# The User-Agent string to use when checking for URL validity through the
+# isExistingURL validator.
+from django import get_version
+URL_VALIDATOR_USER_AGENT = "Django/%s (http://www.djangoproject.com)" % get_version()
+
 # The tablespaces to use for each model when not specified otherwise.
 DEFAULT_TABLESPACE = ''
 DEFAULT_INDEX_TABLESPACE = ''

-# Default X-Frame-Options header value
-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
-# '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.
-WSGI_APPLICATION = None
-
-# If your Django app is behind a proxy that sets a header to specify secure
-# connections, AND that proxy ensures that user-submitted headers with the
-# same name are ignored (so that people can't spoof it), set this value to
-# a tuple of (header_name, header_value). For any requests that come in with
-# that header/value, request.is_secure() will return True.
-# WARNING! Only set this if you fully understand what you're doing. Otherwise,
-# you may be opening yourself up to a security risk.
-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.contrib.sessions.middleware.SessionMiddleware',
    'django.middleware.csrf.CsrfViewMiddleware',
-]
-
-MIDDLEWARE = None
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+#     'django.middleware.http.ConditionalGetMiddleware',
+#     'django.middleware.gzip.GZipMiddleware',
+)

 ############
 # 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_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 ".lawrence.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 = False                         # 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.

 #########
 # CACHE #
 #########

-# The cache backends to use.
+# New format
 CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-    }
 }
+# The cache backend to use.  See the docstring in django.core.cache for the
+# possible values.
 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 the
+# 'hasNoProfanities' validator. All of these should be in lowercase.
+PROFANITIES_LIST = ()
+
+# The group ID that designates which users are banned.
+# Set to None if you're not using it.
+COMMENTS_BANNED_USERS_GROUP = None
+
+# The group ID that designates which users can moderate comments.
+# Set to None if you're not using it.
+COMMENTS_MODERATORS_GROUP = None
+
+# The group ID that designates the users whose comments should be e-mailed to MANAGERS.
+# Set to None if you're not using it.
+COMMENTS_SKETCHY_USERS_GROUP = None
+
+# The system will e-mail MANAGERS the first COMMENTS_FIRST_FEW comments by each
+# user. Set this to 0 if you want to disable it.
+COMMENTS_FIRST_FEW = 0
+
+# A tuple of IP addresses that have been banned from participating in various
+# Django-powered features.
+BANNED_IPS = ()
+
 ##################
 # 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

-# the first hasher in this list is the preferred algorithm.  any
-# password using different algorithms will be converted automatically
-# upon login
-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 = []
-
-###########
-# SIGNING #
-###########
-
-SIGNING_BACKEND = 'django.core.signing.TimestampSigner'
-
 ########
 # CSRF #
 ########
@ -546,23 +503,16 @@ SIGNING_BACKEND = 'django.core.signing.TimestampSigner'
 # rejected by the CSRF middleware.
 CSRF_FAILURE_VIEW = 'django.views.csrf.csrf_failure'

-# Settings for CSRF cookie.
+# Name and domain for CSRF cookie.
 CSRF_COOKIE_NAME = 'csrftoken'
-CSRF_COOKIE_AGE = 60 * 60 * 24 * 7 * 52
 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 #
 ############

-# Class to use as messages backend
-MESSAGE_STORAGE = 'django.contrib.messages.storage.fallback.FallbackStorage'
+# Class to use as messges backend
+MESSAGE_STORAGE = 'django.contrib.messages.storage.user_messages.LegacyFallbackStorage'

 # Default values of MESSAGE_LEVEL and MESSAGE_TAGS are defined within
 # django.contrib.messages to avoid imports in this settings file.
@ -572,76 +522,73 @@ MESSAGE_STORAGE = 'django.contrib.messages.storage.fallback.FallbackStorage'
 ###########

 # The callable to use to configure logging
-LOGGING_CONFIG = 'logging.config.dictConfig'
+LOGGING_CONFIG = 'django.utils.log.dictConfig'

-# Custom logging configuration.
-LOGGING = {}
-
-# Default exception reporter filter class used in case none has been
-# specifically assigned to the HttpRequest instance.
-DEFAULT_EXCEPTION_REPORTER_FILTER = 'django.views.debug.SafeExceptionReporterFilter'
+# The default logging configuration. This sends an email to
+# the site admins on every HTTP 500 error. All other log
+# records are sent to the bit bucket.
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'handlers': {
+        'mail_admins': {
+            'level': 'ERROR',
+            'class': 'django.utils.log.AdminEmailHandler'
+        }
+    },
+    'loggers': {
+        'django.request': {
+            'handlers': ['mail_admins'],
+            'level': 'ERROR',
+            'propagate': True,
+        },
+    }
+}

 ###########
 # TESTING #
 ###########

 # The name of the class to use to run the test suite
-TEST_RUNNER = 'django.test.runner.DiscoverRunner'
+TEST_RUNNER = 'django.test.simple.DjangoTestSuiteRunner'

-# Apps that don't need to be serialized at test database creation time
-# (only apps with migrations are to start with)
-TEST_NON_SERIALIZED_APPS = []
+# The name of the database to use for testing purposes.
+# If None, a name of 'test_' + DATABASE_NAME will be assumed
+TEST_DATABASE_NAME = None
+
+# Strings used to set the character set and collation order for the test
+# database. These values are passed literally to the server, so they are
+# backend-dependent. If None, no special settings are sent (system defaults are
+# used).
+TEST_DATABASE_CHARSET = None
+TEST_DATABASE_COLLATION = None

 ############
 # FIXTURES #
 ############

 # 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',
-]
+#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+)

-##############
-# MIGRATIONS #
-##############
-
-# Migration module overrides for apps, by app label.
-MIGRATION_MODULES = {}
-
-#################
-# SYSTEM CHECKS #
-#################
-
-# List of all issues generated by system checks that should be silenced. Light
-# issues like warnings, infos or debugs will not generate a message. Silencing
-# 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
+# URL prefix for admin media -- CSS, JavaScript and images.
+# Make sure to use a trailing slash.
+# Examples: "http://foo.com/static/admin/", "/static/admin/".
+ADMIN_MEDIA_PREFIX = '/static/admin/'
--- a/django/conf/locale/init.py
+++ b/django/conf/locale/init.py
@ -1,566 +1,404 @@
-# -*- 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.
-"""
-
 LANG_INFO = {
-    'af': {
-        'bidi': False,
-        'code': 'af',
-        'name': 'Afrikaans',
-        'name_local': 'Afrikaans',
-    },
    'ar': {
        'bidi': True,
        'code': 'ar',
        'name': 'Arabic',
-        'name_local': 'العربيّة',
-    },
-    'ast': {
-        'bidi': False,
-        'code': 'ast',
-        'name': 'Asturian',
-        'name_local': 'asturianu',
+        'name_local': u'\u0627\u0644\u0639\u0631\u0628\u064a\u0651\u0629',
    },
    'az': {
        'bidi': True,
        'code': 'az',
        'name': 'Azerbaijani',
-        'name_local': 'Azərbaycanca',
-    },
-    'be': {
-        'bidi': False,
-        'code': 'be',
-        'name': 'Belarusian',
-        'name_local': 'беларуская',
+        'name_local': u'az\u0259rbaycan dili',
    },
    'bg': {
        'bidi': False,
        'code': 'bg',
        'name': 'Bulgarian',
-        'name_local': 'български',
+        'name_local': u'\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438',
    },
    'bn': {
        'bidi': False,
        'code': 'bn',
        'name': 'Bengali',
-        'name_local': 'বাংলা',
-    },
-    'br': {
-        'bidi': False,
-        'code': 'br',
-        'name': 'Breton',
-        'name_local': 'brezhoneg',
+        'name_local': u'\u09ac\u09be\u0982\u09b2\u09be',
    },
    'bs': {
        'bidi': False,
        'code': 'bs',
        'name': 'Bosnian',
-        'name_local': 'bosanski',
+        'name_local': u'bosanski',
    },
    'ca': {
        'bidi': False,
        'code': 'ca',
        'name': 'Catalan',
-        'name_local': 'català',
+        'name_local': u'catal\xe0',
    },
    'cs': {
        'bidi': False,
        'code': 'cs',
        'name': 'Czech',
-        'name_local': 'česky',
+        'name_local': u'\u010desky',
    },
    'cy': {
        'bidi': False,
        'code': 'cy',
        'name': 'Welsh',
-        'name_local': 'Cymraeg',
+        'name_local': u'Cymraeg',
    },
    'da': {
        'bidi': False,
        'code': 'da',
        'name': 'Danish',
-        'name_local': 'dansk',
+        'name_local': u'Dansk',
    },
    'de': {
        'bidi': False,
        'code': 'de',
        'name': 'German',
-        'name_local': 'Deutsch',
-    },
-    'dsb': {
-        'bidi': False,
-        'code': 'dsb',
-        'name': 'Lower Sorbian',
-        'name_local': 'dolnoserbski',
+        'name_local': u'Deutsch',
    },
    'el': {
        'bidi': False,
        'code': 'el',
        'name': 'Greek',
-        'name_local': 'Ελληνικά',
+        'name_local': u'\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac',
    },
    'en': {
        'bidi': False,
        'code': 'en',
        'name': 'English',
-        'name_local': 'English',
-    },
-    'en-au': {
-        'bidi': False,
-        'code': 'en-au',
-        'name': 'Australian English',
-        'name_local': 'Australian English',
+        'name_local': u'English',
    },
    'en-gb': {
        'bidi': False,
        'code': 'en-gb',
        'name': 'British English',
-        'name_local': 'British English',
-    },
-    'eo': {
-        'bidi': False,
-        'code': 'eo',
-        'name': 'Esperanto',
-        'name_local': 'Esperanto',
+        'name_local': u'British English',
    },
    'es': {
        'bidi': False,
        'code': 'es',
        'name': 'Spanish',
-        'name_local': 'español',
+        'name_local': u'espa\xf1ol',
    },
    'es-ar': {
        'bidi': False,
        'code': 'es-ar',
        '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',
+        'name_local': u'espa\xf1ol de Argentina',
    },
    'es-mx': {
        'bidi': False,
        'code': 'es-mx',
        'name': 'Mexican Spanish',
-        'name_local': 'español de Mexico',
+        'name_local': u'espa\xf1ol de Mexico',
    },
    'es-ni': {
        'bidi': False,
        'code': 'es-ni',
        'name': 'Nicaraguan Spanish',
-        'name_local': 'español de Nicaragua',
-    },
-    'es-ve': {
-        'bidi': False,
-        'code': 'es-ve',
-        'name': 'Venezuelan Spanish',
-        'name_local': 'español de Venezuela',
+        'name_local': u'espa\xf1ol de Nicaragua',
    },
    'et': {
        'bidi': False,
        'code': 'et',
        'name': 'Estonian',
-        'name_local': 'eesti',
+        'name_local': u'eesti',
    },
    'eu': {
        'bidi': False,
        'code': 'eu',
        'name': 'Basque',
-        'name_local': 'Basque',
+        'name_local': u'Basque',
    },
    'fa': {
        'bidi': True,
        'code': 'fa',
        'name': 'Persian',
-        'name_local': 'فارسی',
+        'name_local': u'\u0641\u0627\u0631\u0633\u06cc',
    },
    'fi': {
        'bidi': False,
        'code': 'fi',
        'name': 'Finnish',
-        'name_local': 'suomi',
+        'name_local': u'suomi',
    },
    'fr': {
        'bidi': False,
        'code': 'fr',
        'name': 'French',
-        'name_local': 'français',
+        'name_local': u'Fran\xe7ais',
    },
-    'fy': {
+    'fy-nl': {
        'bidi': False,
-        'code': 'fy',
+        'code': 'fy-nl',
        'name': 'Frisian',
-        'name_local': 'frysk',
+        'name_local': u'Frisian',
    },
    'ga': {
        'bidi': False,
        'code': 'ga',
        'name': 'Irish',
-        'name_local': 'Gaeilge',
-    },
-    'gd': {
-        'bidi': False,
-        'code': 'gd',
-        'name': 'Scottish Gaelic',
-        'name_local': 'Gàidhlig',
+        'name_local': u'Gaeilge',
    },
    'gl': {
        'bidi': False,
        'code': 'gl',
        'name': 'Galician',
-        'name_local': 'galego',
+        'name_local': u'galego',
    },
    'he': {
        'bidi': True,
        'code': 'he',
        'name': 'Hebrew',
-        'name_local': 'עברית',
+        'name_local': u'\u05e2\u05d1\u05e8\u05d9\u05ea',
    },
    'hi': {
        'bidi': False,
        'code': 'hi',
        'name': 'Hindi',
-        'name_local': 'Hindi',
+        'name_local': u'Hindi',
    },
    'hr': {
        'bidi': False,
        'code': 'hr',
        'name': 'Croatian',
-        'name_local': 'Hrvatski',
-    },
-    'hsb': {
-        'bidi': False,
-        'code': 'hsb',
-        'name': 'Upper Sorbian',
-        'name_local': 'hornjoserbsce',
+        'name_local': u'Hrvatski',
    },
    'hu': {
        'bidi': False,
        'code': 'hu',
        'name': 'Hungarian',
-        'name_local': 'Magyar',
-    },
-    'ia': {
-        'bidi': False,
-        'code': 'ia',
-        'name': 'Interlingua',
-        'name_local': 'Interlingua',
-    },
-    'io': {
-        'bidi': False,
-        'code': 'io',
-        'name': 'Ido',
-        'name_local': 'ido',
+        'name_local': u'Magyar',
    },
    'id': {
        'bidi': False,
        'code': 'id',
        'name': 'Indonesian',
-        'name_local': 'Bahasa Indonesia',
+        'name_local': u'Bahasa Indonesia',
    },
    'is': {
        'bidi': False,
        'code': 'is',
        'name': 'Icelandic',
-        'name_local': 'Íslenska',
+        'name_local': u'\xcdslenska',
    },
    'it': {
        'bidi': False,
        'code': 'it',
        'name': 'Italian',
-        'name_local': 'italiano',
+        'name_local': u'italiano',
    },
    'ja': {
        'bidi': False,
        'code': 'ja',
        'name': 'Japanese',
-        'name_local': '日本語',
+        'name_local': u'\u65e5\u672c\u8a9e',
    },
    'ka': {
        'bidi': False,
        'code': 'ka',
        'name': 'Georgian',
-        'name_local': 'ქართული',
-    },
-    'kk': {
-        'bidi': False,
-        'code': 'kk',
-        'name': 'Kazakh',
-        'name_local': 'Қазақ',
+        'name_local': u'\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8',
    },
    'km': {
        'bidi': False,
        'code': 'km',
        'name': 'Khmer',
-        'name_local': 'Khmer',
+        'name_local': u'Khmer',
    },
    'kn': {
        'bidi': False,
        'code': 'kn',
        'name': 'Kannada',
-        'name_local': 'Kannada',
+        'name_local': u'Kannada',
    },
    'ko': {
        'bidi': False,
        'code': 'ko',
        'name': 'Korean',
-        'name_local': '한국어',
-    },
-    'lb': {
-        'bidi': False,
-        'code': 'lb',
-        'name': 'Luxembourgish',
-        'name_local': 'Lëtzebuergesch',
+        'name_local': u'\ud55c\uad6d\uc5b4',
    },
    'lt': {
        'bidi': False,
        'code': 'lt',
        'name': 'Lithuanian',
-        'name_local': 'Lietuviškai',
+        'name_local': u'Lithuanian',
    },
    'lv': {
        'bidi': False,
        'code': 'lv',
        'name': 'Latvian',
-        'name_local': 'latviešu',
+        'name_local': u'latvie\u0161u',
    },
    'mk': {
        'bidi': False,
        'code': 'mk',
        'name': 'Macedonian',
-        'name_local': 'Македонски',
+        'name_local': u'\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438',
    },
    'ml': {
        'bidi': False,
        'code': 'ml',
        'name': 'Malayalam',
-        'name_local': 'Malayalam',
+        'name_local': u'Malayalam',
    },
    'mn': {
        'bidi': False,
        'code': 'mn',
        'name': 'Mongolian',
-        'name_local': 'Mongolian',
-    },
-    'mr': {
-        'bidi': False,
-        'code': 'mr',
-        'name': 'Marathi',
-        'name_local': 'मराठी',
-    },
-    'my': {
-        'bidi': False,
-        'code': 'my',
-        'name': 'Burmese',
-        'name_local': 'မြန်မာဘာသာ',
+        'name_local': u'Mongolian',
    },
    'nb': {
        'bidi': False,
        'code': 'nb',
        'name': 'Norwegian Bokmal',
-        'name_local': 'norsk (bokmål)',
-    },
-    'ne': {
-        'bidi': False,
-        'code': 'ne',
-        'name': 'Nepali',
-        'name_local': 'नेपाली',
+        'name_local': u'Norsk (bokm\xe5l)',
    },
    'nl': {
        'bidi': False,
        'code': 'nl',
        'name': 'Dutch',
-        'name_local': 'Nederlands',
+        'name_local': u'Nederlands',
    },
    'nn': {
        'bidi': False,
        'code': 'nn',
        'name': 'Norwegian Nynorsk',
-        'name_local': 'norsk (nynorsk)',
+        'name_local': u'Norsk (nynorsk)',
    },
    'no': {
        'bidi': False,
        'code': 'no',
        'name': 'Norwegian',
-        'name_local': 'norsk',
-    },
-    'os': {
-        'bidi': False,
-        'code': 'os',
-        'name': 'Ossetic',
-        'name_local': 'Ирон',
+        'name_local': u'Norsk',
    },
    'pa': {
        'bidi': False,
        'code': 'pa',
        'name': 'Punjabi',
-        'name_local': 'Punjabi',
+        'name_local': u'Punjabi',
    },
    'pl': {
        'bidi': False,
        'code': 'pl',
        'name': 'Polish',
-        'name_local': 'polski',
+        'name_local': u'polski',
    },
    'pt': {
        'bidi': False,
        'code': 'pt',
        'name': 'Portuguese',
-        'name_local': 'Português',
+        'name_local': u'Portugu\xeas',
    },
    'pt-br': {
        'bidi': False,
        'code': 'pt-br',
        'name': 'Brazilian Portuguese',
-        'name_local': 'Português Brasileiro',
+        'name_local': u'Portugu\xeas Brasileiro',
    },
    'ro': {
        'bidi': False,
        'code': 'ro',
        'name': 'Romanian',
-        'name_local': 'Română',
+        'name_local': u'Rom\xe2n\u0103',
    },
    'ru': {
        'bidi': False,
        'code': 'ru',
        'name': 'Russian',
-        'name_local': 'Русский',
+        'name_local': u'\u0420\u0443\u0441\u0441\u043a\u0438\u0439',
    },
    'sk': {
        'bidi': False,
        'code': 'sk',
        'name': 'Slovak',
-        'name_local': 'Slovensky',
+        'name_local': u'slovensk\xfd',
    },
    'sl': {
        'bidi': False,
        'code': 'sl',
        'name': 'Slovenian',
-        'name_local': 'Slovenščina',
+        'name_local': u'Sloven\u0161\u010dina',
    },
    'sq': {
        'bidi': False,
        'code': 'sq',
        'name': 'Albanian',
-        'name_local': 'shqip',
+        'name_local': u'Albanian',
    },
    'sr': {
        'bidi': False,
        'code': 'sr',
        'name': 'Serbian',
-        'name_local': 'српски',
+        'name_local': u'\u0441\u0440\u043f\u0441\u043a\u0438',
    },
    'sr-latn': {
        'bidi': False,
        'code': 'sr-latn',
        'name': 'Serbian Latin',
-        'name_local': 'srpski (latinica)',
+        'name_local': u'srpski (latinica)',
    },
    'sv': {
        'bidi': False,
        'code': 'sv',
        'name': 'Swedish',
-        'name_local': 'svenska',
-    },
-    'sw': {
-        'bidi': False,
-        'code': 'sw',
-        'name': 'Swahili',
-        'name_local': 'Kiswahili',
+        'name_local': u'Svenska',
    },
    'ta': {
        'bidi': False,
        'code': 'ta',
        'name': 'Tamil',
-        'name_local': 'தமிழ்',
+        'name_local': u'\u0ba4\u0bae\u0bbf\u0bb4\u0bcd',
    },
    'te': {
        'bidi': False,
        'code': 'te',
        'name': 'Telugu',
-        'name_local': 'తెలుగు',
+        'name_local': u'\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41',
    },
    'th': {
        'bidi': False,
        'code': 'th',
        'name': 'Thai',
-        'name_local': 'ภาษาไทย',
+        'name_local': u'Thai',
    },
    'tr': {
        'bidi': False,
        'code': 'tr',
        'name': 'Turkish',
-        'name_local': 'Türkçe',
-    },
-    'tt': {
-        'bidi': False,
-        'code': 'tt',
-        'name': 'Tatar',
-        'name_local': 'Татарча',
-    },
-    'udm': {
-        'bidi': False,
-        'code': 'udm',
-        'name': 'Udmurt',
-        'name_local': 'Удмурт',
+        'name_local': u'T\xfcrk\xe7e',
    },
    'uk': {
        'bidi': False,
        'code': 'uk',
        'name': 'Ukrainian',
-        'name_local': 'Українська',
+        'name_local': u'\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430',
    },
    'ur': {
-        'bidi': True,
+        'bidi': False,
        'code': 'ur',
        'name': 'Urdu',
-        'name_local': 'اردو',
+        'name_local': u'\u0627\u0631\u062f\u0648',
    },
    'vi': {
        'bidi': False,
        'code': 'vi',
        'name': 'Vietnamese',
-        'name_local': 'Tiếng Việt',
+        'name_local': u'Vietnamese',
    },
    'zh-cn': {
-        'fallback': ['zh-hans'],
-    },
-    'zh-hans': {
        'bidi': False,
-        'code': 'zh-hans',
+        'code': 'zh-cn',
        'name': 'Simplified Chinese',
-        'name_local': '简体中文',
-    },
-    'zh-hant': {
-        'bidi': False,
-        'code': 'zh-hant',
-        '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'],
+        'name_local': u'\u7b80\u4f53\u4e2d\u6587',
    },
    'zh-tw': {
-        'fallback': ['zh-hant'],
-    },
+        'bidi': False,
+        'code': 'zh-tw',
+        'name': 'Traditional Chinese',
+        'name_local': u'\u7e41\u9ad4\u4e2d\u6587',
+    }
 }
--- a/django/conf/locale/af/LC_MESSAGES/django.mo
+++ b/django/conf/locale/af/LC_MESSAGES/django.mo
--- a/django/conf/locale/af/LC_MESSAGES/django.po
+++ b/django/conf/locale/af/LC_MESSAGES/django.po
--- a/django/conf/locale/ar/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ar/LC_MESSAGES/django.mo
--- a/django/conf/locale/ar/LC_MESSAGES/django.po
+++ b/django/conf/locale/ar/LC_MESSAGES/django.po
--- a/django/conf/locale/ar/formats.py
+++ b/django/conf/locale/ar/formats.py
@ -1,24 +1,23 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-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'
-# DATETIME_FORMAT =
+TIME_FORMAT = 'g:i:s A'
+# DATETIME_FORMAT = 
 YEAR_MONTH_FORMAT = 'F Y'
 MONTH_DAY_FORMAT = 'j F'
 SHORT_DATE_FORMAT = 'd‏/m‏/Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+# SHORT_DATETIME_FORMAT = 
+# 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 =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS = 
+# TIME_INPUT_FORMATS = 
+# DATETIME_INPUT_FORMATS = 
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+# NUMBER_GROUPING = 
--- a/django/conf/locale/ast/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ast/LC_MESSAGES/django.mo
--- a/django/conf/locale/ast/LC_MESSAGES/django.po
+++ b/django/conf/locale/ast/LC_MESSAGES/django.po
--- a/django/conf/locale/az/LC_MESSAGES/django.mo
+++ b/django/conf/locale/az/LC_MESSAGES/django.mo
--- a/django/conf/locale/az/LC_MESSAGES/django.po
+++ b/django/conf/locale/az/LC_MESSAGES/django.po
--- a/django/conf/locale/az/formats.py
+++ b/django/conf/locale/az/formats.py
@ -1,35 +0,0 @@
-# -*- encoding: utf-8 -*-
-# This file is distributed under the same license as the Django package.
-#
-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'
-YEAR_MONTH_FORMAT = 'F Y'
-MONTH_DAY_FORMAT = 'j F'
-SHORT_DATE_FORMAT = 'd.m.Y'
-SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
-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 = [
-    '%d.%m.%Y',  # '25.10.2006'
-    '%d.%m.%y',  # '25.10.06'
-]
-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'
-    '%d.%m.%y %H:%M:%S',     # '25.10.06 14:30:59'
-    '%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 = '\xa0'  # non-breaking space
-NUMBER_GROUPING = 3
--- a/django/conf/locale/be/LC_MESSAGES/django.mo
+++ b/django/conf/locale/be/LC_MESSAGES/django.mo
--- a/django/conf/locale/be/LC_MESSAGES/django.po
+++ b/django/conf/locale/be/LC_MESSAGES/django.po
--- a/django/conf/locale/bg/LC_MESSAGES/django.mo
+++ b/django/conf/locale/bg/LC_MESSAGES/django.mo
--- a/django/conf/locale/bg/LC_MESSAGES/django.po
+++ b/django/conf/locale/bg/LC_MESSAGES/django.po
--- a/django/conf/locale/bg/formats.py
+++ b/django/conf/locale/bg/formats.py
@ -1,24 +1,23 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-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'
-# DATETIME_FORMAT =
-# YEAR_MONTH_FORMAT =
+TIME_FORMAT = 'H:i:s'
+# DATETIME_FORMAT = 
+# YEAR_MONTH_FORMAT = 
 MONTH_DAY_FORMAT = 'j F'
 SHORT_DATE_FORMAT = 'd.m.Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+# SHORT_DATETIME_FORMAT = 
+# 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 =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS = 
+# TIME_INPUT_FORMATS = 
+# DATETIME_INPUT_FORMATS = 
 DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = ' '  # Non-breaking space
-# NUMBER_GROUPING =
+THOUSAND_SEPARATOR = u' ' # Non-breaking space
+# NUMBER_GROUPING = 
--- a/django/conf/locale/bn/LC_MESSAGES/django.mo
+++ b/django/conf/locale/bn/LC_MESSAGES/django.mo
--- a/django/conf/locale/bn/LC_MESSAGES/django.po
+++ b/django/conf/locale/bn/LC_MESSAGES/django.po
--- a/django/conf/locale/bn/formats.py
+++ b/django/conf/locale/bn/formats.py
@ -1,35 +1,23 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-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'
-# DATETIME_FORMAT =
+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
+# SHORT_DATETIME_FORMAT = 
+# 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 =
+# NUMBER_GROUPING = 
--- a/django/conf/locale/br/LC_MESSAGES/django.mo
+++ b/django/conf/locale/br/LC_MESSAGES/django.mo
--- a/django/conf/locale/br/LC_MESSAGES/django.po
+++ b/django/conf/locale/br/LC_MESSAGES/django.po
--- a/django/conf/locale/bs/LC_MESSAGES/django.mo
+++ b/django/conf/locale/bs/LC_MESSAGES/django.mo
--- a/django/conf/locale/bs/LC_MESSAGES/django.po
+++ b/django/conf/locale/bs/LC_MESSAGES/django.po
--- a/django/conf/locale/bs/formats.py
+++ b/django/conf/locale/bs/formats.py
@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-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
@ -11,14 +10,14 @@ DATETIME_FORMAT = 'j. N. Y. G:i T'
 YEAR_MONTH_FORMAT = 'F Y.'
 MONTH_DAY_FORMAT = 'j. F'
 SHORT_DATE_FORMAT = 'Y M j'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+# SHORT_DATETIME_FORMAT = 
+# 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 =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+# DATE_INPUT_FORMATS = 
+# TIME_INPUT_FORMATS = 
+# DATETIME_INPUT_FORMATS = 
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+# NUMBER_GROUPING = 
--- a/django/conf/locale/ca/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ca/LC_MESSAGES/django.mo
--- a/django/conf/locale/ca/LC_MESSAGES/django.po
+++ b/django/conf/locale/ca/LC_MESSAGES/django.po
--- a/django/conf/locale/ca/formats.py
+++ b/django/conf/locale/ca/formats.py
@ -1,33 +1,35 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-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'
-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'
+DATE_FORMAT = r'j \de F \de Y'
+TIME_FORMAT = 'G:i:s'
+DATETIME_FORMAT = r'j \de F \de Y \a \le\s G:i'
+YEAR_MONTH_FORMAT = r'F \de\l Y'
+MONTH_DAY_FORMAT = r'j \de F'
 SHORT_DATE_FORMAT = 'd/m/Y'
 SHORT_DATETIME_FORMAT = 'd/m/Y G:i'
-FIRST_DAY_OF_WEEK = 1  # Monday
+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 = [
+)
+TIME_INPUT_FORMATS = (
+    # '14:30:59', '14:30'
+    '%H:%M:%S', '%H:%M'
+)
+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
+
--- a/django/conf/locale/cs/LC_MESSAGES/django.mo
+++ b/django/conf/locale/cs/LC_MESSAGES/django.mo
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
--- a/django/conf/locale/cs/formats.py
+++ b/django/conf/locale/cs/formats.py
@ -1,45 +1,37 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-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'
-FIRST_DAY_OF_WEEK = 1  # Monday
+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 = [
-    '%d.%m.%Y', '%d.%m.%y',     # '05.01.2006', '05.01.06'
-    '%d. %m. %Y', '%d. %m. %y',  # '5. 1. 2006', '5. 1. 06'
+DATE_INPUT_FORMATS = (
+    '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06'
+    '%Y-%m-%d', '%y-%m-%d',     # '2006-10-25', '06-10-25'
    # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'
-]
-# Kept ISO formats as one is in first position
-TIME_INPUT_FORMATS = [
-    '%H:%M:%S',  # '04:30:59'
-    '%H.%M',    # '04.30'
-    '%H:%M',    # '04:30'
-]
-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'
-    '%d.%m.%Y %H:%M',       # '05.01.2006 04:30'
-    '%d.%m.%Y',             # '05.01.2006'
-    '%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'
-    '%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'
-]
+)
+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'
+    '%d.%m.%Y',             # '25.10.2006'
+    '%Y-%m-%d %H:%M:%S',    # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M',       # '2006-10-25 14:30'
+    '%Y-%m-%d',             # '2006-10-25'
+)
 DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = '\xa0'  # non-breaking space
+THOUSAND_SEPARATOR = ' '
 NUMBER_GROUPING = 3
--- a/django/conf/locale/cy/LC_MESSAGES/django.mo
+++ b/django/conf/locale/cy/LC_MESSAGES/django.mo
--- a/django/conf/locale/cy/LC_MESSAGES/django.po
+++ b/django/conf/locale/cy/LC_MESSAGES/django.po
--- a/django/conf/locale/cy/formats.py
+++ b/django/conf/locale/cy/formats.py
@ -1,38 +1,23 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-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'                   # '25 Hydref 2006'
-TIME_FORMAT = 'P'                       # '2:30 y.b.'
-DATETIME_FORMAT = 'j F Y, P'            # '25 Hydref 2006, 2:30 y.b.'
-YEAR_MONTH_FORMAT = 'F Y'               # 'Hydref 2006'
-MONTH_DAY_FORMAT = 'j F'                # '25 Hydref'
-SHORT_DATE_FORMAT = 'd/m/Y'             # '25/10/2006'
-SHORT_DATETIME_FORMAT = 'd/m/Y P'       # '25/10/2006 2:30 y.b.'
-FIRST_DAY_OF_WEEK = 1                   # 'Dydd Llun'
+DATE_FORMAT = 'd F Y'
+TIME_FORMAT = 'g:i:s A'
+# DATETIME_FORMAT = 
+# YEAR_MONTH_FORMAT = 
+# MONTH_DAY_FORMAT = 
+SHORT_DATE_FORMAT = 'j M Y'
+# SHORT_DATETIME_FORMAT = 
+# 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', '%d/%m/%y',             # '25/10/2006', '25/10/06'
-]
-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'
-    '%Y-%m-%d',                         # '2006-10-25'
-    '%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'
-    '%d/%m/%y %H:%M:%S',                # '25/10/06 14:30:59'
-    '%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
+# DATE_INPUT_FORMATS = 
+# TIME_INPUT_FORMATS = 
+# DATETIME_INPUT_FORMATS = 
+# DECIMAL_SEPARATOR = 
+# THOUSAND_SEPARATOR = 
+# NUMBER_GROUPING = 
--- a/django/conf/locale/da/LC_MESSAGES/django.mo
+++ b/django/conf/locale/da/LC_MESSAGES/django.mo
--- a/django/conf/locale/da/LC_MESSAGES/django.po
+++ b/django/conf/locale/da/LC_MESSAGES/django.po
--- a/django/conf/locale/da/formats.py
+++ b/django/conf/locale/da/formats.py
@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-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
@ -16,14 +15,17 @@ 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 = [
+)
+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:%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
--- a/django/conf/locale/de/LC_MESSAGES/django.mo
+++ b/django/conf/locale/de/LC_MESSAGES/django.mo
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
--- a/django/conf/locale/de/formats.py
+++ b/django/conf/locale/de/formats.py
@ -1,31 +1,37 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-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'
-FIRST_DAY_OF_WEEK = 1  # Monday
+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'
+    '%Y-%m-%d', '%y-%m-%d',     # '2006-10-25', '06-10-25'
    # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'
-]
-DATETIME_INPUT_FORMATS = [
+)
+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:%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'
-]
+    '%Y-%m-%d %H:%M:%S',    # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M',       # '2006-10-25 14:30'
+    '%Y-%m-%d',             # '2006-10-25'
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
 NUMBER_GROUPING = 3
--- a/django/conf/locale/de_CH/formats.py
+++ b/django/conf/locale/de_CH/formats.py
@ -1,38 +0,0 @@
-# -*- encoding: utf-8 -*-
-# This file is distributed under the same license as the Django package.
-#
-
-# The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-from __future__ import unicode_literals
-
-DATE_FORMAT = 'j. F Y'
-TIME_FORMAT = 'H:i'
-DATETIME_FORMAT = 'j. F Y H: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'
-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 = [
-    '%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 = [
-    '%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
-# ' (single quote).
-# For details, please refer to http://www.bk.admin.ch/dokumentation/sprachen/04915/05016/index.html?lang=de
-# (in German) and the documentation
-DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = '\xa0'  # non-breaking space
-NUMBER_GROUPING = 3
--- a/django/conf/locale/dsb/LC_MESSAGES/django.mo
+++ b/django/conf/locale/dsb/LC_MESSAGES/django.mo
--- a/django/conf/locale/dsb/LC_MESSAGES/django.po
+++ b/django/conf/locale/dsb/LC_MESSAGES/django.po
--- a/django/conf/locale/el/LC_MESSAGES/django.mo
+++ b/django/conf/locale/el/LC_MESSAGES/django.mo
--- a/django/conf/locale/el/LC_MESSAGES/django.po
+++ b/django/conf/locale/el/LC_MESSAGES/django.po
--- a/django/conf/locale/el/formats.py
+++ b/django/conf/locale/el/formats.py
@ -1,38 +1,23 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-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/m/Y'
-TIME_FORMAT = 'P'
-DATETIME_FORMAT = 'd/m/Y P'
+DATE_FORMAT = 'd E Y'
+TIME_FORMAT = 'g:i:s A'
+# DATETIME_FORMAT = 
 YEAR_MONTH_FORMAT = 'F Y'
 MONTH_DAY_FORMAT = 'j F'
-SHORT_DATE_FORMAT = 'd/m/Y'
-SHORT_DATETIME_FORMAT = 'd/m/Y P'
-FIRST_DAY_OF_WEEK = 0  # Sunday
+SHORT_DATE_FORMAT = 'd M Y'
+# SHORT_DATETIME_FORMAT = 
+# 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', '%d/%m/%y', '%Y-%m-%d',  # '25/10/2006', '25/10/06', '2006-10-25',
-]
-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'
-    '%d/%m/%y %H:%M:%S',     # '25/10/06 14:30:59'
-    '%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'
-    '%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'
-    '%Y-%m-%d',              # '2006-10-25'
-]
+# DATE_INPUT_FORMATS = 
+# TIME_INPUT_FORMATS = 
+# DATETIME_INPUT_FORMATS = 
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
-NUMBER_GROUPING = 3
+# NUMBER_GROUPING = 
--- a/django/conf/locale/en/LC_MESSAGES/django.mo
+++ b/django/conf/locale/en/LC_MESSAGES/django.mo
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
--- a/django/conf/locale/en/formats.py
+++ b/django/conf/locale/en/formats.py
@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-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
@ -12,32 +11,33 @@ YEAR_MONTH_FORMAT = 'F Y'
 MONTH_DAY_FORMAT = 'F j'
 SHORT_DATE_FORMAT = 'm/d/Y'
 SHORT_DATETIME_FORMAT = 'm/d/Y P'
-FIRST_DAY_OF_WEEK = 0  # Sunday
+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 = [
-    '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y',  # '2006-10-25', '10/25/2006', '10/25/06'
+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 = [
+)
+TIME_INPUT_FORMATS = (
+    '%H:%M:%S',     # '14:30:59'
+    '%H:%M',        # '14:30'
+)
+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'
    '%Y-%m-%d',              # '2006-10-25'
    '%m/%d/%Y %H:%M:%S',     # '10/25/2006 14:30:59'
-    '%m/%d/%Y %H:%M:%S.%f',  # '10/25/2006 14:30:59.000200'
    '%m/%d/%Y %H:%M',        # '10/25/2006 14:30'
    '%m/%d/%Y',              # '10/25/2006'
    '%m/%d/%y %H:%M:%S',     # '10/25/06 14:30:59'
-    '%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 = ','
+)
+DECIMAL_SEPARATOR = u'.'
+THOUSAND_SEPARATOR = u','
 NUMBER_GROUPING = 3
+
--- a/django/conf/locale/en_AU/LC_MESSAGES/django.mo
+++ b/django/conf/locale/en_AU/LC_MESSAGES/django.mo
--- a/django/conf/locale/en_AU/LC_MESSAGES/django.po
+++ b/django/conf/locale/en_AU/LC_MESSAGES/django.po
--- a/django/conf/locale/en_AU/formats.py
+++ b/django/conf/locale/en_AU/formats.py
@ -1,42 +0,0 @@
-# -*- encoding: utf-8 -*-
-# This file is distributed under the same license as the Django package.
-#
-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.'
-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 = 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 = [
-    '%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 = [
-    '%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'
-    '%Y-%m-%d',                         # '2006-10-25'
-    '%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'
-    '%d/%m/%y %H:%M:%S',                # '25/10/06 14:30:59'
-    '%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
--- a/django/conf/locale/en_GB/LC_MESSAGES/django.mo
+++ b/django/conf/locale/en_GB/LC_MESSAGES/django.mo
--- a/django/conf/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/conf/locale/en_GB/LC_MESSAGES/django.po
--- a/django/conf/locale/en_GB/formats.py
+++ b/django/conf/locale/en_GB/formats.py
@ -1,42 +1,44 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-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.'
+DATE_FORMAT = 'N j, Y'                  # 'Oct. 25, 2006'
+TIME_FORMAT = 'P'                       # '2:30 pm'
+DATETIME_FORMAT = 'N j, Y, P'           # 'Oct. 25, 2006, 2:30 pm'
 YEAR_MONTH_FORMAT = 'F Y'               # 'October 2006'
-MONTH_DAY_FORMAT = 'j F'                # '25 October'
+MONTH_DAY_FORMAT = 'F j'                # 'October 25'
 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'
+    '%Y-%m-%d',                         # '2006-10-25'
    # '%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 = [
+)
+TIME_INPUT_FORMATS = (
+    '%H:%M:%S',                         # '14:30:59'
+    '%H:%M',                            # '14:30'
+)
+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'
    '%Y-%m-%d',                         # '2006-10-25'
    '%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'
    '%d/%m/%y %H:%M:%S',                # '25/10/06 14:30:59'
-    '%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
+
--- a/django/conf/locale/eo/LC_MESSAGES/django.mo
+++ b/django/conf/locale/eo/LC_MESSAGES/django.mo
--- a/django/conf/locale/eo/LC_MESSAGES/django.po
+++ b/django/conf/locale/eo/LC_MESSAGES/django.po
--- a/django/conf/locale/eo/formats.py
+++ b/django/conf/locale/eo/formats.py
@ -1,52 +0,0 @@
-# -*- encoding: utf-8 -*-
-# This file is distributed under the same license as the Django package.
-#
-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'
-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'
-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 = [
-    '%Y-%m-%d',                         # '1887-07-26'
-    '%y-%m-%d',                         # '87-07-26'
-    '%Y %m %d',                         # '1887 07 26'
-    '%d-a de %b %Y',                    # '26-a de jul 1887'
-    '%d %b %Y',                         # '26 jul 1887'
-    '%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 = [
-    '%H:%M:%S',                         # '18:59:00'
-    '%H:%M',                            # '18:59'
-]
-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'
-
-    '%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'
-
-    '%d/%m/%Y %H:%M:%S',                # '26/07/1887 18:59:00'
-    '%d/%m/%Y %H:%M',                   # '26/07/1887 18:59'
-    '%d/%m/%Y',                         # '26/07/1887'
-
-    '%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
--- a/django/conf/locale/es/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es/LC_MESSAGES/django.mo
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
--- a/django/conf/locale/es/formats.py
+++ b/django/conf/locale/es/formats.py
@ -1,33 +1,35 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-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'
-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'
+DATE_FORMAT = r'j \de F \de Y'
+TIME_FORMAT = 'H:i:s'
+DATETIME_FORMAT = r'j \de F \de Y \a \l\a\s H:i'
+YEAR_MONTH_FORMAT = r'F \de Y'
+MONTH_DAY_FORMAT = r'j \de F'
 SHORT_DATE_FORMAT = 'd/m/Y'
 SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
-FIRST_DAY_OF_WEEK = 1  # Monday
+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 = [
+)
+TIME_INPUT_FORMATS = (
+    # '14:30:59', '14:30'
+    '%H:%M:%S', '%H:%M'
+)
+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
+
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.mo
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po
--- a/django/conf/locale/es_AR/formats.py
+++ b/django/conf/locale/es_AR/formats.py
@ -1,33 +1,34 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-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'
+MONTH_DAY_FORMAT = r'j \de F'
 SHORT_DATE_FORMAT = r'd/m/Y'
 SHORT_DATETIME_FORMAT = r'd/m/Y H:i'
-FIRST_DAY_OF_WEEK = 0  # 0: Sunday, 1: Monday
+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 = [
-    '%d/%m/%Y',  # '31/12/2009'
-    '%d/%m/%y',  # '31/12/09'
-]
-DATETIME_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
+    '%d/%m/%Y', # '31/12/2009'
+    '%d/%m/%y', # '31/12/09'
+)
+TIME_INPUT_FORMATS = (
+    '%H:%M:%S', # '14:30:59'
+    '%H:%M',    # '14:30'
+)
+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
--- a/Show More
+++ b/Show More