[Python-modules-commits] [djangorestframework] 05/12: merge patched into master
Brian May
bam at moszumanska.debian.org
Fri Jul 15 10:42:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository djangorestframework.
commit 8ecb39f657406a0740b9c67e73dfd7f2a0fee68b
Merge: 8344816 952392f
Author: Brian May <bam at debian.org>
Date: Fri Jul 15 18:47:54 2016 +1000
merge patched into master
.gitignore | 1 +
.travis.yml | 26 +-
CONTRIBUTING.md | 9 +-
ISSUE_TEMPLATE.md | 14 +
PULL_REQUEST_TEMPLATE.md | 5 +
README.md | 28 +-
debian/.git-dpm | 6 +-
debian/patches/remove_google_analytics.patch | 8 +-
debian/patches/remove_remote_resources.patch | 6 +-
docs/api-guide/authentication.md | 53 +--
docs/api-guide/content-negotiation.md | 2 +-
docs/api-guide/fields.md | 13 +-
docs/api-guide/filtering.md | 18 +-
docs/api-guide/format-suffixes.md | 2 +-
docs/api-guide/generic-views.md | 2 +-
docs/api-guide/pagination.md | 4 +-
docs/api-guide/parsers.md | 14 +-
docs/api-guide/permissions.md | 4 +-
docs/api-guide/relations.md | 2 +-
docs/api-guide/renderers.md | 8 +-
docs/api-guide/requests.md | 4 -
docs/api-guide/routers.md | 6 +-
docs/api-guide/schemas.md | 422 +++++++++++++++++++
docs/api-guide/serializers.md | 45 ++-
docs/api-guide/settings.md | 4 +-
docs/api-guide/throttling.md | 2 +-
docs/api-guide/validators.md | 73 +++-
docs/api-guide/views.md | 6 +-
docs/api-guide/viewsets.md | 2 +-
docs/img/corejson-format.png | Bin 0 -> 20499 bytes
docs/img/premium/rover-readme.png | Bin 0 -> 53118 bytes
docs/img/premium/sentry-readme.png | Bin 0 -> 24584 bytes
docs/img/premium/stream-readme.png | Bin 0 -> 19341 bytes
docs/img/rover.png | Bin 0 -> 61259 bytes
docs/index.md | 60 ++-
docs/topics/2.3-announcement.md | 2 +-
docs/topics/2.4-announcement.md | 2 +-
docs/topics/3.0-announcement.md | 4 +-
docs/topics/3.1-announcement.md | 4 +-
docs/topics/3.2-announcement.md | 2 +-
docs/topics/3.4-announcement.md | 194 +++++++++
docs/topics/api-clients.md | 325 +++++++++++++++
docs/topics/browsable-api.md | 2 +-
docs/topics/contributing.md | 2 +-
docs/topics/funding.md | 189 +++++----
docs/topics/mozilla-grant.md | 67 +++
docs/topics/project-management.md | 2 +-
docs/topics/release-notes.md | 180 ++++++++-
docs/topics/third-party-resources.md | 18 +-
docs/tutorial/2-requests-and-responses.md | 10 +-
docs/tutorial/3-class-based-views.md | 14 +-
docs/tutorial/4-authentication-and-permissions.md | 2 +-
.../5-relationships-and-hyperlinked-apis.md | 6 +-
docs/tutorial/6-viewsets-and-routers.md | 26 +-
docs/tutorial/7-schemas-and-client-libraries.md | 221 ++++++++++
docs/tutorial/quickstart.md | 6 +-
docs_theme/base.html | 18 +-
mkdocs.yml | 6 +
requirements/requirements-codestyle.txt | 2 +-
requirements/requirements-documentation.txt | 2 +-
requirements/requirements-optionals.txt | 5 +-
requirements/requirements-packaging.txt | 4 +-
requirements/requirements-testing.txt | 2 +-
rest_framework/__init__.py | 2 +-
rest_framework/authentication.py | 11 +-
.../authtoken/migrations/0001_initial.py | 2 +-
.../migrations/0002_auto_20160226_1747.py | 2 +-
rest_framework/authtoken/models.py | 12 +-
rest_framework/compat.py | 165 ++++----
rest_framework/decorators.py | 1 -
rest_framework/exceptions.py | 4 +-
rest_framework/fields.py | 59 +--
rest_framework/filters.py | 122 ++++--
rest_framework/generics.py | 3 -
rest_framework/locale/ach/LC_MESSAGES/django.mo | Bin 513 -> 513 bytes
rest_framework/locale/ach/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/ar/LC_MESSAGES/django.mo | Bin 4766 -> 5476 bytes
rest_framework/locale/ar/LC_MESSAGES/django.po | 215 +++++-----
rest_framework/locale/be/LC_MESSAGES/django.mo | Bin 655 -> 655 bytes
rest_framework/locale/be/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/ca/LC_MESSAGES/django.mo | Bin 9646 -> 9646 bytes
rest_framework/locale/ca/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/ca_ES/LC_MESSAGES/django.mo | Bin 528 -> 528 bytes
rest_framework/locale/ca_ES/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/cs/LC_MESSAGES/django.mo | Bin 9031 -> 9031 bytes
rest_framework/locale/cs/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/da/LC_MESSAGES/django.mo | Bin 9881 -> 9881 bytes
rest_framework/locale/da/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/da_DK/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes
rest_framework/locale/da_DK/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/de/LC_MESSAGES/django.mo | Bin 10364 -> 10609 bytes
rest_framework/locale/de/LC_MESSAGES/django.po | 202 +++++-----
rest_framework/locale/el/LC_MESSAGES/django.mo | Bin 512 -> 13507 bytes
rest_framework/locale/el/LC_MESSAGES/django.po | 379 +++++++++--------
rest_framework/locale/el_GR/LC_MESSAGES/django.mo | Bin 527 -> 527 bytes
rest_framework/locale/el_GR/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/en/LC_MESSAGES/django.mo | Bin 10002 -> 10226 bytes
rest_framework/locale/en/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/en_AU/LC_MESSAGES/django.mo | Bin 532 -> 532 bytes
rest_framework/locale/en_AU/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/en_CA/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes
rest_framework/locale/en_CA/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/en_US/LC_MESSAGES/django.mo | Bin 378 -> 378 bytes
rest_framework/locale/en_US/LC_MESSAGES/django.po | 182 ++++-----
rest_framework/locale/es/LC_MESSAGES/django.mo | Bin 10782 -> 10779 bytes
rest_framework/locale/es/LC_MESSAGES/django.po | 192 ++++-----
rest_framework/locale/et/LC_MESSAGES/django.mo | Bin 8732 -> 8732 bytes
rest_framework/locale/et/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/fa/LC_MESSAGES/django.mo | Bin 507 -> 507 bytes
rest_framework/locale/fa/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/fa_IR/LC_MESSAGES/django.mo | Bin 520 -> 520 bytes
rest_framework/locale/fa_IR/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/fi/LC_MESSAGES/django.mo | Bin 9993 -> 9993 bytes
rest_framework/locale/fi/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/fr/LC_MESSAGES/django.mo | Bin 10770 -> 10770 bytes
rest_framework/locale/fr/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/fr_CA/LC_MESSAGES/django.mo | Bin 527 -> 527 bytes
rest_framework/locale/fr_CA/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/gl/LC_MESSAGES/django.mo | Bin 515 -> 515 bytes
rest_framework/locale/gl/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/gl_ES/LC_MESSAGES/django.mo | Bin 669 -> 669 bytes
rest_framework/locale/gl_ES/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/he_IL/LC_MESSAGES/django.mo | Bin 528 -> 528 bytes
rest_framework/locale/he_IL/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/hu/LC_MESSAGES/django.mo | Bin 9123 -> 9123 bytes
rest_framework/locale/hu/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/id/LC_MESSAGES/django.mo | Bin 510 -> 510 bytes
rest_framework/locale/id/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/it/LC_MESSAGES/django.mo | Bin 10359 -> 10359 bytes
rest_framework/locale/it/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/ja/LC_MESSAGES/django.mo | Bin 11941 -> 11941 bytes
rest_framework/locale/ja/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/ko_KR/LC_MESSAGES/django.mo | Bin 10022 -> 10022 bytes
rest_framework/locale/ko_KR/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/mk/LC_MESSAGES/django.mo | Bin 10623 -> 10623 bytes
rest_framework/locale/mk/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/nb/LC_MESSAGES/django.mo | Bin 9803 -> 9803 bytes
rest_framework/locale/nb/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/nl/LC_MESSAGES/django.mo | Bin 9165 -> 10373 bytes
rest_framework/locale/nl/LC_MESSAGES/django.po | 303 +++++++-------
rest_framework/locale/nn/LC_MESSAGES/django.mo | Bin 524 -> 524 bytes
rest_framework/locale/nn/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/no/LC_MESSAGES/django.mo | Bin 516 -> 516 bytes
rest_framework/locale/no/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/pl/LC_MESSAGES/django.mo | Bin 10799 -> 10801 bytes
rest_framework/locale/pl/LC_MESSAGES/django.po | 188 ++++-----
rest_framework/locale/pt/LC_MESSAGES/django.mo | Bin 517 -> 517 bytes
rest_framework/locale/pt/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/pt_BR/LC_MESSAGES/django.mo | Bin 10238 -> 10238 bytes
rest_framework/locale/pt_BR/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/pt_PT/LC_MESSAGES/django.mo | Bin 534 -> 534 bytes
rest_framework/locale/pt_PT/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/ro/LC_MESSAGES/django.mo | Bin 556 -> 10895 bytes
rest_framework/locale/ro/LC_MESSAGES/django.po | 379 +++++++++--------
rest_framework/locale/ru/LC_MESSAGES/django.mo | Bin 11360 -> 13430 bytes
rest_framework/locale/ru/LC_MESSAGES/django.po | 237 +++++------
rest_framework/locale/sk/LC_MESSAGES/django.mo | Bin 9411 -> 9411 bytes
rest_framework/locale/sk/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/sv/LC_MESSAGES/django.mo | Bin 10073 -> 10426 bytes
rest_framework/locale/sv/LC_MESSAGES/django.po | 206 +++++-----
rest_framework/locale/tr/LC_MESSAGES/django.mo | Bin 10548 -> 10550 bytes
rest_framework/locale/tr/LC_MESSAGES/django.po | 188 ++++-----
rest_framework/locale/tr_TR/LC_MESSAGES/django.mo | Bin 10520 -> 10522 bytes
rest_framework/locale/tr_TR/LC_MESSAGES/django.po | 188 ++++-----
rest_framework/locale/uk/LC_MESSAGES/django.mo | Bin 590 -> 13352 bytes
rest_framework/locale/uk/LC_MESSAGES/django.po | 381 +++++++++---------
rest_framework/locale/vi/LC_MESSAGES/django.mo | Bin 510 -> 510 bytes
rest_framework/locale/vi/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/zh_CN/LC_MESSAGES/django.mo | Bin 10007 -> 10007 bytes
rest_framework/locale/zh_CN/LC_MESSAGES/django.po | 186 ++++-----
.../{zh-Hans => zh_Hans}/LC_MESSAGES/django.mo | Bin 9796 -> 9796 bytes
.../{zh-Hans => zh_Hans}/LC_MESSAGES/django.po | 188 ++++-----
.../{zh-Hant => zh_Hant}/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes
.../{zh-Hant => zh_Hant}/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/locale/zh_TW/LC_MESSAGES/django.mo | Bin 522 -> 522 bytes
rest_framework/locale/zh_TW/LC_MESSAGES/django.po | 186 ++++-----
rest_framework/metadata.py | 4 +-
rest_framework/pagination.py | 65 ++-
rest_framework/parsers.py | 5 -
rest_framework/permissions.py | 2 +-
rest_framework/relations.py | 9 +-
rest_framework/renderers.py | 84 ++--
rest_framework/request.py | 2 +
rest_framework/response.py | 3 +-
rest_framework/routers.py | 50 ++-
rest_framework/schemas.py | 300 ++++++++++++++
rest_framework/serializers.py | 53 ++-
rest_framework/settings.py | 4 +-
.../static/rest_framework/js/ajax-form.js | 169 ++++----
rest_framework/static/rest_framework/js/csrf.js | 71 ++--
rest_framework/static/rest_framework/js/default.js | 72 ++--
.../static/rest_framework/js/jquery-1.11.3.min.js | 5 -
.../static/rest_framework/js/jquery-1.12.4.min.js | 5 +
rest_framework/templates/rest_framework/admin.html | 447 +++++++++++----------
.../templates/rest_framework/admin/detail.html | 12 +-
.../templates/rest_framework/admin/list.html | 34 +-
.../templates/rest_framework/admin/list_value.html | 16 +-
rest_framework/templates/rest_framework/base.html | 438 ++++++++++----------
.../rest_framework/horizontal/checkbox.html | 2 +-
.../horizontal/checkbox_multiple.html | 2 +-
.../templates/rest_framework/horizontal/input.html | 2 +-
.../templates/rest_framework/horizontal/radio.html | 2 +-
.../rest_framework/horizontal/select.html | 2 +-
.../rest_framework/horizontal/select_multiple.html | 2 +-
.../rest_framework/horizontal/textarea.html | 2 +-
.../templates/rest_framework/raw_data_form.html | 2 +-
.../rest_framework/vertical/checkbox.html | 2 +-
.../rest_framework/vertical/checkbox_multiple.html | 2 +-
.../templates/rest_framework/vertical/input.html | 2 +-
.../templates/rest_framework/vertical/radio.html | 2 +-
.../templates/rest_framework/vertical/select.html | 2 +-
.../rest_framework/vertical/select_multiple.html | 2 +-
.../rest_framework/vertical/textarea.html | 2 +-
rest_framework/test.py | 11 +-
rest_framework/throttling.py | 2 +-
rest_framework/urlpatterns.py | 2 +-
rest_framework/utils/breadcrumbs.py | 7 +-
rest_framework/utils/encoders.py | 12 +-
rest_framework/utils/html.py | 6 +-
rest_framework/utils/model_meta.py | 63 +--
rest_framework/utils/representation.py | 8 +-
rest_framework/utils/serializer_helpers.py | 4 +-
rest_framework/validators.py | 41 +-
rest_framework/versioning.py | 13 +-
rest_framework/views.py | 12 +-
rest_framework/viewsets.py | 1 +
runtests.py | 2 +-
schema-support | 0
setup.py | 3 +-
tests/browsable_api/test_browsable_api.py | 22 +-
tests/browsable_api/test_browsable_nested_api.py | 4 +-
tests/browsable_api/test_form_rendering.py | 53 +++
tests/browsable_api/views.py | 3 +-
tests/conftest.py | 19 +-
tests/description.py | 25 --
tests/models.py | 29 +-
tests/test_authentication.py | 235 ++++++++---
tests/test_description.py | 16 +-
tests/test_exceptions.py | 21 +
tests/test_fields.py | 63 ++-
tests/test_filters.py | 85 +++-
tests/test_generics.py | 7 +-
tests/test_htmlrenderer.py | 8 +-
tests/test_metadata.py | 16 +-
tests/test_middleware.py | 6 +-
tests/test_model_serializer.py | 57 ++-
tests/test_multitable_inheritance.py | 4 +-
tests/test_pagination.py | 13 +
tests/test_permissions.py | 2 +
tests/test_relations_generic.py | 2 +-
tests/test_relations_hyperlink.py | 26 +-
tests/test_relations_pk.py | 38 +-
tests/test_relations_slug.py | 3 +
tests/test_renderers.py | 16 +-
tests/test_request.py | 9 +-
tests/test_response.py | 21 +-
tests/test_reverse.py | 5 +-
tests/test_routers.py | 13 +-
tests/test_schemas.py | 137 +++++++
tests/test_serializer_bulk_update.py | 2 +
tests/test_serializer_nested.py | 29 ++
tests/test_settings.py | 7 +-
tests/test_testing.py | 5 +-
tests/test_utils.py | 30 +-
tests/test_validation.py | 1 +
tests/test_validators.py | 85 ++++
tests/test_versioning.py | 45 ++-
tests/test_write_only_fields.py | 4 +-
tests/utils.py | 24 --
tox.ini | 19 +-
270 files changed, 9003 insertions(+), 7132 deletions(-)
diff --cc debian/.git-dpm
index d0390ff,0000000..51a6dcd
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- e3d85ceaf201fc63ccc1b2849f00c26c43e527a7
- e3d85ceaf201fc63ccc1b2849f00c26c43e527a7
- def521859a25262c982825f26af67f2e29cf5cbc
++952392f91a2177bbc41cfed8ae76579a9c81b266
++952392f91a2177bbc41cfed8ae76579a9c81b266
++a05b6ba96710a9b0bf3f3ba34c84a6eb32d1cc53
+a05b6ba96710a9b0bf3f3ba34c84a6eb32d1cc53
+djangorestframework_3.4.0.orig.tar.gz
+b37fe03ba071537396543ef389d26035c9bf93ae
+2830352
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove_google_analytics.patch
index b96e73c,0000000..69e3fec
mode 100644,000000..100644
--- a/debian/patches/remove_google_analytics.patch
+++ b/debian/patches/remove_google_analytics.patch
@@@ -1,36 -1,0 +1,36 @@@
- From e3d85ceaf201fc63ccc1b2849f00c26c43e527a7 Mon Sep 17 00:00:00 2001
++From 952392f91a2177bbc41cfed8ae76579a9c81b266 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 08:58:40 -0700
+Subject: remove_google_analytics
+
+Patch-Name: remove_google_analytics.patch
+---
+ docs_theme/base.html | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/docs_theme/base.html b/docs_theme/base.html
- index 369927b..0b4af51 100644
++index 6cb929d..d60fbce 100644
+--- a/docs_theme/base.html
++++ b/docs_theme/base.html
+@@ -22,21 +22,6 @@
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+- <script type="text/javascript">
+- var _gaq = _gaq || [];
+- _gaq.push(['_setAccount', 'UA-18852272-2']);
+- _gaq.push(['_trackPageview']);
+-
+- (function() {
+- var ga = document.createElement('script');
+- ga.type = 'text/javascript';
+- ga.async = true;
+- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+- var s = document.getElementsByTagName('script')[0];
+- s.parentNode.insertBefore(ga, s);
+- })();
+- </script>
+-
+ <style>
- span.fusion-wrap a {
- display: block;
++ #sidebarInclude img {
++ margin-bottom: 10px;
diff --cc debian/patches/remove_remote_resources.patch
index 81ccc04,0000000..76fe4c2
mode 100644,000000..100644
--- a/debian/patches/remove_remote_resources.patch
+++ b/debian/patches/remove_remote_resources.patch
@@@ -1,25 -1,0 +1,25 @@@
- From ad7e73195912449c6e6a07719df3ecb3497b0997 Mon Sep 17 00:00:00 2001
++From 656f93cba71bafc92d17ee336df9aff4f9bf22ce Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 08:58:39 -0700
+Subject: Removed remote resouces in index.md
+
+Last-Update: 2014-06-10
+Patch-Name: remove_remote_resources.patch
+---
+ docs/index.md | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/docs/index.md b/docs/index.md
- index a2635c0..78318c1 100644
++index f64056c..a0f6093 100644
+--- a/docs/index.md
++++ b/docs/index.md
- @@ -220,9 +220,6 @@ For support please see the [REST framework discussion group][group], try the `#
++@@ -263,9 +263,6 @@ For support please see the [REST framework discussion group][group], try the `#
+
+ For updates on REST framework development, you may also want to follow [the author][twitter] on Twitter.
+
+-<a style="padding-top: 10px" href="https://twitter.com/_tomchristie" class="twitter-follow-button" data-show-count="false">Follow @_tomchristie</a>
+-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+-
+ ## Security
+
+ If you believe you’ve found something in Django REST framework which has security implications, please **do not raise the issue in a public forum**.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/djangorestframework.git
More information about the Python-modules-commits
mailing list