summaryrefslogtreecommitdiff
path: root/flup/publisher.py
diff options
context:
space:
mode:
Diffstat (limited to 'flup/publisher.py')
-rw-r--r--flup/publisher.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/flup/publisher.py b/flup/publisher.py
index 6328a50..b02724a 100644
--- a/flup/publisher.py
+++ b/flup/publisher.py
@@ -450,7 +450,12 @@ class Publisher(object):
func = self._resolver.resolve(transaction.request,
redirect=redirect)
if func is None:
- return self._error404(environ, start_response)
+ # See if there's a higher-level 404 page
+ if hasattr(self._resolver, 'error404') and \
+ self._resolver.error404 is not None:
+ func = self._resolver.error404
+ else:
+ return self._error404(environ, start_response)
try:
# Call the function.