X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Futil%2Ferrors.py;h=70d2da9145e419ed54127e8328f98ea1940e19fc;hp=16b7c706f7fb84cee2dd82da0e67d1f0d11a0908;hb=1bcc0d697dd37a9268641f0cbaa7e9e781552233;hpb=3574998f5f7c41e946610730638fd7e3fecb5835 diff --git a/ipsilon/util/errors.py b/ipsilon/util/errors.py old mode 100755 new mode 100644 index 16b7c70..70d2da9 --- a/ipsilon/util/errors.py +++ b/ipsilon/util/errors.py @@ -1,5 +1,3 @@ -#!/usr/bin/python -# # Copyright (C) 2014 Simo Sorce # # see file 'COPYING' for use and warranty information @@ -18,7 +16,7 @@ # along with this program. If not, see . from ipsilon.util.page import Page -import cherrypy + class Errors(Page): @@ -26,16 +24,17 @@ class Errors(Page): super(Errors, self).__init__(*args, **kwargs) def _error_template(self, *args, **kwargs): - # pylint: disable=star-args output_page = self._template(*args, **kwargs) # for some reason cherrypy will choke if the output # is a unicode object, so use str() here to please it return str(output_page) def handler(self, status, message, traceback, version): - self._debug(repr([status, message, traceback, version])) - return self._error_template('internalerror.html', title='Internal Error') + self.debug(repr([status, message, traceback, version])) + return self._error_template('internalerror.html', + title='Internal Error') + # pylint: disable=W0221 def __call__(self, status, message, traceback, version): return self.handler(status, message, traceback, version) @@ -46,8 +45,16 @@ class Error_400(Errors): return self._error_template('badrequest.html', title='Bad Request', message=message) + class Error_401(Errors): def handler(self, status, message, traceback, version): return self._error_template('unauthorized.html', title='Unauthorized', message=message) + + +class Error_404(Errors): + + def handler(self, status, message, traceback, version): + return self._error_template('notfound.html', + title='Not Found', message=message)