[packages] update to django 1.0

With a minor code change, and a small workaround.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/apps/patchwork/forms.py b/apps/patchwork/forms.py
index dc30299970ab7f8a976de0e6b593b4c4e9d2ee50..10c93a42b199946034a4acdbe97dd626b6d1e1b0 100644 (file)
--- a/apps/patchwork/forms.py
+++ b/apps/patchwork/forms.py
@@ -140,6 +140,7 @@ class OptionalDelegateField(DelegateField):
 
 class OptionalModelChoiceField(forms.ModelChoiceField):
     no_change_choice = ('*', 'no change')
+    to_field_name = None
 
     def __init__(self, no_change_choice = None, *args, **kwargs):
         self.filter = None

diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py
index 1da1d998bece9d0b2d5046ca0a74666cbaf16318..bb0b52c165e979ed9f482290ecb1e0680b3ad25c 100644 (file)
--- a/apps/patchwork/models.py
+++ b/apps/patchwork/models.py
@@ -23,7 +23,6 @@ from django.core.urlresolvers import reverse
 from django.contrib.sites.models import Site
 from django.conf import settings
 from patchwork.parser import hash_patch
-import django.oldforms as oldforms
 
 import re
 import datetime, time

diff --git a/apps/patchwork/templatetags/listurl.py b/apps/patchwork/templatetags/listurl.py
index 22e2a1b13d17d2eae861cc849ec0a8b74cbb6cc6..5fe03e469c43d1b46b3015abec468dda9e43ee8a 100644 (file)
--- a/apps/patchwork/templatetags/listurl.py
+++ b/apps/patchwork/templatetags/listurl.py
@@ -33,7 +33,7 @@ list_params = [ c.param for c in filterclasses ] + ['order', 'page']
 
 class ListURLNode(template.defaulttags.URLNode):
     def __init__(self, kwargs):
-        super(ListURLNode, self).__init__(None, [], {})
+        super(ListURLNode, self).__init__(None, [], {}, False)
         self.params = {}
         for (k, v) in kwargs.iteritems():
             if k in list_params:

diff --git a/docs/INSTALL b/docs/INSTALL
index ef7e3c679baf1ec1279b86c076d3ce5958416576..42822e3650aac51c9b788c15a73dbecb51174b07 100644 (file)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -51,13 +51,12 @@ in brackets):
 
         mkdir -p lib/packages lib/python
 
-        At the time of initial release, patchwork depends on a svn version of
-        django. I've been using svn commit 7854 - but anything after this
-        point should be fine. If your distribution provides a sufficiently
-        recent version of django, you can use that; if not, do a:
+        At the time of release, patchwork depends on django version 1.0.
+        However, most distros don't provide 1.0 yet. If yours does, then you
+        can skip this step. Otherwise, do a:
 
          cd lib/packages
-         svn checkout http://code.djangoproject.com/svn/django/trunk django
+         svn checkout http://code.djangoproject.com/svn/django/tags/releases/1.0
          cd ../python
          ln -s ../packages/django/django ./django