diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-05-30 16:10:59 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-02 08:24:05 +0100 |
commit | 2b362f63428bdd221d82141bb1615ee8950e40b3 (patch) | |
tree | 109f6da6a09317927c2adbd9a16dbc5bf9078f5c /bitbake | |
parent | 2de58c97a5e7d9c0687f66da291c6dc3d37a755a (diff) | |
download | openembedded-core-contrib-2b362f63428bdd221d82141bb1615ee8950e40b3.tar.gz |
bitbake: toaster: fix urllib imports
Some functions have been moved from urllib to urllib.parse
in python 3. Modifying the code to import unquote, urlencode and
unquote_plus from urllib.parse if import from urllib fails should
make it working on both python 2 and python 3.
(Bitbake rev: b91aa29fa20befd9841678a727bb91100363518f)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 9 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/widgets.py | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 8e920f028a..05108975ae 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -200,16 +200,19 @@ def _verify_parameters(g, mandatory_parameters): return None def _redirect_parameters(view, g, mandatory_parameters, *args, **kwargs): - import urllib + try: + from urllib import unquote, urlencode + except ImportError: + from urllib.parse import unquote, urlencode url = reverse(view, kwargs=kwargs) params = {} for i in g: params[i] = g[i] for i in mandatory_parameters: if not i in params: - params[i] = urllib.unquote(str(mandatory_parameters[i])) + params[i] = unquote(str(mandatory_parameters[i])) - return redirect(url + "?%s" % urllib.urlencode(params), permanent = False, **kwargs) + return redirect(url + "?%s" % urlencode(params), permanent = False, **kwargs) class RedirectException(Exception): def __init__(self, view, g, mandatory_parameters, *args, **kwargs): diff --git a/bitbake/lib/toaster/toastergui/widgets.py b/bitbake/lib/toaster/toastergui/widgets.py index 19850fbcf4..551c33cff7 100644 --- a/bitbake/lib/toaster/toastergui/widgets.py +++ b/bitbake/lib/toaster/toastergui/widgets.py @@ -38,7 +38,11 @@ import json import collections import operator import re -import urllib + +try: + from urllib import unquote_plus +except ImportError: + from urllib.parse import unquote_plus import logging logger = logging.getLogger("toaster") |