diff options
| author | xmo-odoo <xmo@odoo.com> | 2017-04-28 09:06:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-28 09:06:53 +0200 |
| commit | b4429c2a91889bf60b56e0c7909c844d357363f7 (patch) | |
| tree | 1ae879a60a34454b4a93425f0ebe7d5ccd029c03 /odoo/http.py | |
| parent | c5579ef89e2a595893d0959bef6fddfdbfb6d697 (diff) | |
[FIX] Various P3-related import changes
* LDAP import: python-ldap is not python3-compatible, pyldap is
Warning: only supported from debian Stretch (current testing)?
https://packages.debian.org/search?searchon=names&keywords=pyldap
* implicitly relative imports
* imports of moved or removed stdlib modules
issue #8530
Diffstat (limited to 'odoo/http.py')
| -rw-r--r-- | odoo/http.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/odoo/http.py b/odoo/http.py index 9eb9e75e101..210361fce1b 100644 --- a/odoo/http.py +++ b/odoo/http.py @@ -20,8 +20,12 @@ import sys import threading import time import traceback -import urllib2 -import urlparse +try: + from urllib.parse import parse_qs, urlparse, quote +except ImportError: + # pylint: disable=bad-python3-import + from urllib2 import quote + from urlparse import parse_qs, urlparse import warnings from os.path import join as opj from zlib import adler32 @@ -344,7 +348,7 @@ class WebRequest(object): debug = self.httprequest.environ.get('HTTP_X_DEBUG_MODE') if not debug and self.httprequest.referrer: - debug = bool(urlparse.parse_qs(urlparse.urlparse(self.httprequest.referrer).query, keep_blank_values=True).get('debug')) + debug = bool(parse_qs(urlparse(self.httprequest.referrer).query, keep_blank_values=True).get('debug')) return debug @contextlib.contextmanager @@ -1250,7 +1254,7 @@ class DisableCacheMiddleware(object): def __call__(self, environ, start_response): def start_wrapped(status, headers): referer = environ.get('HTTP_REFERER', '') - parsed = urlparse.urlparse(referer) + parsed = urlparse(referer) debug = parsed.query.count('debug') >= 1 new_headers = [] @@ -1616,7 +1620,7 @@ def send_file(filepath_or_fp, mimetype=None, as_attachment=False, filename=None, def content_disposition(filename): filename = odoo.tools.ustr(filename) - escaped = urllib2.quote(filename.encode('utf8')) + escaped = quote(filename.encode('utf8')) browser = request.httprequest.user_agent.browser version = int((request.httprequest.user_agent.version or '0').split('.')[0]) if browser == 'msie' and version < 9: |