summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/patchwork/forms.py1
-rw-r--r--apps/patchwork/models.py1
-rw-r--r--apps/patchwork/templatetags/listurl.py2
-rw-r--r--docs/INSTALL9
4 files changed, 6 insertions, 7 deletions
diff --git a/apps/patchwork/forms.py b/apps/patchwork/forms.py
index dc30299..10c93a4 100644
--- 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 1da1d99..bb0b52c 100644
--- 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 22e2a1b..5fe03e4 100644
--- 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 ef7e3c6..42822e3 100644
--- 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