[Python-modules-commits] r8331 - in packages/python-django-contact-form/trunk/debian (6 files)

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

    Date: Friday, May 1, 2009 @ 10:38:02
  Author: odd_bloke-guest
Revision: 8331

Added 01-add_form_args.diff patch. (Closes: #526451)

Added:
  packages/python-django-contact-form/trunk/debian/patches/
  packages/python-django-contact-form/trunk/debian/patches/01-add_form_args.diff
  packages/python-django-contact-form/trunk/debian/patches/series
Modified:
  packages/python-django-contact-form/trunk/debian/changelog
  packages/python-django-contact-form/trunk/debian/control
  packages/python-django-contact-form/trunk/debian/rules

Modified: packages/python-django-contact-form/trunk/debian/changelog
===================================================================
--- packages/python-django-contact-form/trunk/debian/changelog	2009-05-01 10:37:59 UTC (rev 8330)
+++ packages/python-django-contact-form/trunk/debian/changelog	2009-05-01 10:38:02 UTC (rev 8331)
@@ -1,8 +1,9 @@
 python-django-contact-form (0+hg61-2) UNRELEASED; urgency=low
 
   * Fixed get-orig-source rule so that the source directory is named correctly.
+  * Added 01-add_form_args.diff patch. (Closes: #526451)
 
- -- Daniel Watkins <daniel at daniel-watkins.co.uk>  Thu, 12 Mar 2009 14:26:07 +0000
+ -- Daniel Watkins <daniel at daniel-watkins.co.uk>  Fri, 01 May 2009 11:25:45 +0100
 
 python-django-contact-form (0+hg61-1) unstable; urgency=low
 

Modified: packages/python-django-contact-form/trunk/debian/control
===================================================================
--- packages/python-django-contact-form/trunk/debian/control	2009-05-01 10:37:59 UTC (rev 8330)
+++ packages/python-django-contact-form/trunk/debian/control	2009-05-01 10:38:02 UTC (rev 8331)
@@ -2,7 +2,7 @@
 Section: python
 Priority: optional
 Maintainer: Daniel Watkins <daniel at daniel-watkins.co.uk>
-Build-Depends: debhelper (>= 7), python, python-support
+Build-Depends: debhelper (>= 7), python, python-support, quilt
 Standards-Version: 3.8.0
 Homepage: http://bitbucket.org/ubernostrum/django-contact-form/overview/
 Vcs-Bzr: http://bzr.daniel-watkins.co.uk/debian/python-django-contact-form

Added: packages/python-django-contact-form/trunk/debian/patches/01-add_form_args.diff
===================================================================
--- packages/python-django-contact-form/trunk/debian/patches/01-add_form_args.diff	                        (rev 0)
+++ packages/python-django-contact-form/trunk/debian/patches/01-add_form_args.diff	2009-05-01 10:38:02 UTC (rev 8331)
@@ -0,0 +1,41 @@
+## 01-add_form_args.diff by Daniel Watkins <daniel at daniel-watkins.co.uk>
+##
+## Add a form_args argument to the contact_form view, which is passed
+## through to the form_class being used.
+
+Index: django-contact-form/contact_form/views.py
+===================================================================
+--- django-contact-form.orig/contact_form/views.py	2009-05-01 11:20:54.000000000 +0100
++++ django-contact-form/contact_form/views.py	2009-05-01 11:20:58.000000000 +0100
+@@ -14,7 +14,7 @@
+ def contact_form(request, form_class=ContactForm,
+                  template_name='contact_form/contact_form.html',
+                  success_url=None, extra_context=None,
+-                 fail_silently=False):
++                 fail_silently=False, form_args=None):
+     """
+     Render a contact form, validate its input and send an email
+     from it.
+@@ -71,15 +71,20 @@
+     # but contact_form/urls.py in turn imports from this module.
+     #
+     
++    if form_args is None:
++        form_args = ()
+     if success_url is None:
+         success_url = reverse('contact_form_sent')
+     if request.method == 'POST':
+-        form = form_class(data=request.POST, files=request.FILES, request=request)
++        form = form_class(data=request.POST,
++                          files=request.FILES,
++                          request=request,
++                         *form_args)
+         if form.is_valid():
+             form.save(fail_silently=fail_silently)
+             return HttpResponseRedirect(success_url)
+     else:
+-        form = form_class(request=request)
++        form = form_class(request=request, *form_args)
+ 
+     if extra_context is None:
+         extra_context = {}

Added: packages/python-django-contact-form/trunk/debian/patches/series
===================================================================
--- packages/python-django-contact-form/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-django-contact-form/trunk/debian/patches/series	2009-05-01 10:38:02 UTC (rev 8331)
@@ -0,0 +1 @@
+01-add_form_args.diff

Modified: packages/python-django-contact-form/trunk/debian/rules
===================================================================
--- packages/python-django-contact-form/trunk/debian/rules	2009-05-01 10:37:59 UTC (rev 8330)
+++ packages/python-django-contact-form/trunk/debian/rules	2009-05-01 10:38:02 UTC (rev 8331)
@@ -1,8 +1,24 @@
 #!/usr/bin/make -f
 
-%:
+include /usr/share/quilt/quilt.make
+
+clean: unpatch
 	dh $@
 
+build: patch
+	dh $@
+
+install: build
+	dh $@
+
+binary-indep: install
+	dh $@
+
+binary-arch:
+
+binary: binary-arch binary-indep
+	dh $@
+
 get-orig-source:
 	hg clone https://bitbucket.org/ubernostrum/django-contact-form/
 	set -e; \