Merge branch 'master' into schema-alteration

Conflicts:
	django/db/backends/__init__.py
	django/db/backends/mysql/base.py
	django/db/backends/oracle/base.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/fields/related.py

.tx/config

@@ -57,11 +57,6 @@ 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-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

AUTHORS

@@ -34,6 +34,8 @@ The PRIMARY AUTHORS are (and/or have been):
     * Jeremy Dunck
     * Bryan Veloso
     * Preston Holmes
+    * Simon Charette
+    * Donald Stufft
 
 More information on the main contributors to Django can be found in
 docs/internals/committers.txt.
@@ -97,7 +99,9 @@ answer newbie questions, and generally made Django that much better:
     Natalia Bidart <nataliabidart@gmail.com>
     Mark Biggers <biggers@utsl.com>
     Paul Bissex <http://e-scribe.com/>
+    Loïc Bistuer <loic.bistuer@sixmedia.com>
     Simon Blanchard
+    Craig Blaszczyk <masterjakul@gmail.com>
     David Blewett <david@dawninglight.net>
     Matt Boersma <matt@sprout.org>
     Artem Gnilov <boobsd@gmail.com>
@@ -140,7 +144,10 @@ answer newbie questions, and generally made Django that much better:
     colin@owlfish.com
     crankycoder@gmail.com
     Paul Collier <paul@paul-collier.com>
+    Paul Collins <paul.collins.iii@gmail.com>
     Robert Coup
+    Deric Crago <deric.crago@gmail.com>
+    David Cramer <dcramer@gmail.com>
     Pete Crosier <pete.crosier@gmail.com>
     Matt Croydon <http://www.postneo.com/>
     Jure Cuhalev <gandalf@owca.info>
@@ -162,6 +169,7 @@ answer newbie questions, and generally made Django that much better:
     Matt Dennenbaum
     deric@monowerks.com
     Max Derkachev <mderk@yandex.ru>
+    Carlos Matías de la Torre <cmdelatorre@gmail.com>
     Rajesh Dhawan <rajesh.dhawan@gmail.com>
     Sander Dijkhuis <sander.dijkhuis@gmail.com>
     Jordan Dimov <s3x3y1@gmail.com>
@@ -202,6 +210,7 @@ answer newbie questions, and generally made Django that much better:
     Stefane Fermgier <sf@fermigier.com>
     J. Pablo Fernandez <pupeno@pupeno.com>
     Maciej Fijalkowski
+    Juan Pedro Fisanotti <fisadev@gmail.com>
     Ben Firshman <ben@firshman.co.uk>
     Matthew Flanagan <http://wadofstuff.blogspot.com>
     Eric Floehr <eric@intellovations.com>
@@ -303,6 +312,7 @@ answer newbie questions, and generally made Django that much better:
     Garth Kidd <http://www.deadlybloodyserious.com/>
     kilian <kilian.cavalotti@lip6.fr>
     Sune Kirkeby <http://ibofobi.dk/>
+    Hiroki Kiyohara <hirokiky@gmail.com>
     Bastian Kleineidam <calvin@debian.org>
     Cameron Knight (ckknight)
     Nena Kojadin <nena@kiberpipa.org>
@@ -324,6 +334,7 @@ answer newbie questions, and generally made Django that much better:
     Denis Kuzmichyov <kuzmichyov@gmail.com>
     Panos Laganakos <panos.laganakos@gmail.com>
     Nick Lane <nick.lane.au@gmail.com>
+    Łukasz Langa <lukasz@langa.pl>
     Stuart Langridge <http://www.kryogenix.org/>
     Paul Lanier <planier@google.com>
     David Larlet <http://david.larlet.fr>
@@ -358,6 +369,7 @@ answer newbie questions, and generally made Django that much better:
     Mike Malone <mjmalone@gmail.com>
     Martin Maney <http://www.chipy.org/Martin_Maney>
     Michael Manfre <mmanfre@gmail.com>
+    Javier Mansilla <javimansilla@gmail.com>
     masonsimon+django@gmail.com
     Manuzhai
     Petr Marhoun <petr.marhoun@gmail.com>
@@ -378,6 +390,7 @@ answer newbie questions, and generally made Django that much better:
     Paul McLanahan <paul@mclanahan.net>
     Tobias McNulty <http://www.caktusgroup.com/blog>
     Andrews Medina <andrewsmedina@gmail.com>
