X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fproto.py;h=1af091f92fb44a5a3dc4aea4f05ab9aae605a096;hb=ecbfa279cc6f56df7a84d150c527923730986d36;hp=4cf19519bb739832d841defe522ae5a49f80ec6a;hpb=d740aa68a4d205076b2d132067ac2c31ceb3cd2e;p=wrw.git

diff --git a/wrw/proto.py b/wrw/proto.py
index 4cf1951..1af091f 100644
--- a/wrw/proto.py
+++ b/wrw/proto.py
@@ -102,9 +102,12 @@ def simpleerror(env, startreq, code, title, msg):
     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