[Python-modules-commits] [python-django] 02/03: Merge tag 'upstream/1.6.6'

Luke Faraone lfaraone at moszumanska.debian.org
Wed Jan 28 20:36:37 UTC 2015


This is an automated email from the git hooks/post-receive script.

lfaraone pushed a commit to branch master
in repository python-django.

commit 745570e8db36d4358db370f4946a917f6de0d282
Merge: 77afcf2 5e2199d
Author: Luke Faraone <luke at faraone.cc>
Date:   Wed Aug 20 19:29:56 2014 -0700

    Merge tag 'upstream/1.6.6'
    
    Upstream version 1.6.6

 AUTHORS                                            |   3 +-
 PKG-INFO                                           |   2 +-
 django/__init__.py                                 |   2 +-
 django/contrib/admin/exceptions.py                 |   5 ++
 django/contrib/admin/options.py                    |  28 ++++--
 django/contrib/admin/views/main.py                 |   7 +-
 django/contrib/auth/forms.py                       |   8 +-
 .../contrib/auth/locale/fr/LC_MESSAGES/django.mo   | Bin 5734 -> 5737 bytes
 .../contrib/auth/locale/fr/LC_MESSAGES/django.po   |   4 +-
 django/contrib/auth/middleware.py                  |  28 ++++--
 django/contrib/auth/models.py                      |   2 +-
 django/contrib/auth/tests/test_remote_user.py      |  18 ++++
 .../gis/db/backends/spatialite/operations.py       |   1 +
 django/contrib/gis/static/gis/js/OLMapWidget.js    |  12 +--
 django/core/checks/compatibility/django_1_6_0.py   |   4 +-
 django/core/files/storage.py                       |  11 ++-
 django/core/handlers/wsgi.py                       |   2 +-
 django/core/mail/message.py                        |   2 +
 .../core/management/commands/createcachetable.py   |   2 +-
 django/core/management/commands/flush.py           |   9 +-
 django/core/management/commands/inspectdb.py       |   2 +-
 django/core/management/commands/runserver.py       |   3 +-
 django/core/urlresolvers.py                        |   6 +-
 django/core/validators.py                          |   4 +-
 django/db/backends/__init__.py                     |   3 +
 django/db/backends/oracle/base.py                  |  61 +++++++++----
 django/db/backends/postgresql_psycopg2/base.py     |   1 +
 django/db/backends/postgresql_psycopg2/creation.py |   4 +-
 django/db/backends/sqlite3/base.py                 |   1 +
 django/db/models/deletion.py                       |   6 +-
 django/db/models/fields/related.py                 |   2 +-
 django/forms/models.py                             |   8 +-
 django/http/multipartparser.py                     |   2 +-
 django/http/request.py                             |  21 +++--
 docs/_ext/djangodocs.py                            |  17 ++--
 docs/_ext/ticket_role.py                           |  38 ++++++++
 docs/_theme/djangodocs/static/djangodocs.css       |   3 +-
 docs/conf.py                                       |  10 ++-
 docs/faq/models.txt                                |   2 +-
 docs/howto/custom-file-storage.txt                 |  13 ++-
 docs/howto/custom-management-commands.txt          |   4 +
 docs/howto/custom-model-fields.txt                 |  20 ++---
 docs/howto/deployment/wsgi/gunicorn.txt            |  35 +-------
 docs/howto/jython.txt                              |  14 +--
 docs/internals/contributing/committing-code.txt    |   2 +-
 .../contributing/writing-code/working-with-git.txt |   5 +-
 .../contributing/writing-documentation.txt         |   4 +
 docs/internals/howto-release-django.txt            |   2 +-
 docs/intro/contributing.txt                        |   8 +-
 docs/intro/index.txt                               |   4 +-
 docs/intro/tutorial01.txt                          |   7 +-
 docs/intro/tutorial05.txt                          |   4 +-
 docs/ref/class-based-views/base.txt                |   2 +-
 docs/ref/class-based-views/index.txt               |   6 +-
 .../ref/class-based-views/mixins-single-object.txt |   4 +
 docs/ref/contrib/admin/index.txt                   |   7 +-
 docs/ref/contrib/auth.txt                          |  38 ++++----
 docs/ref/contrib/csrf.txt                          |   3 +-
 docs/ref/contrib/formtools/form-wizard.txt         |  34 ++++----
 docs/ref/contrib/gis/db-api.txt                    |   8 +-
 docs/ref/contrib/gis/geoquerysets.txt              |   6 +-
 docs/ref/contrib/gis/geos.txt                      |  19 ++--
 docs/ref/contrib/sitemaps.txt                      |   6 +-
 docs/ref/databases.txt                             |  42 +++++----
 docs/ref/django-admin.txt                          |  11 ++-
 docs/ref/exceptions.txt                            |   1 +
 docs/ref/files/storage.txt                         |  11 +++
 docs/ref/forms/api.txt                             |  27 +++++-
 docs/ref/forms/fields.txt                          |   2 +-
 docs/ref/forms/widgets.txt                         |   2 +-
 docs/ref/middleware.txt                            |   8 --
 docs/ref/models/fields.txt                         |  22 ++++-
 docs/ref/models/querysets.txt                      |  40 +++++++--
 docs/ref/request-response.txt                      |  56 ++++++++----
 docs/ref/settings.txt                              |  11 ++-
 docs/ref/templates/api.txt                         |  14 +--
 docs/ref/templates/builtins.txt                    |  30 +++++--
 docs/ref/unicode.txt                               |   6 +-
 docs/ref/utils.txt                                 |  10 ++-
 docs/releases/1.4.11.txt                           |   2 +-
 docs/releases/1.4.13.txt                           |  18 ++--
 docs/releases/1.4.14.txt                           |  64 ++++++++++++++
 docs/releases/1.5-alpha-1.txt                      |   2 +-
 docs/releases/1.5-beta-1.txt                       |   2 +-
 docs/releases/1.5.6.txt                            |   2 +-
 docs/releases/1.5.8.txt                            |  16 ++--
 docs/releases/1.5.9.txt                            |  64 ++++++++++++++
 docs/releases/1.5.txt                              |   4 +-
 docs/releases/1.6.3.txt                            |   2 +-
 docs/releases/1.6.5.txt                            |  13 +--
 docs/releases/1.6.6.txt                            |  97 +++++++++++++++++++++
 docs/releases/1.6.txt                              |   4 +-
 docs/releases/index.txt                            |   6 ++
 docs/topics/auth/customizing.txt                   |  12 ++-
 docs/topics/auth/default.txt                       |  29 +++---
 docs/topics/cache.txt                              |  19 ++--
 docs/topics/db/models.txt                          |  42 +++++----
 docs/topics/db/queries.txt                         |  14 +--
 docs/topics/db/sql.txt                             |  14 ++-
 docs/topics/db/transactions.txt                    |   2 +-
 docs/topics/forms/modelforms.txt                   |   2 +
 docs/topics/http/file-uploads.txt                  |   4 +-
 docs/topics/http/middleware.txt                    |   2 +-
 docs/topics/http/sessions.txt                      |  13 +--
 docs/topics/http/shortcuts.txt                     |   2 +-
 docs/topics/http/urls.txt                          |   2 +-
 docs/topics/i18n/timezones.txt                     |  19 ++--
 docs/topics/i18n/translation.txt                   |   2 +-
 docs/topics/settings.txt                           |   2 +-
 docs/topics/testing/tools.txt                      |  21 +++--
 tests/admin_views/tests.py                         |  23 ++++-
 tests/bug639/models.py                             |   3 +-
 tests/cache/tests.py                               |  16 ++--
 tests/file_storage/tests.py                        |  21 +++--
 tests/file_uploads/tests.py                        |   2 +-
 tests/files/tests.py                               |  22 +++--
 tests/generic_relations_regress/models.py          |  24 +++++
 tests/generic_relations_regress/tests.py           |  15 +++-
 tests/handlers/tests.py                            |  30 +++++--
 tests/indexes/models.py                            |  25 ++++++
 tests/indexes/tests.py                             |   9 +-
 tests/model_fields/models.py                       |   8 +-
 tests/model_fields/tests.py                        |  14 ++-
 tests/model_formsets_regress/models.py             |   9 ++
 tests/model_formsets_regress/tests.py              |  36 +++++++-
 tests/urlpatterns_reverse/tests.py                 |   3 +
 tests/urlpatterns_reverse/urls.py                  |   3 +
 tests/validators/tests.py                          |   2 +
 tests/view_tests/tests/test_i18n.py                |  22 +++--
 129 files changed, 1209 insertions(+), 467 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git



More information about the Python-modules-commits mailing list