Merge branch 'master' into python2

Conflicts:
	wrw/proto.py

diff --cc wrw/proto.py
index a67fa19d1a89921f8778dc6501f0500cfad5d27d,0e3c7984936dda9cdeb81411b2791c3b54b4e845..36a9db9ae4e0a42e14e50978ad43e428ca097a92
--- 1/wrw/proto.py
--- 2/wrw/proto.py
+++ b/wrw/proto.py
@@@ -102,15 -103,15 +102,15 @@@ def simpleerror(env, startreq, code, ti
      return [buf]
  
  def urlq(url):
 -    if isinstance(url, str):
 +    if isinstance(url, unicode):
          url = url.encode("utf-8")
      ret = ""
-     invalid = ";&=#?/\"'"
 -    invalid = b"%;&=#?/\"'"
++    invalid = "%;&=#?/\"'"
      for c in url:
 -        if c in invalid or (c <= 32) or (c >= 128):
 -            ret += "%%%02X" % c
 +        if c in invalid or (ord(c) <= 32) or (ord(c) >= 128):
 +            ret += "%%%02X" % ord(c)
          else:
 -            ret += chr(c)
 +            ret += c
      return ret
  
  class urlerror(ValueError):

diff --cc wrw/sp/cons.py
Simple merge