diff --git a/bin/debexpo_importer.py b/bin/debexpo_importer.py
index 83263468a92aa11767d4e0e548078a9d6339c8bf..3688e2f5049ece154e8ac7df7b28262b99f9c1d0 100755
--- a/bin/debexpo_importer.py
+++ b/bin/debexpo_importer.py
@@ -404,7 +404,7 @@ class Importer(object):
except Exception as e:
# XXX: The user won't ever see this message. The changes file was
# invalid, we don't know whom send it to
- self._reject("Your changes file appears invalid. Refusing your upload\n%s" % (e.message))
+ self._reject("Your changes file appears invalid. Refusing your upload\n%s" % (str(e)))
diff --git a/bin/debexpo_worker.py b/bin/debexpo_worker.py
index eaf02456ee9ba4701fcf8191c3e8b2772c6177c8..44c08179ba31ddd42c5a0233e8cae5999f537d1f 100755
--- a/bin/debexpo_worker.py
+++ b/bin/debexpo_worker.py
@@ -116,7 +116,7 @@ class Worker(object):
log.debug('Import succeeded.')
return mod
except ImportError as e:
- if e.message.startswith('No module named'):
+ if str(e).startswith('No module named'):
log.debug('Import failed - module not found: %s', e)
else:
log.warn('Import of module "%s" failed with error: %s', name, e)
diff --git a/debexpo/config/routing.py b/debexpo/config/routing.py
index 1c379f6c4796b7b9004586aa85ca1cc40a338c28..229dd6db31a10226f96db8481560d12e1d94f5f3 100644
--- a/debexpo/config/routing.py
+++ b/debexpo/config/routing.py
@@ -56,6 +56,8 @@ def make_map(config):
# CUSTOM ROUTES HERE
+ # n.b.: chances are, this route is overriden by a productive setup in its
+ # web server configuration
if config['debexpo.handle_debian'].lower() == 'true':
map.connect('/debian/*filename', controller='debian', action='index')
diff --git a/debexpo/controllers/debian.py b/debexpo/controllers/debian.py
index c5fff6171b53f6ec6506dd8e32afd164b0968edf..4da87e89d024a1c3048759b6292030eab4fd1e43 100644
--- a/debexpo/controllers/debian.py
+++ b/debexpo/controllers/debian.py
@@ -31,6 +31,12 @@
This module holds the Debian controller which manages the /debian/ directory.
"""
+#
+# XXX: This controller is ONLY used if no standalone web server is running.
+# For productive setups it is suggested to deliver static content through
+# the web server (e.g. Apache) directly
+#
+
__author__ = 'Jonny Lamb'
__copyright__ = 'Copyright © 2008 Jonny Lamb'
__license__ = 'MIT'
diff --git a/debexpo/lib/plugins.py b/debexpo/lib/plugins.py
index 97dde2c3dc7715d953c833df82e88fd59a92fe9c..23c9d2f3a496f22e8d0e624d6d8a79030c798ae9 100644
--- a/debexpo/lib/plugins.py
+++ b/debexpo/lib/plugins.py
@@ -115,7 +115,7 @@ class Plugins(object):
log.debug('Import succeeded.')
return mod
except ImportError, e:
- if e.message.startswith('No module named'):
+ if str(e).startswith('No module named'):
# Not fatal: the plugin module was not found at this location
# (might be okay because plugins are looked for in several locations)
log.debug('Import failed - module not found: %s', e)
diff --git a/debexpo/templates/base.mako b/debexpo/templates/base.mako
index 4e07302f1b71209c2ecdf13a644d958d6cc874c0..239796d6b3a868b833d97a1df1635ec6c2827fb3 100644
--- a/debexpo/templates/base.mako
+++ b/debexpo/templates/base.mako
@@ -5,9 +5,9 @@
-
-
-
+
+
+
${ c.config['debexpo.sitename'] }
% if c.feed_url:
@@ -109,7 +109,7 @@
${ h.tags.link_to( _('Contact'), h.url('contact')) }
% if 'user_id' in session:
-
- Logout
+ Logout
% endif
% if c.feed_url: