diff options
| -rw-r--r-- | mediagoblin/errormiddleware.py | 8 | ||||
| -rw-r--r-- | paste.ini | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/mediagoblin/errormiddleware.py b/mediagoblin/errormiddleware.py index c6789f32..da729d14 100644 --- a/mediagoblin/errormiddleware.py +++ b/mediagoblin/errormiddleware.py @@ -14,8 +14,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from paste.exceptions.errormiddleware import make_error_middleware - MGOBLIN_ERROR_MESSAGE = """\ <div style="text-align:center;font-family: monospace"> <h1>YEOWCH... that's an error!</h1> @@ -56,5 +54,11 @@ def mgoblin_error_middleware(app, global_conf, **kw): It should take all of Paste's default options, so see: http://pythonpaste.org/modules/exceptions.html """ + # No paste? Fail in a friendly way! + try: + from paste.exceptions.errormiddleware import make_error_middleware + except ImportError: + return app + kw['error_message'] = MGOBLIN_ERROR_MESSAGE return make_error_middleware(app, global_conf, **kw) @@ -6,8 +6,7 @@ debug = false [pipeline:main] -# pipeline = errors mediagoblin -pipeline = mediagoblin +pipeline = errors mediagoblin [app:mediagoblin] use = egg:mediagoblin#app |