[Python-modules-commits] [djangorestframework] 05/06: merge patched into master
Brian May
bam at moszumanska.debian.org
Tue Oct 20 07:57:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository djangorestframework.
commit bd6c6966d3aaf74a9313a39081e285acc66f8735
Merge: cb1c7cd d114753
Author: Brian May <bam at debian.org>
Date: Tue Oct 20 17:55:14 2015 +1100
merge patched into master
.gitignore | 1 +
.isort.cfg | 6 +
.travis.yml | 28 +-
.tx/config | 9 +
CONTRIBUTING.md | 73 +-
LICENSE.md | 24 +
MANIFEST.in | 2 +
README.md | 86 +-
debian/.git-dpm | 6 +-
debian/patches/remove_google_analytics.patch | 4 +-
debian/patches/remove_remote_resources.patch | 6 +-
docs/api-guide/authentication.md | 155 +--
docs/api-guide/exceptions.md | 24 +-
docs/api-guide/fields.md | 63 +-
docs/api-guide/filtering.md | 9 +-
docs/api-guide/generic-views.md | 67 +-
docs/api-guide/metadata.md | 14 +-
docs/api-guide/pagination.md | 342 ++++--
docs/api-guide/parsers.md | 100 +-
docs/api-guide/permissions.md | 46 +-
docs/api-guide/relations.md | 175 +++-
docs/api-guide/renderers.md | 220 ++--
docs/api-guide/requests.md | 14 -
docs/api-guide/routers.md | 10 +-
docs/api-guide/serializers.md | 93 +-
docs/api-guide/settings.md | 46 +-
docs/api-guide/testing.md | 12 +-
docs/api-guide/validators.md | 20 +-
docs/api-guide/versioning.md | 220 ++++
docs/api-guide/viewsets.md | 11 +-
docs/img/admin.png | Bin 0 -> 55904 bytes
docs/img/cursor-pagination.png | Bin 0 -> 12221 bytes
docs/img/link-header-pagination.png | Bin 0 -> 35799 bytes
docs/img/pages-pagination.png | Bin 0 -> 10229 bytes
docs/index.md | 54 +-
docs/topics/3.0-announcement.md | 2 +-
docs/topics/3.1-announcement.md | 209 ++++
docs/topics/3.2-announcement.md | 113 ++
docs/topics/browsable-api.md | 3 +-
docs/topics/credits.md | 404 --------
docs/topics/internationalization.md | 113 ++
docs/topics/project-management.md | 69 +-
docs/topics/release-notes.md | 818 +++++----------
docs/topics/rest-hypermedia-hateoas.md | 2 +-
docs/topics/third-party-resources.md | 21 +-
docs/topics/writable-nested-serializers.md | 4 +-
docs/tutorial/1-serialization.md | 5 +-
docs/tutorial/2-requests-and-responses.md | 10 +-
.../5-relationships-and-hyperlinked-apis.md | 8 +-
docs/tutorial/quickstart.md | 8 +-
docs_theme/404.html | 219 +---
docs_theme/base.html | 107 +-
docs_theme/css/default.css | 43 +-
docs_theme/js/theme.js | 34 +-
docs_theme/nav.html | 3 +-
mkdocs.yml | 100 +-
requirements.txt | 39 +-
requirements/requirements-codestyle.txt | 6 +
requirements/requirements-documentation.txt | 2 +
requirements/requirements-optionals.txt | 4 +
requirements/requirements-packaging.txt | 8 +
requirements/requirements-testing.txt | 4 +
rest_framework/__init__.py | 2 +-
rest_framework/authentication.py | 226 +---
rest_framework/authtoken/admin.py | 1 +
.../authtoken/migrations/0001_initial.py | 2 +-
rest_framework/authtoken/models.py | 1 -
rest_framework/authtoken/serializers.py | 4 +-
rest_framework/authtoken/views.py | 10 +-
rest_framework/compat.py | 182 +---
rest_framework/decorators.py | 5 +-
rest_framework/exceptions.py | 52 +-
rest_framework/fields.py | 498 ++++++---
rest_framework/filters.py | 51 +-
rest_framework/generics.py | 232 ++---
rest_framework/locale/ar/LC_MESSAGES/django.mo | Bin 0 -> 4888 bytes
rest_framework/locale/ar/LC_MESSAGES/django.po | 366 +++++++
rest_framework/locale/be/LC_MESSAGES/django.mo | Bin 0 -> 655 bytes
rest_framework/locale/be/LC_MESSAGES/django.po | 365 +++++++
rest_framework/locale/cs/LC_MESSAGES/django.mo | Bin 0 -> 9140 bytes
rest_framework/locale/cs/LC_MESSAGES/django.po | 367 +++++++
rest_framework/locale/da/LC_MESSAGES/django.mo | Bin 0 -> 8905 bytes
rest_framework/locale/da/LC_MESSAGES/django.po | 366 +++++++
rest_framework/locale/de/LC_MESSAGES/django.mo | Bin 0 -> 9544 bytes
rest_framework/locale/de/LC_MESSAGES/django.po | 369 +++++++
rest_framework/locale/en/LC_MESSAGES/django.mo | Bin 0 -> 9406 bytes
rest_framework/locale/en/LC_MESSAGES/django.po | 365 +++++++
rest_framework/locale/en_CA/LC_MESSAGES/django.mo | Bin 0 -> 529 bytes
rest_framework/locale/en_CA/LC_MESSAGES/django.po | 365 +++++++
rest_framework/locale/en_US/LC_MESSAGES/django.mo | Bin 0 -> 378 bytes
rest_framework/locale/en_US/LC_MESSAGES/django.po | 363 +++++++
rest_framework/locale/es/LC_MESSAGES/django.mo | Bin 0 -> 9844 bytes
rest_framework/locale/es/LC_MESSAGES/django.po | 370 +++++++
rest_framework/locale/et/LC_MESSAGES/django.mo | Bin 0 -> 8836 bytes
rest_framework/locale/et/LC_MESSAGES/django.po | 366 +++++++
rest_framework/locale/fr/LC_MESSAGES/django.mo | Bin 0 -> 9389 bytes
rest_framework/locale/fr/LC_MESSAGES/django.po | 369 +++++++
rest_framework/locale/fr_CA/LC_MESSAGES/django.mo | Bin 0 -> 527 bytes
rest_framework/locale/fr_CA/LC_MESSAGES/django.po | 365 +++++++
rest_framework/locale/gl/LC_MESSAGES/django.mo | Bin 0 -> 515 bytes
rest_framework/locale/gl/LC_MESSAGES/django.po | 365 +++++++
rest_framework/locale/gl_ES/LC_MESSAGES/django.mo | Bin 0 -> 669 bytes
rest_framework/locale/gl_ES/LC_MESSAGES/django.po | 366 +++++++
rest_framework/locale/hu/LC_MESSAGES/django.mo | Bin 0 -> 9228 bytes
rest_framework/locale/hu/LC_MESSAGES/django.po | 366 +++++++
rest_framework/locale/id/LC_MESSAGES/django.mo | Bin 0 -> 510 bytes
rest_framework/locale/id/LC_MESSAGES/django.po | 365 +++++++
rest_framework/locale/it/LC_MESSAGES/django.mo | Bin 0 -> 9512 bytes
rest_framework/locale/it/LC_MESSAGES/django.po | 369 +++++++
rest_framework/locale/ko_KR/LC_MESSAGES/django.mo | Bin 0 -> 10148 bytes
rest_framework/locale/ko_KR/LC_MESSAGES/django.po | 366 +++++++
rest_framework/locale/mk/LC_MESSAGES/django.mo | Bin 0 -> 10744 bytes
rest_framework/locale/mk/LC_MESSAGES/django.po | 366 +++++++
rest_framework/locale/nb/LC_MESSAGES/django.mo | Bin 0 -> 524 bytes
rest_framework/locale/nb/LC_MESSAGES/django.po | 365 +++++++
rest_framework/locale/nl/LC_MESSAGES/django.mo | Bin 0 -> 9267 bytes
rest_framework/locale/nl/LC_MESSAGES/django.po | 366 +++++++
rest_framework/locale/pl/LC_MESSAGES/django.mo | Bin 0 -> 9602 bytes
rest_framework/locale/pl/LC_MESSAGES/django.po | 368 +++++++
rest_framework/locale/pt/LC_MESSAGES/django.mo | Bin 0 -> 517 bytes
rest_framework/locale/pt/LC_MESSAGES/django.po | 365 +++++++
rest_framework/locale/pt_BR/LC_MESSAGES/django.mo | Bin 0 -> 9204 bytes
rest_framework/locale/pt_BR/LC_MESSAGES/django.po | 367 +++++++
rest_framework/locale/pt_PT/LC_MESSAGES/django.mo | Bin 0 -> 534 bytes
rest_framework/locale/pt_PT/LC_MESSAGES/django.po | 365 +++++++
rest_framework/locale/ru/LC_MESSAGES/django.mo | Bin 0 -> 11487 bytes
rest_framework/locale/ru/LC_MESSAGES/django.po | 368 +++++++
rest_framework/locale/sk/LC_MESSAGES/django.mo | Bin 0 -> 9524 bytes
rest_framework/locale/sk/LC_MESSAGES/django.po | 366 +++++++
rest_framework/locale/sv/LC_MESSAGES/django.mo | Bin 0 -> 9519 bytes
rest_framework/locale/sv/LC_MESSAGES/django.po | 367 +++++++
rest_framework/locale/tr/LC_MESSAGES/django.mo | Bin 0 -> 9211 bytes
rest_framework/locale/tr/LC_MESSAGES/django.po | 371 +++++++
rest_framework/locale/tr_TR/LC_MESSAGES/django.mo | Bin 0 -> 522 bytes
rest_framework/locale/tr_TR/LC_MESSAGES/django.po | 365 +++++++
rest_framework/locale/uk/LC_MESSAGES/django.mo | Bin 0 -> 590 bytes
rest_framework/locale/uk/LC_MESSAGES/django.po | 365 +++++++
rest_framework/locale/vi/LC_MESSAGES/django.mo | Bin 0 -> 510 bytes
rest_framework/locale/vi/LC_MESSAGES/django.po | 365 +++++++
rest_framework/locale/zh_CN/LC_MESSAGES/django.mo | Bin 0 -> 9261 bytes
rest_framework/locale/zh_CN/LC_MESSAGES/django.po | 367 +++++++
rest_framework/metadata.py | 20 +-
rest_framework/mixins.py | 12 +-
rest_framework/negotiation.py | 19 +-
rest_framework/pagination.py | 764 +++++++++++++-
rest_framework/parsers.py | 113 +-
rest_framework/permissions.py | 78 +-
rest_framework/relations.py | 161 ++-
rest_framework/renderers.py | 277 ++---
rest_framework/request.py | 114 +-
rest_framework/response.py | 16 +-
rest_framework/reverse.py | 48 +-
rest_framework/routers.py | 58 +-
rest_framework/serializers.py | 827 ++++++++++-----
rest_framework/settings.py | 42 +-
.../static/rest_framework/css/bootstrap-tweaks.css | 45 +-
.../static/rest_framework/css/default.css | 11 +-
rest_framework/static/rest_framework/js/default.js | 8 +
rest_framework/templates/rest_framework/admin.html | 231 +++++
.../templates/rest_framework/admin/detail.html | 10 +
.../templates/rest_framework/admin/dict_value.html | 0
.../templates/rest_framework/admin/list.html | 21 +
.../templates/rest_framework/admin/list_value.html | 11 +
.../rest_framework/admin/simple_list_value.html | 2 +
.../templates/rest_framework/api_form.html | 6 +-
rest_framework/templates/rest_framework/base.html | 453 ++++----
.../rest_framework/horizontal/checkbox.html | 35 +-
.../horizontal/checkbox_multiple.html | 57 +-
.../rest_framework/horizontal/fieldset.html | 21 +-
.../templates/rest_framework/horizontal/form.html | 23 +-
.../templates/rest_framework/horizontal/input.html | 29 +-
.../rest_framework/horizontal/list_fieldset.html | 23 +-
.../templates/rest_framework/horizontal/radio.html | 63 +-
.../rest_framework/horizontal/select.html | 49 +-
.../rest_framework/horizontal/select_multiple.html | 48 +-
.../rest_framework/horizontal/textarea.html | 29 +-
.../templates/rest_framework/inline/checkbox.html | 12 +-
.../rest_framework/inline/checkbox_multiple.html | 19 +-
.../templates/rest_framework/inline/fieldset.html | 6 +-
.../templates/rest_framework/inline/form.html | 16 +-
.../templates/rest_framework/inline/input.html | 11 +-
.../templates/rest_framework/inline/radio.html | 37 +-
.../templates/rest_framework/inline/select.html | 27 +-
.../rest_framework/inline/select_multiple.html | 30 +-
.../templates/rest_framework/inline/textarea.html | 11 +-
.../templates/rest_framework/login_base.html | 124 ++-
.../rest_framework/pagination/numbers.html | 47 +
.../pagination/previous_and_next.html | 21 +
.../templates/rest_framework/raw_data_form.html | 12 +-
.../rest_framework/vertical/checkbox.html | 30 +-
.../rest_framework/vertical/checkbox_multiple.html | 61 +-
.../rest_framework/vertical/fieldset.html | 18 +-
.../templates/rest_framework/vertical/form.html | 17 +-
.../templates/rest_framework/vertical/input.html | 27 +-
.../rest_framework/vertical/list_fieldset.html | 9 +-
.../templates/rest_framework/vertical/radio.html | 64 +-
.../templates/rest_framework/vertical/select.html | 43 +-
.../rest_framework/vertical/select_multiple.html | 36 +-
.../rest_framework/vertical/textarea.html | 25 +-
rest_framework/templatetags/rest_framework.py | 79 +-
rest_framework/test.py | 13 +-
rest_framework/throttling.py | 5 +-
rest_framework/urlpatterns.py | 10 +-
rest_framework/urls.py | 15 +-
rest_framework/utils/breadcrumbs.py | 10 +-
rest_framework/utils/encoders.py | 77 +-
rest_framework/utils/field_mapping.py | 19 +-
rest_framework/utils/formatting.py | 5 +-
rest_framework/utils/html.py | 3 +-
rest_framework/utils/mediatypes.py | 2 +
rest_framework/utils/model_meta.py | 26 +-
rest_framework/utils/representation.py | 5 +-
rest_framework/utils/serializer_helpers.py | 28 +
rest_framework/utils/urls.py | 25 +
rest_framework/validators.py | 15 +-
rest_framework/versioning.py | 180 ++++
rest_framework/views.py | 93 +-
rest_framework/viewsets.py | 13 +-
runtests.py | 38 +-
setup.py | 7 +-
tests/browsable_api/auth_urls.py | 10 +-
tests/browsable_api/no_auth_urls.py | 10 +-
tests/browsable_api/test_browsable_api.py | 1 +
tests/browsable_api/test_browsable_nested_api.py | 42 +
tests/browsable_api/views.py | 5 +-
tests/conftest.py | 27 -
tests/description.py | 1 -
tests/models.py | 1 +
tests/test_atomic_requests.py | 147 +++
tests/test_authentication.py | 478 +--------
tests/test_decorators.py | 16 +-
tests/test_description.py | 9 +-
tests/test_fields.py | 475 ++++++++-
tests/test_filters.py | 16 +-
tests/test_generics.py | 51 +-
tests/test_htmlrenderer.py | 13 +-
tests/test_metadata.py | 213 +++-
tests/test_middleware.py | 9 +-
tests/test_model_serializer.py | 205 +++-
tests/test_multitable_inheritance.py | 2 +
tests/test_negotiation.py | 5 +-
tests/test_pagination.py | 1087 +++++++++++---------
tests/test_parsers.py | 70 +-
tests/test_permissions.py | 166 ++-
tests/test_relations.py | 45 +-
tests/test_relations_generic.py | 6 +-
tests/test_relations_hyperlink.py | 13 +-
tests/test_relations_pk.py | 26 +-
tests/test_relations_slug.py | 5 +-
tests/test_renderers.py | 274 +----
tests/test_request.py | 71 +-
tests/test_response.py | 25 +-
tests/test_reverse.py | 36 +-
tests/test_routers.py | 65 +-
tests/test_serializer.py | 10 +-
tests/test_serializer_bulk_update.py | 6 +-
tests/test_serializer_lists.py | 3 +-
tests/test_serializer_nested.py | 87 ++
tests/test_settings.py | 15 +
tests/test_status.py | 5 +-
tests/test_templatetags.py | 20 +-
tests/test_testing.py | 26 +-
tests/test_throttling.py | 10 +-
tests/test_urlpatterns.py | 55 +-
tests/test_utils.py | 14 +-
tests/test_validation.py | 53 +-
tests/test_validators.py | 58 +-
tests/test_versioning.py | 311 ++++++
tests/test_views.py | 14 +-
tests/test_viewsets.py | 2 +-
tests/test_write_only_fields.py | 1 +
tests/urls.py | 4 +-
tests/utils.py | 24 +
tox.ini | 41 +-
274 files changed, 21354 insertions(+), 5778 deletions(-)
diff --cc debian/.git-dpm
index 93841a4,0000000..ba32a31
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
- 40867ae538d2310804a5975f424b1c633fc48661
- 40867ae538d2310804a5975f424b1c633fc48661
- c006fe3a7b779341fc6f6618751299fd795bd1f9
++d114753b2e5e96cab80ca071fdf99afb9f74b8b9
++d114753b2e5e96cab80ca071fdf99afb9f74b8b9
++03d8c77108efe827ce8f553e9cf4d30f72f7654a
+03d8c77108efe827ce8f553e9cf4d30f72f7654a
+djangorestframework_3.2.2.orig.tar.gz
+3f021c95c6994115f1922d38e15e4f76ec3d9275
+1956251
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove_google_analytics.patch
index 712d93e,0000000..d963d3a
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 40867ae538d2310804a5975f424b1c633fc48661 Mon Sep 17 00:00:00 2001
++From d114753b2e5e96cab80ca071fdf99afb9f74b8b9 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 b3066eb..489da5c 100644
++index 93b687c..51cdb16 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;
diff --cc debian/patches/remove_remote_resources.patch
index 740f98c,0000000..13c8df5
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 71adace06f8149bc525fef9a5cef17f8d3304afc Mon Sep 17 00:00:00 2001
++From 71da9aaa2d36e1a4aff42a854f4389765dd4b215 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 c111078..bc26076 100644
++index 37f1920..2267b3e 100644
+--- a/docs/index.md
++++ b/docs/index.md
- @@ -224,9 +224,6 @@ For support please see the [REST framework discussion group][group], try the `#
++@@ -218,9 +218,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