diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2008-10-10 18:01:50 +1100 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2008-10-10 18:01:50 +1100 |
commit | ab0062c77d1fd7d1ed583d3db6528a06bface822 (patch) | |
tree | bedc88061ac46ba131b297ee75b2ed594b74443c | |
parent | e441879dbc4fcafc686fd432bbc6c5a2af71bbe7 (diff) | |
download | patchwork-ab0062c77d1fd7d1ed583d3db6528a06bface822.tar.bz2 patchwork-ab0062c77d1fd7d1ed583d3db6528a06bface822.tar.xz |
[packages] update to django 1.0
With a minor code change, and a small workaround.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
-rw-r--r-- | apps/patchwork/forms.py | 1 | ||||
-rw-r--r-- | apps/patchwork/models.py | 1 | ||||
-rw-r--r-- | apps/patchwork/templatetags/listurl.py | 2 | ||||
-rw-r--r-- | docs/INSTALL | 9 |
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 |