[MERGE] forward port of branch saas-7 up to 5be43b8

1 files changed, 2 insertions, 2 deletions

diff --git a/addons/link_tracker/models/link_tracker.py b/addons/link_tracker/models/link_tracker.py
index ad71b56286e..f387a7e6e7f 100644
--- a/addons/link_tracker/models/link_tracker.py
+++ b/addons/link_tracker/models/link_tracker.py
@@ -5,10 +5,10 @@ import re
 import string
 
 from lxml.html import parse
-from urllib import urlencode
 from urllib2 import urlopen
 from urlparse import urljoin
 from urlparse import urlparse
+from werkzeug import url_encode
 
 from openerp import models, fields, api, _
 
@@ -101,7 +101,7 @@ class link_tracker(models.Model):
             if attr:
                 utms[key] = attr
 
-        self.redirected_url = '%s://%s%s?%s&%s#%s' % (parsed.scheme, parsed.netloc, parsed.path, urlencode(utms), parsed.query, parsed.fragment)
+        self.redirected_url = '%s://%s%s?%s&%s#%s' % (parsed.scheme, parsed.netloc, parsed.path, url_encode(utms), parsed.query, parsed.fragment)
 
     @api.model
     @api.depends('url')