Merge branch 'master' into jwandborg-f482_media_attachments

Conflicts:
	mediagoblin/config_spec.ini
	mediagoblin/edit/forms.py
	mediagoblin/edit/views.py
	mediagoblin/submit/views.py
	mediagoblin/templates/mediagoblin/user_pages/media.html

1 files changed, 60 insertions, 0 deletions

diff --git a/mediagoblin/errormiddleware.py b/mediagoblin/errormiddleware.py
new file mode 100644
index 00000000..352dc891
--- /dev/null
+++ b/mediagoblin/errormiddleware.py
@@ -0,0 +1,60 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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>
+  <pre>
+.-------------------------.
+|     __            _     |
+|    -, \_,------,_//     |
+|     <\  ,--   --.\      |
+|      / (x  ) ( X )      |
+|      '  '--, ,--'\      |
+|     / \ -v-v-u-v /      |
+|     .  '.__.--__'.\     |
+|    / ',___/ / \__/'     |
+|    | |   ,'\_'/, ||     |
+|    \_|   | | | | ||     |
+|     W',_ ||| |||_''     |
+|      |  '------'|       |
+|      |__|     |_|_      |
+|     ,,,-'     '-,,,     |
+'-------------------------'
+  </pre>
+  <p>Something bad happened, and things broke.</p>
+  <p>If this is not your website, you may want to alert the owner.</p>
+  <br><br>
+  <p>
+    Powered... er broken... by
+    <a href="http://www.mediagoblin.org">MediaGoblin</a>,
+    a <a href="http://www.gnu.org">GNU Project</a>.
+  </p>
+</div>"""
+
+
+def mgoblin_error_middleware(app, global_conf, **kw):
+    """
+    MediaGoblin wrapped error middleware.
+
+    This is really just wrapping the error middleware from Paste.
+    It should take all of Paste's default options, so see:
+      http://pythonpaste.org/modules/exceptions.html
+    """
+    kw['error_message'] = MGOBLIN_ERROR_MESSAGE
+    return make_error_middleware(app, global_conf, **kw)