Fixed up URL quoting a bit.

[wrw.git] / wrw / proto.py
diff --git a/wrw/proto.py b/wrw/proto.py

index 8474b3a..1af091f 100644 (file)
--- a/wrw/proto.py
+++ b/wrw/proto.py
@@ -85,10 +85,29 @@ def htmlq(html):
              ret += c
      return ret
  
+def simpleerror(env, startreq, code, title, msg):
+    buf = """<?xml version="1.0" encoding="US-ASCII"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
+<head>
+<title>%s</title>
+</head>
+<body>
+<h1>%s</h1>
+<p>%s</p>
+</body>
+</html>
+""" % (title, title, htmlq(msg))
+    startreq("%i %s" % (code, title), [("Content-Type", "text/html"), ("Content-Length", str(len(buf)))])
+    return [buf]
+
  def urlq(url):
+    if isinstance(url, unicode):
+        url = url.encode("utf-8")
      ret = ""
+    invalid = "&=#?/\"'"
      for c in url:
-        if c == "&" or c == "=" or c == "#" or c == "?" or c == "/" or (ord(c) <= 32):
+        if c in invalid or (ord(c) <= 32) or (ord(c) >= 128):
              ret += "%%%02X" % ord(c)
          else:
              ret += c