--- a/__init__.py	Thu Aug 13 10:50:19 2009 +0200
+++ b/__init__.py	Thu Aug 13 10:57:57 2009 +0200
@@ -18,7 +18,6 @@
 
 import sys, os, logging
 from StringIO import StringIO
-from urllib import quote as urlquote, unquote as urlunquote
 
 from logilab.common.logging_ext import set_log_methods
 

--- a/common/uilib.py	Thu Aug 13 10:50:19 2009 +0200
+++ b/common/uilib.py	Thu Aug 13 10:57:57 2009 +0200
@@ -12,7 +12,6 @@
 
 import csv
 import re
-from urllib import quote as urlquote
 from StringIO import StringIO
 
 from logilab.mtconverter import xml_escape, html_unescape

--- a/req.py	Thu Aug 13 10:50:19 2009 +0200
+++ b/req.py	Thu Aug 13 10:57:57 2009 +0200
@@ -7,6 +7,7 @@
 """
 __docformat__ = "restructuredtext en"
 
+from urllib import quote as urlquote, unquote as urlunquote
 from datetime import time, datetime, timedelta
 
 from logilab.common.decorators import cached

--- a/web/__init__.py	Thu Aug 13 10:50:19 2009 +0200
+++ b/web/__init__.py	Thu Aug 13 10:57:57 2009 +0200
@@ -13,10 +13,10 @@
 from decimal import Decimal
 from datetime import datetime, date, timedelta
 from simplejson import dumps
+from urllib import quote as urlquote
 
 from logilab.common.deprecation import deprecated
 
-from cubicweb.common.uilib import urlquote
 from cubicweb.web._exceptions import *
 
 

--- a/web/views/embedding.py	Thu Aug 13 10:50:19 2009 +0200
+++ b/web/views/embedding.py	Thu Aug 13 10:57:57 2009 +0200
@@ -12,10 +12,10 @@
 import re
 from urlparse import urljoin
 from urllib2 import urlopen, Request, HTTPError
+from urllib import quote as urlquote # XXX should use view.url_quote method
 
 from logilab.mtconverter import guess_encoding
 
-from cubicweb import urlquote # XXX should use view.url_quote method
 from cubicweb.selectors import (one_line_rset, score_entity,
                                 match_search_state, implements)
 from cubicweb.interfaces import IEmbedable