[Python-modules-commits] [djangorestframework] 06/08: merge patched into master
Brian May
bam at moszumanska.debian.org
Fri Oct 30 08:58:33 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 6ab3670c647cd272edf1a119f408dc21287a25d8
Merge: 84cac52 0c1ecdc
Author: Brian May <bam at debian.org>
Date: Fri Oct 30 18:51:26 2015 +1100
merge patched into master
.travis.yml | 25 +-
README.md | 5 +-
debian/.git-dpm | 6 +-
debian/patches/0003-Python3.5-fix.patch | 6 +-
debian/patches/remove_google_analytics.patch | 4 +-
debian/patches/remove_remote_resources.patch | 6 +-
docs/api-guide/authentication.md | 10 +
docs/api-guide/fields.md | 23 +-
docs/api-guide/filtering.md | 42 ++-
docs/api-guide/format-suffixes.md | 10 +
docs/api-guide/pagination.md | 2 +-
docs/api-guide/relations.md | 35 +-
docs/api-guide/renderers.md | 17 +-
docs/api-guide/serializers.md | 51 ++-
docs/api-guide/settings.md | 48 +--
docs/api-guide/testing.md | 4 +-
docs/api-guide/throttling.md | 4 +-
docs/api-guide/versioning.md | 2 +-
docs/img/django-filter.png | Bin 0 -> 13678 bytes
docs/img/filter-controls.png | Bin 0 -> 47904 bytes
docs/img/horizontal.png | Bin 0 -> 11628 bytes
docs/img/inline.png | Bin 0 -> 8295 bytes
docs/img/ordering-filter.png | Bin 0 -> 18226 bytes
docs/img/search-filter.png | Bin 0 -> 9137 bytes
docs/img/vertical.png | Bin 0 -> 11946 bytes
docs/index.md | 19 +-
docs/topics/3.3-announcement.md | 58 +++
docs/topics/browser-enhancements.md | 87 ++---
docs/topics/funding.md | 314 ++++++++++++++++
docs/topics/html-and-forms.md | 214 +++++++++++
docs/topics/release-notes.md | 95 ++++-
docs/topics/third-party-resources.md | 6 +
docs/tutorial/1-serialization.md | 2 +-
docs/tutorial/6-viewsets-and-routers.md | 2 +-
docs_theme/base.html | 2 +-
mkdocs.yml | 2 +
requirements.txt | 4 +-
requirements/requirements-packaging.txt | 2 +-
rest_framework/__init__.py | 2 +-
rest_framework/authtoken/serializers.py | 8 +-
.../authtoken/south_migrations/0001_initial.py | 60 ----
.../authtoken/south_migrations/__init__.py | 0
rest_framework/compat.py | 71 ++--
rest_framework/exceptions.py | 6 +-
rest_framework/fields.py | 265 +++++++++-----
rest_framework/filters.py | 151 ++++++--
rest_framework/locale/ar/LC_MESSAGES/django.mo | Bin 4888 -> 4888 bytes
rest_framework/locale/ar/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/be/LC_MESSAGES/django.mo | Bin 655 -> 655 bytes
rest_framework/locale/be/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/ca/LC_MESSAGES/django.mo | Bin 0 -> 9749 bytes
rest_framework/locale/ca/LC_MESSAGES/django.po | 400 +++++++++++++++++++++
rest_framework/locale/ca_ES/LC_MESSAGES/django.mo | Bin 0 -> 528 bytes
.../locale/{pt => ca_ES}/LC_MESSAGES/django.po | 161 +++++----
rest_framework/locale/cs/LC_MESSAGES/django.mo | Bin 9140 -> 9140 bytes
rest_framework/locale/cs/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/da/LC_MESSAGES/django.mo | Bin 8905 -> 8905 bytes
rest_framework/locale/da/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/de/LC_MESSAGES/django.mo | Bin 9544 -> 9544 bytes
rest_framework/locale/de/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/en/LC_MESSAGES/django.mo | Bin 9406 -> 9476 bytes
rest_framework/locale/en/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/en_CA/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes
rest_framework/locale/en_CA/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/en_US/LC_MESSAGES/django.mo | Bin 378 -> 378 bytes
rest_framework/locale/en_US/LC_MESSAGES/django.po | 153 +++++---
rest_framework/locale/es/LC_MESSAGES/django.mo | Bin 9844 -> 10127 bytes
rest_framework/locale/es/LC_MESSAGES/django.po | 163 +++++----
rest_framework/locale/et/LC_MESSAGES/django.mo | Bin 8836 -> 8836 bytes
rest_framework/locale/et/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/fr/LC_MESSAGES/django.mo | Bin 9389 -> 10193 bytes
rest_framework/locale/fr/LC_MESSAGES/django.po | 169 +++++----
rest_framework/locale/fr_CA/LC_MESSAGES/django.mo | Bin 527 -> 527 bytes
rest_framework/locale/fr_CA/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/gl/LC_MESSAGES/django.mo | Bin 515 -> 515 bytes
rest_framework/locale/gl/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/gl_ES/LC_MESSAGES/django.mo | Bin 669 -> 669 bytes
rest_framework/locale/gl_ES/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/hu/LC_MESSAGES/django.mo | Bin 9228 -> 9228 bytes
rest_framework/locale/hu/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/id/LC_MESSAGES/django.mo | Bin 510 -> 510 bytes
rest_framework/locale/id/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/it/LC_MESSAGES/django.mo | Bin 9512 -> 9512 bytes
rest_framework/locale/it/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/ja/LC_MESSAGES/django.mo | Bin 0 -> 11341 bytes
rest_framework/locale/ja/LC_MESSAGES/django.po | 400 +++++++++++++++++++++
rest_framework/locale/ko_KR/LC_MESSAGES/django.mo | Bin 10148 -> 10148 bytes
rest_framework/locale/ko_KR/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/mk/LC_MESSAGES/django.mo | Bin 10744 -> 10744 bytes
rest_framework/locale/mk/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/nb/LC_MESSAGES/django.mo | Bin 524 -> 524 bytes
rest_framework/locale/nb/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/nl/LC_MESSAGES/django.mo | Bin 9267 -> 9267 bytes
rest_framework/locale/nl/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/pl/LC_MESSAGES/django.mo | Bin 9602 -> 9602 bytes
rest_framework/locale/pl/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/pt/LC_MESSAGES/django.mo | Bin 517 -> 517 bytes
rest_framework/locale/pt/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/pt_BR/LC_MESSAGES/django.mo | Bin 9204 -> 9974 bytes
rest_framework/locale/pt_BR/LC_MESSAGES/django.po | 231 +++++++-----
rest_framework/locale/pt_PT/LC_MESSAGES/django.mo | Bin 534 -> 534 bytes
rest_framework/locale/pt_PT/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/ru/LC_MESSAGES/django.mo | Bin 11487 -> 11487 bytes
rest_framework/locale/ru/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/sk/LC_MESSAGES/django.mo | Bin 9524 -> 9524 bytes
rest_framework/locale/sk/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/sv/LC_MESSAGES/django.mo | Bin 9519 -> 9519 bytes
rest_framework/locale/sv/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/tr/LC_MESSAGES/django.mo | Bin 9211 -> 9211 bytes
rest_framework/locale/tr/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/tr_TR/LC_MESSAGES/django.mo | Bin 522 -> 522 bytes
rest_framework/locale/tr_TR/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/uk/LC_MESSAGES/django.mo | Bin 590 -> 590 bytes
rest_framework/locale/uk/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/vi/LC_MESSAGES/django.mo | Bin 510 -> 510 bytes
rest_framework/locale/vi/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/zh_CN/LC_MESSAGES/django.mo | Bin 9261 -> 9261 bytes
rest_framework/locale/zh_CN/LC_MESSAGES/django.po | 157 ++++----
rest_framework/locale/zh_TW/LC_MESSAGES/django.mo | Bin 0 -> 522 bytes
.../locale/{id => zh_TW}/LC_MESSAGES/django.po | 161 +++++----
rest_framework/metadata.py | 5 +-
rest_framework/negotiation.py | 3 -
rest_framework/pagination.py | 65 +---
rest_framework/permissions.py | 6 +-
rest_framework/relations.py | 24 +-
rest_framework/renderers.py | 103 +++---
rest_framework/request.py | 101 +-----
rest_framework/response.py | 2 +-
rest_framework/reverse.py | 1 -
rest_framework/routers.py | 5 +-
rest_framework/serializers.py | 76 +++-
rest_framework/settings.py | 25 +-
.../static/rest_framework/css/default.css | 8 +
.../static/rest_framework/js/ajax-form.js | 97 +++++
rest_framework/static/rest_framework/js/csrf.js | 47 +++
.../static/rest_framework/js/jquery-1.11.3.min.js | 5 +
.../static/rest_framework/js/jquery-1.8.1-min.js | 2 -
rest_framework/templates/rest_framework/admin.html | 30 +-
.../templates/rest_framework/api_form.html | 8 -
rest_framework/templates/rest_framework/base.html | 43 ++-
.../templates/rest_framework/filters/base.html | 16 +
.../rest_framework/filters/django_filter.html | 6 +
.../filters/django_filter_crispyforms.html | 5 +
.../templates/rest_framework/filters/ordering.html | 14 +
.../templates/rest_framework/filters/search.html | 12 +
.../templates/rest_framework/horizontal/form.html | 20 +-
.../rest_framework/horizontal/select.html | 2 +-
.../rest_framework/horizontal/select_multiple.html | 2 +-
.../templates/rest_framework/inline/form.html | 17 +-
.../templates/rest_framework/inline/select.html | 2 +-
.../rest_framework/inline/select_multiple.html | 2 +-
.../templates/rest_framework/raw_data_form.html | 1 -
.../templates/rest_framework/vertical/form.html | 16 +-
.../templates/rest_framework/vertical/select.html | 2 +-
.../rest_framework/vertical/select_multiple.html | 2 +-
rest_framework/templatetags/rest_framework.py | 21 +-
rest_framework/utils/field_mapping.py | 51 ++-
rest_framework/utils/html.py | 2 +-
rest_framework/utils/model_meta.py | 18 +-
rest_framework/utils/serializer_helpers.py | 5 +-
rest_framework/validators.py | 18 +-
runtests.py | 6 +-
setup.py | 4 +
tests/test_atomic_requests.py | 36 +-
tests/test_bound_fields.py | 23 ++
tests/test_fields.py | 101 +++++-
tests/test_filters.py | 19 +-
tests/test_model_serializer.py | 41 ++-
tests/test_pagination.py | 35 --
tests/test_permissions.py | 6 +-
tests/test_relations_generic.py | 2 +-
tests/test_renderers.py | 14 +-
tests/test_request.py | 84 +----
tests/test_response.py | 51 +--
tests/test_serializer.py | 10 +
tests/test_serializer_lists.py | 29 ++
tests/test_serializer_nested.py | 50 ++-
tests/test_utils.py | 6 +-
tests/test_validators.py | 2 +-
tests/test_views.py | 30 --
tox.ini | 49 ++-
181 files changed, 6403 insertions(+), 3146 deletions(-)
diff --cc debian/.git-dpm
index 4aedeb0,0000000..b1192a0
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
- 1970717a354a3feceb128626f14e8ef97db9d4f0
- 1970717a354a3feceb128626f14e8ef97db9d4f0
- 03d8c77108efe827ce8f553e9cf4d30f72f7654a
++0c1ecdc2f7b0899bd3c48f02889e86adda0c0143
++0c1ecdc2f7b0899bd3c48f02889e86adda0c0143
++2fd55ce1feacdfb1159c4e7c191191fdf3ba2a92
+2fd55ce1feacdfb1159c4e7c191191fdf3ba2a92
+djangorestframework_3.3.0.orig.tar.gz
+7c9fd7c0b734d53b6fd65f19d8fa9cffc91d1c7b
+2080601
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Python3.5-fix.patch
index 4489508,0000000..de2b74c
mode 100644,000000..100644
--- a/debian/patches/0003-Python3.5-fix.patch
+++ b/debian/patches/0003-Python3.5-fix.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 1970717a354a3feceb128626f14e8ef97db9d4f0 Mon Sep 17 00:00:00 2001
++From 0c1ecdc2f7b0899bd3c48f02889e86adda0c0143 Mon Sep 17 00:00:00 2001
+From: Brian May <bam at debian.org>
+Date: Fri, 23 Oct 2015 11:13:24 +1100
+Subject: Python3.5 fix
+
+---
+ tests/test_request.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_request.py b/tests/test_request.py
- index f4b381a..2c8fe8d 100644
++index a2bd4ca..87d5cb6 100644
+--- a/tests/test_request.py
++++ b/tests/test_request.py
- @@ -266,7 +266,7 @@ class TestUserSetter(TestCase):
++@@ -186,7 +186,7 @@ class TestUserSetter(TestCase):
+ try:
+ self.request.user
+ except AttributeError as error:
+- self.assertEqual(str(error), "'module' object has no attribute 'MISSPELLED_NAME_THAT_DOESNT_EXIST'")
++ pass
+ else:
+ assert False, 'AttributeError not raised'
+
diff --cc debian/patches/remove_google_analytics.patch
index d963d3a,0000000..4701c14
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 d114753b2e5e96cab80ca071fdf99afb9f74b8b9 Mon Sep 17 00:00:00 2001
++From 70a2803ad21a7ca16e0f91cfb2c199c81c8ba801 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 93b687c..51cdb16 100644
++index 369927b..0b4af51 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 13c8df5,0000000..682d2d7
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 71da9aaa2d36e1a4aff42a854f4389765dd4b215 Mon Sep 17 00:00:00 2001
++From 4105729e91dad7773b94030a012d888ad4b0b8d4 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 37f1920..2267b3e 100644
++index edfae2a..c559dce 100644
+--- a/docs/index.md
++++ b/docs/index.md
- @@ -218,9 +218,6 @@ For support please see the [REST framework discussion group][group], try the `#
++@@ -220,9 +220,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