From 21e4826802c900f6ed802a93a4669507d5ddcb1d Mon Sep 17 00:00:00 2001 From: "brett.cannon" Date: Sun, 3 Aug 2008 00:51:02 +0000 Subject: [PATCH] Silence some SyntaxWarnings for tuple unpacking in a parameter list for urlparse when run under -3. git-svn-id: http://svn.python.org/projects/python/trunk@65423 6015fed2-1504-0410-9fe1-9d1591cc4771 --- Lib/urlparse.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/urlparse.py b/Lib/urlparse.py index 631a5a1cb3..c384db782b 100644 --- a/Lib/urlparse.py +++ b/Lib/urlparse.py @@ -173,16 +173,18 @@ def urlsplit(url, scheme='', allow_fragments=True): _parse_cache[key] = v return v -def urlunparse((scheme, netloc, url, params, query, fragment)): +def urlunparse(data): """Put a parsed URL back together again. This may result in a slightly different, but equivalent URL, if the URL that was parsed originally had redundant delimiters, e.g. a ? with an empty query (the draft states that these are equivalent).""" + scheme, netloc, url, params, query, fragment = data if params: url = "%s;%s" % (url, params) return urlunsplit((scheme, netloc, url, query, fragment)) -def urlunsplit((scheme, netloc, url, query, fragment)): +def urlunsplit(data): + scheme, netloc, url, query, fragment = data if netloc or (scheme and scheme in uses_netloc and url[:2] != '//'): if url and url[:1] != '/': url = '/' + url url = '//' + (netloc or '') + url -- 2.11.4.GIT