Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.72) (envelope-from ) id 1UCt3c-00027y-Ka for pgsql-www@arkaria.postgresql.org; Tue, 05 Mar 2013 14:41:32 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.72) (envelope-from ) id 1UCt3c-0001tQ-55 for pgsql-www@arkaria.postgresql.org; Tue, 05 Mar 2013 14:41:32 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtp (Exim 4.72) (envelope-from ) id 1UCt3b-0001tL-NZ for pgsql-www@postgresql.org; Tue, 05 Mar 2013 14:41:31 +0000 Received: from cl-2390.ham-01.de.sixxs.net ([2001:6f8:900:955::2] helo=feynman.df7cb.de) by magus.postgresql.org with esmtp (Exim 4.72) (envelope-from ) id 1UCt3Z-000854-5j for pgsql-www@postgresql.org; Tue, 05 Mar 2013 14:41:31 +0000 Received: from msgid.df7cb.de (benz.df7cb.de [IPv6:2001:6f8:10ee:e:134::2]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (Client did not present a certificate) by feynman.df7cb.de (Postfix) with ESMTPSA id BF1A869777 for ; Tue, 5 Mar 2013 15:41:28 +0100 (CET) Date: Tue, 5 Mar 2013 15:41:28 +0100 From: Christoph Berg To: PostgreSQL WWW Subject: Fixes for django 1.4 Message-ID: <20130305144128.GH11586@msgid.df7cb.de> Mail-Followup-To: Christoph Berg , PostgreSQL WWW MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="AsxXAMtlQ5JHofzM" Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Pg-Spam-Score: -1.9 (-) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgsql-www Precedence: bulk Sender: pgsql-www-owner@postgresql.org --AsxXAMtlQ5JHofzM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline I had to do some fixes to get the site running in django 1.4 (Debian Wheezy). Patch is attached. Christoph -- cb@df7cb.de | http://www.df7cb.de/ --AsxXAMtlQ5JHofzM Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="django1.4.diff" diff --git a/pgweb/core/feeds.py b/pgweb/core/feeds.py index a182d13..3dbeea2 100644 --- a/pgweb/core/feeds.py +++ b/pgweb/core/feeds.py @@ -1,4 +1,4 @@ -from django.contrib.syndication.feeds import Feed +from django.contrib.syndication.views import Feed from models import Version diff --git a/pgweb/events/feeds.py b/pgweb/events/feeds.py index 1c6e2b8..5326bf6 100644 --- a/pgweb/events/feeds.py +++ b/pgweb/events/feeds.py @@ -1,4 +1,4 @@ -from django.contrib.syndication.feeds import Feed +from django.contrib.syndication.views import Feed from models import Event diff --git a/pgweb/news/feeds.py b/pgweb/news/feeds.py index a67f1a5..f9ffb36 100644 --- a/pgweb/news/feeds.py +++ b/pgweb/news/feeds.py @@ -1,4 +1,4 @@ -from django.contrib.syndication.feeds import Feed +from django.contrib.syndication.views import Feed from models import NewsArticle diff --git a/pgweb/pwn/feeds.py b/pgweb/pwn/feeds.py index d8e6eee..22c350b 100644 --- a/pgweb/pwn/feeds.py +++ b/pgweb/pwn/feeds.py @@ -1,4 +1,4 @@ -from django.contrib.syndication.feeds import Feed +from django.contrib.syndication.views import Feed from models import PwnPost diff --git a/pgweb/settings.py b/pgweb/settings.py index c4e6958..88bdee0 100644 --- a/pgweb/settings.py +++ b/pgweb/settings.py @@ -9,12 +9,16 @@ ADMINS = ( MANAGERS = ADMINS -DATABASE_ENGINE = 'postgresql_psycopg2' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. -DATABASE_NAME = '' # 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', # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. + 'NAME': 'pgweb', # Or path to database file if using sqlite3. + 'USER': '', # Not used with sqlite3. + 'PASSWORD': '', # Not used with sqlite3. + 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. + 'PORT': '', # Set to empty string for default. Not used with sqlite3. + } +} # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name @@ -52,9 +56,8 @@ SECRET_KEY = 'REALLYCHANGETHISINSETTINGS_LOCAL.PY' # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.load_template_source', - 'django.template.loaders.app_directories.load_template_source', -# 'django.template.loaders.eggs.load_template_source', + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', ) MIDDLEWARE_CLASSES = [ @@ -75,7 +78,7 @@ TEMPLATE_DIRS = ( ) TEMPLATE_CONTEXT_PROCESSORS = ( - 'django.core.context_processors.auth', + 'django.contrib.auth.context_processors.auth', 'django.core.context_processors.media', 'util.contexts.RootLinkContextProcessor', ) --AsxXAMtlQ5JHofzM Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-www mailing list (pgsql-www@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-www --AsxXAMtlQ5JHofzM--