diff options
| -rw-r--r-- | apps/patchwork/utils.py | 3 | ||||
| -rw-r--r-- | apps/patchwork/views/xmlrpc.py | 2 | ||||
| -rw-r--r-- | apps/settings.py | 12 | ||||
| -rw-r--r-- | docs/INSTALL | 6 |
4 files changed, 11 insertions, 12 deletions
diff --git a/apps/patchwork/utils.py b/apps/patchwork/utils.py index 5cb45e8..e7619c3 100644 --- a/apps/patchwork/utils.py +++ b/apps/patchwork/utils.py @@ -58,12 +58,12 @@ class Order(object): def __init__(self, str = None, editable = False): self.reversed = False self.editable = editable + (self.order, self.reversed) = self.default_order if self.editable: return if str is None or str == '': - (self.order, self.reversed) = self.default_order return reversed = False @@ -72,7 +72,6 @@ class Order(object): reversed = True if str not in self.order_map.keys(): - (self.order, self.reversed) = self.default_order return self.order = str diff --git a/apps/patchwork/views/xmlrpc.py b/apps/patchwork/views/xmlrpc.py index bb9ebe1..283eb34 100644 --- a/apps/patchwork/views/xmlrpc.py +++ b/apps/patchwork/views/xmlrpc.py @@ -328,7 +328,7 @@ def patch_list(filter={}): patches = Patch.objects.filter(**dfilter) if max_count > 0: - return map(patch_to_dict, patches)[:max_count] + return map(patch_to_dict, patches[:max_count]) else: return map(patch_to_dict, patches) diff --git a/apps/settings.py b/apps/settings.py index 4432f3f..7523099 100644 --- a/apps/settings.py +++ b/apps/settings.py @@ -10,12 +10,12 @@ ADMINS = ( MANAGERS = ADMINS -DATABASE_ENGINE = 'postgresql_psycopg2' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. -DATABASE_NAME = 'patchwork' # Or path to database file if using sqlite3. -DATABASE_USER = '' # Not used with sqlite3. -DATABASE_PASSWORD = '' # Not used with sqlite3. -DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. -DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'patchwork', + }, +} # Local time zone for this installation. Choices can be found here: # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE diff --git a/docs/INSTALL b/docs/INSTALL index 050fc9f..c63d6f7 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -3,13 +3,13 @@ Deploying Patchwork Patchwork uses the django framework - there is some background on deploying django applications here: - http://www.djangobook.com/en/1.0/chapter20/ + http://www.djangobook.com/en/2.0/chapter12/ You'll need the following (applications used for patchwork development are in brackets): * A python interpreter - * django + * django >= 1.2 * A webserver (apache) * mod_python or flup * A database server (postgresql) @@ -73,7 +73,7 @@ in brackets): lib/packages is for stuff we'll download, lib/python is to add to our python path. We'll symlink python modules into lib/python. - At the time of release, patchwork depends on django version 1.0 or + At the time of release, patchwork depends on django version 1.2 or later. Your distro probably provides this. If not, do a: cd lib/packages |