+    Christoph Mędrela <chris.medrela@gmail.com>
     Zain Memon
     Christian Metts
     michal@plovarna.cz
@@ -414,6 +427,7 @@ answer newbie questions, and generally made Django that much better:
     Christian Oudard <christian.oudard@gmail.com>
     oggie rob <oz.robharvey@gmail.com>
     oggy <ognjen.maric@gmail.com>
+    Tomek Paczkowski <tomek@hauru.eu>
     Jens Page
     Jay Parlar <parlar@gmail.com>
     Carlos Eduardo de Paula <carlosedp@gmail.com>
@@ -423,6 +437,7 @@ answer newbie questions, and generally made Django that much better:
     Andreas Pelme <andreas@pelme.se>
     permonik@mesias.brnonet.cz
     peter@mymart.com
+    Christophe Pettus <xof@thebuild.com>
     pgross@thoughtworks.com
     phaedo <http://phaedo.cx/>
     phil@produxion.net
@@ -461,6 +476,7 @@ answer newbie questions, and generally made Django that much better:
     Mike Richardson
     Matt Riggott
     Alex Robbins <alexander.j.robbins@gmail.com>
+    Matt Robenolt <m@robenolt.com>
     Henrique Romano <onaiort@gmail.com>
     Armin Ronacher
     Daniel Roseman <http://roseman.org.uk/>
@@ -513,6 +529,7 @@ answer newbie questions, and generally made Django that much better:
     Johan C. Stöver <johan@nilling.nl>
     Nowell Strite <http://nowell.strite.org/>
     Thomas Stromberg <tstromberg@google.com>
+    Hannes Struß <x@hannesstruss.de>
     Ben Sturmfels <ben@sturm.com.au>
     Travis Swicegood <travis@domain51.com>
     Pascal Varet
@@ -541,6 +558,7 @@ answer newbie questions, and generally made Django that much better:
     Tom Tobin
     Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>
     torne-django@wolfpuppy.org.uk
+    Matthew Tretter <m@tthewwithanm.com>
     Jeff Triplett <jeff.triplett@gmail.com>
     tstromberg@google.com
     Makoto Tsuyuki <mtsuyuki@gmail.com>
@@ -585,12 +603,13 @@ answer newbie questions, and generally made Django that much better:
     ye7cakf02@sneakemail.com
     ymasuda@ethercube.com
     Jesse Young <adunar@gmail.com>
+    Marc Aymerich Gubern
+    Wiktor Kołodziej <wiktor@pykonik.org>
     Mykola Zamkovoi <nickzam@gmail.com>
     zegor
     Gasper Zejn <zejn@kiberpipa.org>
     Jarek Zgoda <jarek.zgoda@gmail.com>
     Cheng Zhang
-    Hannes Struß <x@hannesstruss.de>
 
 A big THANK YOU goes to:
 
@@ -601,6 +620,7 @@ A big THANK YOU goes to:
 
     Ian Bicking for convincing Adrian to ditch code generation.
 
