diff options
Diffstat (limited to 'libpathod')
| -rw-r--r-- | libpathod/app.py | 10 | ||||
| -rw-r--r-- | libpathod/language.py (renamed from libpathod/rparse.py) | 0 | ||||
| -rw-r--r-- | libpathod/pathoc.py | 18 | ||||
| -rw-r--r-- | libpathod/pathod.py | 22 |
4 files changed, 25 insertions, 25 deletions
diff --git a/libpathod/app.py b/libpathod/app.py index 0db31ae5..396e45c2 100644 --- a/libpathod/app.py +++ b/libpathod/app.py @@ -1,6 +1,6 @@ import logging, pprint, cStringIO from flask import Flask, jsonify, render_template, request, abort, make_response -import version, rparse, utils +import version, language, utils logging.basicConfig(level="DEBUG") app = Flask(__name__) @@ -116,14 +116,14 @@ def _preview(is_request): try: if is_request: - r = rparse.parse_request(app.config["pathod"].request_settings, spec) + r = language.parse_request(app.config["pathod"].request_settings, spec) else: - r = rparse.parse_response(app.config["pathod"].request_settings, spec) - except rparse.ParseException, v: + r = language.parse_response(app.config["pathod"].request_settings, spec) + except language.ParseException, v: args["syntaxerror"] = str(v) args["marked"] = v.marked() return render(template, False, **args) - except rparse.FileAccessDenied: + except language.FileAccessDenied: args["error"] = "File access is disabled." return render(template, False, **args) diff --git a/libpathod/rparse.py b/libpathod/language.py index 53878b97..53878b97 100644 --- a/libpathod/rparse.py +++ b/libpathod/language.py diff --git a/libpathod/pathoc.py b/libpathod/pathoc.py index 7551c589..bab568ca 100644 --- a/libpathod/pathoc.py +++ b/libpathod/pathoc.py @@ -1,7 +1,7 @@ import sys, os from netlib import tcp, http import netlib.utils -import rparse, utils +import language, utils class PathocError(Exception): pass @@ -18,10 +18,10 @@ class Pathoc(tcp.TCPClient): """ Return an (httpversion, code, msg, headers, content) tuple. - May raise rparse.ParseException, netlib.http.HttpError or - rparse.FileAccessDenied. + May raise language.ParseException, netlib.http.HttpError or + language.FileAccessDenied. """ - r = rparse.parse_request(self.settings, spec) + r = language.parse_request(self.settings, spec) ret = r.serve(self.wfile, None, self.host) self.wfile.flush() return http.read_response(self.rfile, r.method, None) @@ -53,23 +53,23 @@ class Pathoc(tcp.TCPClient): Returns True if we have a non-ignored response. """ try: - r = rparse.parse_request(self.settings, spec) - except rparse.ParseException, v: + r = language.parse_request(self.settings, spec) + except language.ParseException, v: print >> fp, "Error parsing request spec: %s"%v.msg print >> fp, v.marked() return - except rparse.FileAccessDenied, v: + except language.FileAccessDenied, v: print >> fp, "File access error: %s"%v return resp, req = None, None if showreq: self.wfile.start_log() + if showresp: + self.rfile.start_log() try: req = r.serve(self.wfile, None, self.host) self.wfile.flush() - if showresp: - self.rfile.start_log() resp = http.read_response(self.rfile, r.method, None) except http.HttpError, v: print >> fp, "<< HTTP Error:", v.msg diff --git a/libpathod/pathod.py b/libpathod/pathod.py index 6afcf4bf..4ce268fa 100644 --- a/libpathod/pathod.py +++ b/libpathod/pathod.py @@ -1,7 +1,7 @@ import urllib, threading, re, logging, socket, sys from netlib import tcp, http, odict, wsgi import netlib.utils -import version, app, rparse +import version, app, language logger = logging.getLogger('pathod') @@ -30,7 +30,7 @@ class PathodHandler(tcp.BaseHandler): def handle_request(self): """ - Returns a (again, log) tuple. + Returns a (again, log) tuple. again: True if request handling should continue. log: A dictionary, or None @@ -76,26 +76,26 @@ class PathodHandler(tcp.BaseHandler): for i in self.server.anchors: if i[0].match(path): self.info("crafting anchor: %s"%path) - aresp = rparse.parse_response(self.server.request_settings, i[1]) + aresp = language.parse_response(self.server.request_settings, i[1]) return self.serve_crafted(aresp, request_log) if not self.server.nocraft and path.startswith(self.server.craftanchor): spec = urllib.unquote(path)[len(self.server.craftanchor):] self.info("crafting spec: %s"%spec) try: - crafted = rparse.parse_response(self.server.request_settings, spec) - except rparse.ParseException, v: + crafted = language.parse_response(self.server.request_settings, spec) + except language.ParseException, v: self.info("Parse error: %s"%v.msg) - crafted = rparse.PathodErrorResponse( + crafted = language.PathodErrorResponse( "Parse Error", "Error parsing response spec: %s\n"%v.msg + v.marked() ) - except rparse.FileAccessDenied: + except language.FileAccessDenied: self.info("File access denied") - crafted = rparse.PathodErrorResponse("Access Denied") + crafted = language.PathodErrorResponse("Access Denied") return self.serve_crafted(crafted, request_log) elif self.server.noweb: - crafted = rparse.PathodErrorResponse("Access Denied") + crafted = language.PathodErrorResponse("Access Denied") crafted.serve(self.wfile, self.server.check_policy) return False, dict(type = "error", msg="Access denied: web interface disabled") else: @@ -200,8 +200,8 @@ class Pathod(tcp.TCPServer): except re.error: raise PathodError("Invalid regex in anchor: %s"%i[0]) try: - aresp = rparse.parse_response(self.request_settings, i[1]) - except rparse.ParseException, v: + aresp = language.parse_response(self.request_settings, i[1]) + except language.ParseException, v: raise PathodError("Invalid page spec in anchor: '%s', %s"%(i[1], str(v))) self.anchors.append((arex, i[1])) |