summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Picard <cedric.picard@efrei.net>2014-11-28 20:26:12 +0100
committerCédric Picard <cedric.picard@efrei.net>2014-11-28 20:26:12 +0100
commitfc9f8632da09763b54e25861dc6e1798091d0bba (patch)
tree2d69c7553d9a8fc4020fc16c9d795e7a0de46def
parent1b76a20a35bb3b0644a63d8c8c61a588788627b9 (diff)
downloadpasteme-fc9f8632da09763b54e25861dc6e1798091d0bba.tar.gz
pasteme-fc9f8632da09763b54e25861dc6e1798091d0bba.tar.bz2
pasteme-fc9f8632da09763b54e25861dc6e1798091d0bba.zip
Changed from internal error to bad request error
-rwxr-xr-xpasteme.py10
-rw-r--r--views/bad_request.tpl (renamed from views/internal_error.tpl)4
2 files changed, 7 insertions, 7 deletions
diff --git a/pasteme.py b/pasteme.py
index f155502..b5cd308 100755
--- a/pasteme.py
+++ b/pasteme.py
@@ -25,10 +25,10 @@ def route_paste_post():
pid = identigen.generate(content)
except AttributeError as e:
print(e)
- bottle.abort(500)
+ bottle.abort(400)
path = pathbase / pid
with path.open(mode='wb') as fd:
- fd.write(content.encode('utf8'))
+ fd.write(content.encode('utf8'))
bottle.redirect('/' + pid)
@bottle.route('/static/<path:path>')
@@ -60,9 +60,9 @@ def route_paste_get(pid, pformat='colored'):
def error404(error):
return bottle.template("not_found")
-@bottle.error(500)
-def error500(error):
- return bottle.template("internal_error")
+@bottle.error(400)
+def error400(error):
+ return bottle.template("bad_request")
if __name__ == '__main__':
print('I: Starting application with development server')
diff --git a/views/internal_error.tpl b/views/bad_request.tpl
index 804ade3..e21eddc 100644
--- a/views/internal_error.tpl
+++ b/views/bad_request.tpl
@@ -1,10 +1,10 @@
<html>
<head>
-<title>Internal Server Error (500)</title>
+<title>Bad request (400)</title>
</head>
<body>
<h2>Hello</h2>
-<p>Your request generated a server error.</p>
+<p>I don't know how to manage your request.</p>
<p>If you think that your request was valid, please report this issue</p>