Mercurial > code > home > repos > light9
changeset 1060:473db8bebb8f
install a copy of cycloneerr.py
Ignore-this: cd8b94a251fff5cd9412775258a1f2cf
| author | Drew Perttula <drewp@bigasterisk.com> |
|---|---|
| date | Mon, 02 Jun 2014 00:19:38 +0000 |
| parents | 7f5a9958095b |
| children | f3f66dc32bd8 |
| files | bin/effecteval bin/rdfdb bin/subserver lib/cycloneerr.py light9/ascoltami/webapp.py |
| diffstat | 5 files changed, 21 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/effecteval Mon Jun 02 00:10:48 2014 +0000 +++ b/bin/effecteval Mon Jun 02 00:19:38 2014 +0000 @@ -16,9 +16,7 @@ from light9.greplin_cyclone import StatsForCyclone from greplin import scales -sys.path.append("/my/proj/homeauto/lib") -sys.path.append("/home/drewp/projects/homeauto/lib") -from cycloneerr import PrettyErrorHandler +from lib.cycloneerr import PrettyErrorHandler class EffectEdit(PrettyErrorHandler, cyclone.web.RequestHandler): def get(self):
--- a/bin/rdfdb Mon Jun 02 00:10:48 2014 +0000 +++ b/bin/rdfdb Mon Jun 02 00:19:38 2014 +0000 @@ -127,13 +127,7 @@ from run_local import log log.setLevel(logging.DEBUG) -try: - import sys - sys.path.append("../homeauto/lib") - from cycloneerr import PrettyErrorHandler -except ImportError: - class PrettyErrorHandler(object): - pass +from lib.cycloneerr import PrettyErrorHandler class Client(object): """
--- a/bin/subserver Mon Jun 02 00:10:48 2014 +0000 +++ b/bin/subserver Mon Jun 02 00:19:38 2014 +0000 @@ -15,13 +15,7 @@ from light9.namespaces import L9, DCTERMS from light9 import networking, showconfig -try: - sys.path.append("../homeauto/lib") - sys.path.append("/home/drewp/projects/homeauto/lib") - from cycloneerr import PrettyErrorHandler -except ImportError: - class PrettyErrorHandler(object): - pass +from lib.cycloneerr import PrettyErrorHandler liveClients = set() def sendToLiveClients(d=None, asJson=None):
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/cycloneerr.py Mon Jun 02 00:19:38 2014 +0000 @@ -0,0 +1,17 @@ +import httplib, cgi + +class PrettyErrorHandler(object): + """ + mix-in to improve cyclone.web.RequestHandler + """ + def get_error_html(self, status_code, **kwargs): + try: + tb = kwargs['exception'].getTraceback() + except AttributeError: + tb = "" + return "<html><title>%(code)d: %(message)s</title>" \ + "<body>%(code)d: %(message)s<pre>%(tb)s</pre></body></html>" % { + "code": status_code, + "message": httplib.responses[status_code], + "tb" : cgi.escape(tb), + }
--- a/light9/ascoltami/webapp.py Mon Jun 02 00:10:48 2014 +0000 +++ b/light9/ascoltami/webapp.py Mon Jun 02 00:19:38 2014 +0000 @@ -7,13 +7,7 @@ from web.contrib.template import render_genshi render = render_genshi([sibpath(__file__, ".")], auto_reload=True) -try: - import sys - sys.path.append("../homeauto/lib") - from cycloneerr import PrettyErrorHandler -except ImportError: - class PrettyErrorHandler(object): - pass +from lib.cycloneerr import PrettyErrorHandler _songUris = {} # locationUri : song def songLocation(graph, songUri):