From 177236a85459def3f4836a49ddc04ac73124d9c9 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Thu, 17 Dec 2009 21:22:14 +1300 Subject: [PATCH] consolidate configuration in config.py --- objavi/config.py | 2 ++ objavi/xhtml_utils.py | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/objavi/config.py b/objavi/config.py index 91e7468..03406e3 100644 --- a/objavi/config.py +++ b/objavi/config.py @@ -432,6 +432,8 @@ NAVPOINT_ID_TEMPLATE = 'chapter%s' CLAIM_UNAUTHORED = False +IMG_CACHE = 'cache/images/' + USE_IMG_CACHE_ALWAYS_HOSTS = ['objavi.halo.gen.nz'] USE_ZIP_CACHE_ALWAYS_HOSTS = ['objavi.halo.gen.nz'] diff --git a/objavi/xhtml_utils.py b/objavi/xhtml_utils.py index 16089ff..1ff487e 100644 --- a/objavi/xhtml_utils.py +++ b/objavi/xhtml_utils.py @@ -11,6 +11,8 @@ from cStringIO import StringIO from urlparse import urlparse, urlsplit, urljoin from urllib2 import urlopen, HTTPError +from config import XHTMLNS, XHTML, IMG_CACHE + ADJUST_HEADING_WEIGHT = False OK_TAGS = set([ @@ -25,15 +27,12 @@ OK_TAGS = set([ etree.Comment, ]) -XHTMLNS = '{http://www.w3.org/1999/xhtml}' -XHTML = 'http://www.w3.org/1999/xhtml' XHTML11_DOCTYPE = ''' ''' XML_DEC = '\n' -IMG_CACHE = 'cache/images/' IMG_PREFIX = 'static/' def log(*messages, **kwargs): -- 2.11.4.GIT