Index: compat2and3.py
==================================================================
--- compat2and3.py
+++ compat2and3.py
@@ -24,11 +24,11 @@
     unicode = unicode
 
     # urllib modules
     import urllib
     import urllib2
-    from urllib import urlencode, unquote as urldecode
+    from urllib import quote_plus as urlencode, unquote as urldecode
     import urlparse
     import cookielib
     
     # filesys
     from StringIO import StringIO
@@ -50,11 +50,11 @@
     unicode = str
 
     # urllib modules
     import urllib.request as urllib
     import urllib.request as urllib2
-    from urllib.parse import urlencode, unquote as urldecode
+    from urllib.parse import quote_plus as urlencode, unquote as urldecode
     import urllib.parse as urlparse
     from http import cookiejar as cookielib
     
     # filesys
     from io import StringIO