[Python-modules-commits] r31407 - in packages/django-conneg/trunk/debian (3 files)

[jordanm-guest at users.alioth.debian.org]

    Date: Wednesday, November 5, 2014 @ 06:10:57
  Author: jordanm-guest
Revision: 31407

Add upstream patch to fix issues with Django 1.7

Added:
  packages/django-conneg/trunk/debian/patches/django17.patch
Modified:
  packages/django-conneg/trunk/debian/changelog
  packages/django-conneg/trunk/debian/patches/series

Modified: packages/django-conneg/trunk/debian/changelog
===================================================================
--- packages/django-conneg/trunk/debian/changelog	2014-11-05 01:49:25 UTC (rev 31406)
+++ packages/django-conneg/trunk/debian/changelog	2014-11-05 06:10:57 UTC (rev 31407)
@@ -1,8 +1,8 @@
-django-conneg (0.9.4-2) UNRELEASED; urgency=low
+django-conneg (0.9.4-2) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * Apply upstream patch to fix build failures with Django 1.7 (Closes: #755597)
 
- -- Olivier Berger <obergix at debian.org>  Fri, 06 Dec 2013 17:26:23 +0100
+ -- Jordan Metzmeier <jmetzmeier01 at gmail.com>  Tue, 04 Nov 2014 22:48:58 -0600
 
 django-conneg (0.9.4-1) unstable; urgency=low
 

Added: packages/django-conneg/trunk/debian/patches/django17.patch
===================================================================
--- packages/django-conneg/trunk/debian/patches/django17.patch	                        (rev 0)
+++ packages/django-conneg/trunk/debian/patches/django17.patch	2014-11-05 06:10:57 UTC (rev 31407)
@@ -0,0 +1,51 @@
+Description: Apply upstream patch to fix test errors on django 1.7
+Author: Alexander Dutton <dev at alexdutton.co.uk>
+Index: django-conneg-0.9.4/django_conneg/views.py
+===================================================================
+--- django-conneg-0.9.4.orig/django_conneg/views.py
++++ django-conneg-0.9.4/django_conneg/views.py
+@@ -152,7 +152,7 @@ Your Accept header didn't contain any su
+ 
+ Supported ranges are:
+ 
+- * %s\n""" % '\n * '.join(sorted('%s (%s; %s)' % (f.name, ", ".join(m.value for m in f.mimetypes), f.format) for f in request.renderers if not any(m in tried_mimetypes for m in f.mimetypes))), mimetype="text/plain")
++ * %s\n""" % '\n * '.join(sorted('%s (%s; %s)' % (f.name, ", ".join(m.value for m in f.mimetypes), f.format) for f in request.renderers if not any(m in tried_mimetypes for m in f.mimetypes))), content_type="text/plain")
+         response.status_code = http_client.NOT_ACCEPTABLE
+         return response
+ 
+@@ -298,7 +298,7 @@ class HTMLView(ContentNegotiatedView):
+         try:
+             return render_to_response(template_name,
+                                       context, context_instance=RequestContext(request),
+-                                      mimetype='text/html')
++                                      content_type='text/html')
+         except TemplateDoesNotExist:
+             return NotImplemented
+ 
+@@ -311,7 +311,7 @@ class TextView(ContentNegotiatedView):
+         try:
+             return render_to_response(template_name,
+                                       context, context_instance=RequestContext(request),
+-                                      mimetype='text/plain')
++                                      content_type='text/plain')
+         except TemplateDoesNotExist:
+             return NotImplemented
+ 
+@@ -370,7 +370,7 @@ if 'json' in locals():
+         def render_json(self, request, context, template_name):
+             context = self.preprocess_context_for_json(context)
+             return http.HttpResponse(json.dumps(self.simplify_for_json(context), indent=self._json_indent),
+-                                     mimetype="application/json")
++                                     content_type="application/json")
+ 
+     class JSONPView(JSONView):
+         # The query parameter to look for the callback name
+@@ -393,7 +393,7 @@ if 'json' in locals():
+                                             self._default_jsonp_callback)
+ 
+             return http.HttpResponse('%s(%s);' % (callback_name, json.dumps(self.simplify_for_json(context), indent=self._json_indent)),
+-                                     mimetype="application/javascript")
++                                     content_type="application/javascript")
+ 
+ class ErrorView(HTMLView, JSONPView, TextView):
+     _force_fallback_format = ('html', 'json')

Modified: packages/django-conneg/trunk/debian/patches/series
===================================================================
--- packages/django-conneg/trunk/debian/patches/series	2014-11-05 01:49:25 UTC (rev 31406)
+++ packages/django-conneg/trunk/debian/patches/series	2014-11-05 06:10:57 UTC (rev 31407)
@@ -1,2 +1,3 @@
 testurlsdjango16.patch
 needtemplatestopasstests.patch
+django17.patch