From patchwork Mon May 21 23:34:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel] fetch2: quote/unquote url paths Date: Mon, 21 May 2012 23:34:49 -0000 From: Christopher Larson X-Patchwork-Id: 28249 Message-Id: <1337643289-21368-1-git-send-email-kergoth@gmail.com> To: bitbake-devel@lists.openembedded.org This ensures we can handle things like %-encoded characters in the path portion of urls. Signed-off-by: Christopher Larson --- lib/bb/fetch2/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index e3ac4d2..dba8797 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -28,6 +28,7 @@ from __future__ import absolute_import from __future__ import print_function import os, re import logging +import urllib import bb.persist_data, bb.utils from bb import data @@ -147,14 +148,14 @@ def decodeurl(url): s1, s2 = s.split('=') p[s1] = s2 - return (type, host, path, user, pswd, p) + return type, host, urllib.unquote(path), user, pswd, p def encodeurl(decoded): """Encodes a URL from tokens (scheme, network location, path, user, password, parameters). """ - (type, host, path, user, pswd, p) = decoded + type, host, path, user, pswd, p = decoded if not path: raise MissingParameterError('path', "encoded from the data %s" % str(decoded)) @@ -168,7 +169,7 @@ def encodeurl(decoded): url += "@" if host and type != "file": url += "%s" % host - url += "%s" % path + url += "%s" % urllib.quote(path) if p: for parm in p: url += ";%s=%s" % (parm, p[parm])