[Python-modules-commits] [djangorestframework] 06/07: merge patched into master
Brian May
bam at moszumanska.debian.org
Wed Nov 18 21:59:32 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 b182dba8ecba04118e84d9389d6b030aa5fd628f
Merge: 014aa50 41637c0
Author: Brian May <bam at debian.org>
Date: Thu Nov 19 08:23:27 2015 +1100
merge patched into master
README.md | 8 +-
debian/.git-dpm | 6 +-
debian/patches/0003-Python3.5-fix.patch | 2 +-
debian/patches/remove_google_analytics.patch | 2 +-
debian/patches/remove_remote_resources.patch | 2 +-
docs/api-guide/fields.md | 2 +-
docs/api-guide/filtering.md | 6 +-
docs/api-guide/relations.md | 2 +-
docs/topics/3.3-announcement.md | 2 +-
docs/topics/html-and-forms.md | 1 +
docs/topics/third-party-resources.md | 2 +
docs_theme/css/default.css | 4 +
mkdocs.yml | 4 +
rest_framework/__init__.py | 2 +-
rest_framework/authentication.py | 5 +-
rest_framework/compat.py | 5 +
rest_framework/filters.py | 7 +-
rest_framework/relations.py | 2 +-
rest_framework/request.py | 9 +
rest_framework/serializers.py | 2 +-
.../static/rest_framework/css/bootstrap.min.css | 6 +-
.../fonts/glyphicons-halflings-regular.eot | Bin 20335 -> 20127 bytes
.../fonts/glyphicons-halflings-regular.svg | 487 ++++++++++++---------
.../fonts/glyphicons-halflings-regular.ttf | Bin 41280 -> 45404 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 23320 -> 23424 bytes
.../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes
.../static/rest_framework/js/bootstrap.min.js | 9 +-
rest_framework/templates/rest_framework/admin.html | 1 +
rest_framework/templatetags/rest_framework.py | 3 +-
rest_framework/utils/field_mapping.py | 3 +-
tests/test_model_serializer.py | 40 +-
31 files changed, 376 insertions(+), 248 deletions(-)
diff --cc debian/.git-dpm
index 8125ad2,0000000..22360f6
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
- 0c1ecdc2f7b0899bd3c48f02889e86adda0c0143
- 0c1ecdc2f7b0899bd3c48f02889e86adda0c0143
- 2fd55ce1feacdfb1159c4e7c191191fdf3ba2a92
++41637c0e442bedbc2f214ca9193affd4dba440c8
++41637c0e442bedbc2f214ca9193affd4dba440c8
++286de65f88dfdd5c32b75f461037b6b0141bf2d0
+286de65f88dfdd5c32b75f461037b6b0141bf2d0
+djangorestframework_3.3.1.orig.tar.gz
+ca42ce8b3cdd03a9bf4d31a5fb405cc57cefb8df
+2112435
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Python3.5-fix.patch
index de2b74c,0000000..1c3cf5b
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 0c1ecdc2f7b0899bd3c48f02889e86adda0c0143 Mon Sep 17 00:00:00 2001
++From 41637c0e442bedbc2f214ca9193affd4dba440c8 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 a2bd4ca..87d5cb6 100644
+--- a/tests/test_request.py
++++ b/tests/test_request.py
+@@ -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 4701c14,0000000..8ff3485
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 70a2803ad21a7ca16e0f91cfb2c199c81c8ba801 Mon Sep 17 00:00:00 2001
++From fff278014f4aa1ef7a15f8548b44cecee33c24bf 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
+--- 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 682d2d7,0000000..bbfb63d
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 4105729e91dad7773b94030a012d888ad4b0b8d4 Mon Sep 17 00:00:00 2001
++From 5d04b649c09c46efe67c1c6a58debc6867479689 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 edfae2a..c559dce 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 `#
+
+ 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