-    Mark Pilgrim for diveintopython.org. (RIP!)
+    Mark Pilgrim for "Dive Into Python" (http://diveintopython.net,
+    http://www.diveintopython3.net).
 
     Guido van Rossum for creating Python.

CONTRIBUTING.rst

@@ -14,3 +14,12 @@ Extensive contribution guidelines are available in the repository at
 ``docs/internals/contributing/``, or online at:
 
 https://docs.djangoproject.com/en/dev/internals/contributing/
+
+**Warning: pull requests are ignored!** `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.

MANIFEST.in

@@ -19,7 +19,6 @@ recursive-include django/contrib/auth/fixtures *
 recursive-include django/contrib/auth/templates *
 recursive-include django/contrib/auth/tests/templates *
 recursive-include django/contrib/comments/templates *
-recursive-include django/contrib/databrowse/templates *
 recursive-include django/contrib/formtools/templates *
 recursive-include django/contrib/formtools/tests/templates *
 recursive-include django/contrib/flatpages/fixtures *

django/bin/daily_cleanup.py

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

django/conf/__init__.py

@@ -8,6 +8,7 @@ a list of all possible variables.
 
 import logging
 import os
+import sys
 import time     # Needed for Windows
 import warnings
 
@@ -15,6 +16,7 @@ from django.conf import global_settings
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.functional import LazyObject, empty
 from django.utils import importlib
+from django.utils.module_loading import import_by_path
 from django.utils import six
 
 ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
@@ -56,29 +58,25 @@ class LazySettings(LazyObject):
         """
         Setup logging from LOGGING_CONFIG and LOGGING settings.
         """
-        try:
+        if not sys.warnoptions:
-            # Route warnings through python logging
+            try:
-            logging.captureWarnings(True)
+                # Route warnings through python logging
-            # Allow DeprecationWarnings through the warnings filters
+                logging.captureWarnings(True)
-            warnings.simplefilter("default", DeprecationWarning)
+                # Allow DeprecationWarnings through the warnings filters
-        except AttributeError:
+                warnings.simplefilter("default", DeprecationWarning)
-            # No captureWarnings on Python 2.6, DeprecationWarnings are on anyway
+            except AttributeError:
-            pass
+                # No captureWarnings on Python 2.6, DeprecationWarnings are on anyway
+                pass
 
         if self.LOGGING_CONFIG:
             from django.utils.log import DEFAULT_LOGGING
             # First find the logging configuration function ...
-            logging_config_path, logging_config_func_name = self.LOGGING_CONFIG.rsplit('.', 1)
+            logging_config_func = import_by_path(self.LOGGING_CONFIG)
-            logging_config_module = importlib.import_module(logging_config_path)
-            logging_config_func = getattr(logging_config_module, logging_config_func_name)
 
             logging_config_func(DEFAULT_LOGGING)
 
+            # ... then invoke it with the logging settings
             if self.LOGGING:
-                # Backwards-compatibility shim for #16288 fix
-                compat_patch_logging_config(self.LOGGING)
-
-                # ... then invoke it with the logging settings
                 logging_config_func(self.LOGGING)
 
     def configure(self, default_settings=global_settings, **options):
@@ -142,7 +140,7 @@ class Settings(BaseSettings):
                         isinstance(setting_value, six.string_types):
                     warnings.warn("The %s setting must be a tuple. Please fix your "
                                   "settings, as auto-correction is now deprecated." % setting,
-                        PendingDeprecationWarning)
+                                  DeprecationWarning, stacklevel=2)
                     setting_value = (setting_value,) # In case the user forgot the comma.
                 setattr(self, setting, setting_value)
 
@@ -195,37 +193,3 @@ class UserSettingsHolder(BaseSettings):
         return list(self.__dict__) + dir(self.default_settings)
 
 settings = LazySettings()
-
-
-
-def compat_patch_logging_config(logging_config):
-    """
-    Backwards-compatibility shim for #16288 fix. Takes initial value of
-    ``LOGGING`` setting and patches it in-place (issuing deprecation warning)
-    if "mail_admins" logging handler is configured but has no filters.
-
-    """
-    #  Shim only if LOGGING["handlers"]["mail_admins"] exists,
-    #  but has no "filters" key
-    if "filters" not in logging_config.get(
-        "handlers", {}).get(
-        "mail_admins", {"filters": []}):
-
-        warnings.warn(
-            "You have no filters defined on the 'mail_admins' logging "
-            "handler: adding implicit debug-false-only filter. "
-            "See http://docs.djangoproject.com/en/dev/releases/1.4/"
-            "#request-exceptions-are-now-always-logged",
-            DeprecationWarning)
-
-        filter_name = "require_debug_false"
-
-        filters = logging_config.setdefault("filters", {})
-        while filter_name in filters:
-            filter_name = filter_name + "_"
-
-        filters[filter_name] = {
-            "()": "django.utils.log.RequireDebugFalse",
-        }
-
-        logging_config["handlers"]["mail_admins"]["filters"] = [filter_name]

django/conf/app_template/admin.py

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

django/conf/app_template/tests.py

@@ -1,16 +1,3 @@
-"""
-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
 
-
+# Create your tests here.
-class SimpleTest(TestCase):
-    def test_basic_addition(self):
-        """
-        Tests that 1 + 1 always equals 2.
-        """
-        self.assertEqual(1 + 1, 2)

django/conf/app_template/views.py

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

django/conf/global_settings.py

@@ -29,6 +29,10 @@ ADMINS = ()
 #   * Receive x-headers
 INTERNAL_IPS = ()
 
+# Hosts/domain names that are valid for this site.
+# "*" matches anything, ".example.com" matches example.com and all subdomains
+ALLOWED_HOSTS = []
+
 # Local time zone for this installation. All choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name (although not all
 # systems may support all possibilities). When USE_TZ is True, this is
@@ -42,13 +46,15 @@ USE_TZ = False
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en-us'
 
-# Languages we provide translations for, out of the box. The language name
+# Languages we provide translations for, out of the box.
-# should be the utf-8 encoded local name for the language.
 LANGUAGES = (
+    ('af', gettext_noop('Afrikaans')),
     ('ar', gettext_noop('Arabic')),
     ('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')),
@@ -63,6 +69,7 @@ LANGUAGES = (
     ('es-ar', gettext_noop('Argentinian 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')),
@@ -75,6 +82,7 @@ LANGUAGES = (
     ('hi', gettext_noop('Hindi')),
     ('hr', gettext_noop('Croatian')),
     ('hu', gettext_noop('Hungarian')),
+    ('ia', gettext_noop('Interlingua')),
     ('id', gettext_noop('Indonesian')),
     ('is', gettext_noop('Icelandic')),
     ('it', gettext_noop('Italian')),
@@ -84,15 +92,18 @@ LANGUAGES = (
     ('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')),
+    ('my', gettext_noop('Burmese')),
     ('nb', gettext_noop('Norwegian Bokmal')),
     ('ne', gettext_noop('Nepali')),
     ('nl', gettext_noop('Dutch')),
     ('nn', gettext_noop('Norwegian Nynorsk')),
+    ('os', gettext_noop('Ossetic')),
     ('pa', gettext_noop('Punjabi')),
     ('pl', gettext_noop('Polish')),
     ('pt', gettext_noop('Portuguese')),
@@ -111,6 +122,7 @@ LANGUAGES = (
     ('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')),
@@ -147,7 +159,7 @@ FILE_CHARSET = 'utf-8'
 # Email address that error messages come from.
 SERVER_EMAIL = 'root@localhost'
 
-# Whether to send broken-link emails.
+# Whether to send broken-link emails. Deprecated, must be removed in 1.8.
 SEND_BROKEN_LINK_EMAILS = False
 
 # Database connection info. If left empty, will default to the dummy backend.
@@ -246,7 +258,7 @@ ALLOWED_INCLUDE_ROOTS = ()
 ADMIN_FOR = ()
 
 # List of compiled regular expression objects representing URLs that need not
-# be reported when SEND_BROKEN_LINK_EMAILS is True. Here are a few examples:
+# be reported by BrokenLinkEmailsMiddleware. Here are a few examples:
 #    import re
 #    IGNORABLE_404_URLS = (
 #        re.compile(r'^/apple-touch-icon.*\.png$'),
@@ -355,6 +367,7 @@ DATE_INPUT_FORMATS = (
 # * Note that these format strings are different from the ones to display dates
 TIME_INPUT_FORMATS = (
     '%H:%M:%S',     # '14:30:59'
+    '%H:%M:%S.%f',  # '14:30:59.000200'
     '%H:%M',        # '14:30'
 )
 
@@ -504,9 +517,11 @@ PASSWORD_RESET_TIMEOUT_DAYS = 3
 PASSWORD_HASHERS = (
     'django.contrib.auth.hashers.PBKDF2PasswordHasher',
     'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
+    'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
     'django.contrib.auth.hashers.BCryptPasswordHasher',
     'django.contrib.auth.hashers.SHA1PasswordHasher',
     'django.contrib.auth.hashers.MD5PasswordHasher',
+    'django.contrib.auth.hashers.UnsaltedSHA1PasswordHasher',
     'django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',
     'django.contrib.auth.hashers.CryptPasswordHasher',
 )
@@ -530,6 +545,7 @@ CSRF_COOKIE_NAME = 'csrftoken'
 CSRF_COOKIE_DOMAIN = None
 CSRF_COOKIE_PATH = '/'
 CSRF_COOKIE_SECURE = False
+CSRF_COOKIE_HTTPONLY = False
 
 ############
 # MESSAGES #

django/conf/locale/__init__.py

@@ -1,32 +1,51 @@
+# -*- encoding: utf-8 -*-
 from __future__ import unicode_literals
 
 # About name_local: capitalize it as if your language name was appearing
 # inside a sentence in your language.
 
 LANG_INFO = {
+    'af': {
+        'bidi': False,
+        'code': 'af',
+        'name': 'Afrikaans',
+        'name_local': 'Afrikaans',
+    },
     'ar': {
         'bidi': True,
         'code': 'ar',
         'name': 'Arabic',
-        'name_local': '\u0627\u0644\u0639\u0631\u0628\u064a\u0651\u0629',
+        'name_local': 'العربيّة',
     },
     'az': {
         'bidi': True,
         'code': 'az',
         'name': 'Azerbaijani',
-        'name_local': 'az\u0259rbaycan dili',
+        'name_local': 'azərbaycan dili',
+    },
+    'be': {
+        'bidi': False,
+        'code': 'be',
+        'name': 'Belarusian',
+        'name_local': 'беларуская',
     },
     'bg': {
         'bidi': False,
         'code': 'bg',
         'name': 'Bulgarian',
-        'name_local': '\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438',
+        'name_local': 'български',
     },
     'bn': {
         'bidi': False,
         'code': 'bn',
         'name': 'Bengali',
-        'name_local': '\u09ac\u09be\u0982\u09b2\u09be',
+        'name_local': 'বাংলা',
+    },
+    'br': {
+        'bidi': False,
+        'code': 'br',
+        'name': 'Breton',
+        'name_local': 'brezhoneg',
     },
     'bs': {
         'bidi': False,
@@ -38,13 +57,13 @@ LANG_INFO = {
         'bidi': False,
         'code': 'ca',
         'name': 'Catalan',
-        'name_local': 'catal\xe0',
+        'name_local': 'català',
     },
     'cs': {
         'bidi': False,
         'code': 'cs',
         'name': 'Czech',
-        'name_local': '\u010desky',
+        'name_local': 'česky',
     },
     'cy': {
         'bidi': False,
@@ -68,7 +87,7 @@ LANG_INFO = {
         'bidi': False,
         'code': 'el',
         'name': 'Greek',
-        'name_local': '\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac',
+        'name_local': 'Ελληνικά',
     },
     'en': {
         'bidi': False,
@@ -92,25 +111,31 @@ LANG_INFO = {
         'bidi': False,
         'code': 'es',
         'name': 'Spanish',
-        'name_local': 'espa\xf1ol',
+        'name_local': 'español',
     },
     'es-ar': {
         'bidi': False,
         'code': 'es-ar',
         'name': 'Argentinian Spanish',
-        'name_local': 'espa\xf1ol de Argentina',
+        'name_local': 'español de Argentina',
     },
     'es-mx': {
         'bidi': False,
         'code': 'es-mx',
         'name': 'Mexican Spanish',
-        'name_local': 'espa\xf1ol de Mexico',
+        'name_local': 'español de Mexico',
     },
     'es-ni': {
         'bidi': False,
         'code': 'es-ni',
         'name': 'Nicaraguan Spanish',
-        'name_local': 'espa\xf1ol de Nicaragua',
+        'name_local': 'español de Nicaragua',
+    },
+    'es-ve': {
+        'bidi': False,
+        'code': 'es-ve',
+        'name': 'Venezuelan Spanish',
+        'name_local': 'español de Venezuela',
     },
     'et': {
         'bidi': False,
@@ -128,7 +153,7 @@ LANG_INFO = {
         'bidi': True,
         'code': 'fa',
         'name': 'Persian',
-        'name_local': '\u0641\u0627\u0631\u0633\u06cc',
+        'name_local': 'فارسی',
     },
     'fi': {
         'bidi': False,
@@ -140,7 +165,7 @@ LANG_INFO = {
         'bidi': False,
         'code': 'fr',
         'name': 'French',
-        'name_local': 'fran\xe7ais',
+        'name_local': 'français',
     },
     'fy-nl': {
         'bidi': False,
@@ -164,7 +189,7 @@ LANG_INFO = {
         'bidi': True,
         'code': 'he',
         'name': 'Hebrew',
-        'name_local': '\u05e2\u05d1\u05e8\u05d9\u05ea',
+        'name_local': 'עברית',
     },
     'hi': {
         'bidi': False,
@@ -184,6 +209,12 @@ LANG_INFO = {
         'name': 'Hungarian',
         'name_local': 'Magyar',
     },
+    'ia': {
+        'bidi': False,
+        'code': 'ia',
+        'name': 'Interlingua',
+        'name_local': 'Interlingua',
+    },
     'id': {
         'bidi': False,
         'code': 'id',
@@ -194,7 +225,7 @@ LANG_INFO = {
         'bidi': False,
         'code': 'is',
         'name': 'Icelandic',
-        'name_local': '\xcdslenska',
+        'name_local': 'Íslenska',
     },
     'it': {
         'bidi': False,
@@ -206,19 +237,19 @@ LANG_INFO = {
         'bidi': False,
         'code': 'ja',
         'name': 'Japanese',
-        'name_local': '\u65e5\u672c\u8a9e',
+        'name_local': '日本語',
     },
     'ka': {
         'bidi': False,
         'code': 'ka',
         'name': 'Georgian',
-        'name_local': '\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8',
+        'name_local': 'ქართული',
     },
     'kk': {
         'bidi': False,
         'code': 'kk',
         'name': 'Kazakh',
-        'name_local': '\u049a\u0430\u0437\u0430\u049b',
+        'name_local': 'Қазақ',
     },
     'km': {
         'bidi': False,
@@ -236,7 +267,13 @@ LANG_INFO = {
         'bidi': False,
         'code': 'ko',
         'name': 'Korean',
-        'name_local': '\ud55c\uad6d\uc5b4',
+        'name_local': '한국어',
+    },
+    'lb': {
+        'bidi': False,
+        'code': 'lb',
+        'name': 'Luxembourgish',
+        'name_local': 'Lëtzebuergesch',
     },
     'lt': {
         'bidi': False,
@@ -248,13 +285,13 @@ LANG_INFO = {
         'bidi': False,
         'code': 'lv',
         'name': 'Latvian',
-        'name_local': 'latvie\u0161u',
+        'name_local': 'latviešu',
     },
     'mk': {
         'bidi': False,
         'code': 'mk',
         'name': 'Macedonian',
-        'name_local': '\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438',
+        'name_local': 'Македонски',
     },
     'ml': {
         'bidi': False,
@@ -268,17 +305,23 @@ LANG_INFO = {
         'name': 'Mongolian',
         'name_local': 'Mongolian',
     },
+    'my': {
+        'bidi': False,
+        'code': 'my',
+        'name': 'Burmese',
+        'name_local': 'မြန်မာဘာသာ',
+    },
     'nb': {
         'bidi': False,
         'code': 'nb',
         'name': 'Norwegian Bokmal',
-        'name_local': 'norsk (bokm\xe5l)',
+        'name_local': 'norsk (bokmål)',
     },
     'ne': {
         'bidi': False,
         'code': 'ne',
         'name': 'Nepali',
-        'name_local': '\u0928\u0947\u092a\u093e\u0932\u0940',
+        'name_local': 'नेपाली',
     },
     'nl': {
         'bidi': False,
@@ -298,6 +341,12 @@ LANG_INFO = {
         'name': 'Norwegian',
         'name_local': 'norsk',
     },
+    'os': {
+        'bidi': False,
+        'code': 'os',
+        'name': 'Ossetic',
+        'name_local': 'Ирон',
+    },
     'pa': {
         'bidi': False,
         'code': 'pa',
@@ -314,37 +363,37 @@ LANG_INFO = {
         'bidi': False,
         'code': 'pt',
         'name': 'Portuguese',
-        'name_local': 'Portugu\xeas',
+        'name_local': 'Português',
     },
     'pt-br': {
         'bidi': False,
         'code': 'pt-br',
         'name': 'Brazilian Portuguese',
-        'name_local': 'Portugu\xeas Brasileiro',
+        'name_local': 'Português Brasileiro',
     },
     'ro': {
         'bidi': False,
         'code': 'ro',
         'name': 'Romanian',
-        'name_local': 'Rom\xe2n\u0103',
+        'name_local': 'Română',
     },
     'ru': {
         'bidi': False,
         'code': 'ru',
         'name': 'Russian',
-        'name_local': '\u0420\u0443\u0441\u0441\u043a\u0438\u0439',
+        'name_local': 'Русский',
     },
     'sk': {
         'bidi': False,
         'code': 'sk',
         'name': 'Slovak',
-        'name_local': 'slovensk\xfd',
+        'name_local': 'slovenský',
     },
     'sl': {
         'bidi': False,
         'code': 'sl',
         'name': 'Slovenian',
-        'name_local': 'Sloven\u0161\u010dina',
+        'name_local': 'Slovenščina',
     },
     'sq': {
         'bidi': False,
@@ -356,7 +405,7 @@ LANG_INFO = {
         'bidi': False,
         'code': 'sr',
         'name': 'Serbian',
-        'name_local': '\u0441\u0440\u043f\u0441\u043a\u0438',
+        'name_local': 'српски',
     },
     'sr-latn': {
         'bidi': False,
@@ -380,13 +429,13 @@ LANG_INFO = {
         'bidi': False,
         'code': 'ta',
         'name': 'Tamil',
-        'name_local': '\u0ba4\u0bae\u0bbf\u0bb4\u0bcd',
+        'name_local': 'தமிழ்',
     },
     'te': {
         'bidi': False,
         'code': 'te',
         'name': 'Telugu',
-        'name_local': '\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41',
+        'name_local': 'తెలుగు',
     },
     'th': {
         'bidi': False,
@@ -398,25 +447,31 @@ LANG_INFO = {
         'bidi': False,
         'code': 'tr',
         'name': 'Turkish',
-        'name_local': 'T\xfcrk\xe7e',
+        'name_local': 'Türkçe',
     },
     'tt': {
         'bidi': False,
         'code': 'tt',
         'name': 'Tatar',
-        'name_local': '\u0422\u0430\u0442\u0430\u0440\u0447\u0430',
+        'name_local': 'Татарча',
+    },
+    'udm': {
+        'bidi': False,
+        'code': 'udm',
+        'name': 'Udmurt',
+        'name_local': 'Удмурт',
     },
     'uk': {
         'bidi': False,
         'code': 'uk',
         'name': 'Ukrainian',
-        'name_local': '\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430',
+        'name_local': 'Українська',
     },
     'ur': {
         'bidi': False,
         'code': 'ur',
         'name': 'Urdu',
-        'name_local': '\u0627\u0631\u062f\u0648',
+        'name_local': 'اردو',
     },
     'vi': {
         'bidi': False,
@@ -428,12 +483,12 @@ LANG_INFO = {
         'bidi': False,
         'code': 'zh-cn',
         'name': 'Simplified Chinese',
-        'name_local': '\u7b80\u4f53\u4e2d\u6587',
+        'name_local': '简体中文',
     },
     'zh-tw': {
         'bidi': False,
         'code': 'zh-tw',
         'name': 'Traditional Chinese',
-        'name_local': '\u7e41\u9ad4\u4e2d\u6587',
+        'name_local': '繁體中文',
     }
 }

django/conf/locale/bn/formats.py

@@ -1,6 +1,7 @@
 # -*- 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

django/conf/locale/bs/formats.py

@@ -1,6 +1,7 @@
 # -*- 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

django/conf/locale/ca/formats.py

@@ -1,6 +1,7 @@
 # -*- 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
@@ -21,8 +22,10 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
+    '%d/%m/%Y %H:%M:%S.%f',
     '%d/%m/%Y %H:%M',
     '%d/%m/%y %H:%M:%S',
+    '%d/%m/%y %H:%M:%S.%f',
     '%d/%m/%y %H:%M',
 )
 DECIMAL_SEPARATOR = ','

django/conf/locale/cs/formats.py

@@ -29,10 +29,12 @@ TIME_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',    # '05.01.2006 04:30:59'
+    '%d.%m.%Y %H:%M:%S.%f', # '05.01.2006 04:30:59.000200'
     '%d.%m.%Y %H.%M',       # '05.01.2006 04.30'
     '%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'

django/conf/locale/cy/formats.py

@@ -1,6 +1,7 @@
 # -*- 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

django/conf/locale/da/formats.py

@@ -1,6 +1,7 @@
 # -*- 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
@@ -20,6 +21,7 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',                # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f',             # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',                   # '25.10.2006 14:30'
 )
 DECIMAL_SEPARATOR = ','

django/conf/locale/de/formats.py

@@ -1,6 +1,7 @@
 # -*- 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
@@ -21,6 +22,7 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',    # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',       # '25.10.2006 14:30'
     '%d.%m.%Y',             # '25.10.2006'
 )

django/conf/locale/de_CH/formats.py

@@ -23,6 +23,7 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',    # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',       # '25.10.2006 14:30'
     '%d.%m.%Y',             # '25.10.2006'
 )

django/conf/locale/el/formats.py

@@ -1,6 +1,7 @@
 # -*- 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

django/conf/locale/en/formats.py

@@ -1,6 +1,7 @@
 # -*- 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
@@ -25,12 +26,15 @@ DATE_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'
 )

django/conf/locale/en_GB/formats.py

@@ -1,6 +1,7 @@
 # -*- 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
@@ -24,12 +25,15 @@ DATE_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'
     '%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'
 )

django/conf/locale/es/formats.py

@@ -1,6 +1,7 @@
 # -*- 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
@@ -21,8 +22,10 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
+    '%d/%m/%Y %H:%M:%S.%f',
     '%d/%m/%Y %H:%M',
     '%d/%m/%y %H:%M:%S',
+    '%d/%m/%y %H:%M:%S.%f',
     '%d/%m/%y %H:%M',
 )
 DECIMAL_SEPARATOR = ','

django/conf/locale/es_AR/formats.py

@@ -1,6 +1,7 @@
 # -*- 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
@@ -21,8 +22,10 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
+    '%d/%m/%Y %H:%M:%S.%f',
     '%d/%m/%Y %H:%M',
     '%d/%m/%y %H:%M:%S',
+    '%d/%m/%y %H:%M:%S.%f',
     '%d/%m/%y %H:%M',
 )
 DECIMAL_SEPARATOR = ','

django/conf/locale/es_MX/formats.py

@@ -17,8 +17,10 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
+    '%d/%m/%Y %H:%M:%S.%f',
     '%d/%m/%Y %H:%M',
     '%d/%m/%y %H:%M:%S',
+    '%d/%m/%y %H:%M:%S.%f',
     '%d/%m/%y %H:%M',
 )
 DECIMAL_SEPARATOR = '.'   # ',' is also official (less common): NOM-008-SCFI-2002

django/conf/locale/es_NI/formats.py

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'H:i:s'
@@ -17,8 +18,10 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
+    '%d/%m/%Y %H:%M:%S.%f',
     '%d/%m/%Y %H:%M',
     '%d/%m/%y %H:%M:%S',
+    '%d/%m/%y %H:%M:%S.%f',
     '%d/%m/%y %H:%M',
 )
 DECIMAL_SEPARATOR = '.'

django/conf/locale/es_PR/formats.py

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+from __future__ import unicode_literals
+
+DATE_FORMAT = r'j \d\e F \d\e Y'
+TIME_FORMAT = 'H:i:s'
+DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i'
+YEAR_MONTH_FORMAT = r'F \d\e Y'
+MONTH_DAY_FORMAT = r'j \d\e F'
+SHORT_DATE_FORMAT = 'd/m/Y'
+SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
+FIRST_DAY_OF_WEEK = 0 # Sunday
+
+DATE_INPUT_FORMATS = (
+    # '31/12/2009', '31/12/09'
+    '%d/%m/%Y', '%d/%m/%y'
+)
+DATETIME_INPUT_FORMATS = (
+    '%d/%m/%Y %H:%M:%S',
+    '%d/%m/%Y %H:%M:%S.%f',
+    '%d/%m/%Y %H:%M',
+    '%d/%m/%y %H:%M:%S',
+    '%d/%m/%y %H:%M:%S.%f',
+    '%d/%m/%y %H:%M',
+)
+
+DECIMAL_SEPARATOR = '.'
+THOUSAND_SEPARATOR = ','
+NUMBER_GROUPING = 3

django/conf/locale/eu/formats.py

@@ -1,6 +1,7 @@
 # -*- 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

django/conf/locale/fr/formats.py

@@ -23,9 +23,11 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',    # '25/10/2006 14:30:59'
+    '%d/%m/%Y %H:%M:%S.%f', # '25/10/2006 14:30:59.000200'
     '%d/%m/%Y %H:%M',       # '25/10/2006 14:30'
     '%d/%m/%Y',             # '25/10/2006'
     '%d.%m.%Y %H:%M:%S',    # Swiss (fr_CH), '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f', # Swiss (fr_CH), '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',       # Swiss (fr_CH), '25.10.2006 14:30'
     '%d.%m.%Y',             # Swiss (fr_CH), '25.10.2006'
 )

django/conf/locale/fy_NL/formats.py

@@ -1,6 +1,7 @@
 # -*- 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

django/conf/locale/ga/formats.py

@@ -1,6 +1,7 @@
 # -*- 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

django/conf/locale/hi/formats.py

@@ -1,6 +1,7 @@
 # -*- 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

django/conf/locale/hr/formats.py

@@ -1,6 +1,7 @@
 # -*- 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
@@ -23,18 +24,23 @@ DATE_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'
     '%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.'
     '%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.'
 )