[gnome-continuous-yocto/gnomeostree-3.28-rocko: 614/8267] scripts: Fix	urlparse imports for python3
- From: Emmanuele Bassi <ebassi src gnome org>
 
- To: commits-list gnome org
 
- Cc: 
 
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 614/8267] scripts: Fix	urlparse imports for python3
 
- Date: Sat, 16 Dec 2017 20:40:25 +0000 (UTC)
 
commit 0d7db8e732a9032c68364ad12167c280310aa599
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Thu May 19 12:33:44 2016 +0300
    scripts: Fix urlparse imports for python3
    
    Used urllib.parse instead of urlparse to make code
    working in python 3.
    
    (From OE-Core rev: 0a064f2216895db0181ee033a785328e704ddc0b)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
 scripts/lib/recipetool/create.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 744ff1b..1297428 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -24,7 +24,7 @@ import re
 import json
 import logging
 import scriptutils
-import urlparse
+from urllib.parse import urlparse, urldefrag, urlsplit
 import hashlib
 
 logger = logging.getLogger('recipetool')
@@ -283,7 +283,7 @@ def determine_from_url(srcuri):
     """Determine name and version from a URL"""
     pn = None
     pv = None
-    parseres = urlparse.urlparse(srcuri.lower().split(';', 1)[0])
+    parseres = urlparse(srcuri.lower().split(';', 1)[0])
     if parseres.path:
         if 'github.com' in parseres.netloc:
             res = re.search(r'.*/(.*?)/archive/(.*)-final\.(tar|zip)', parseres.path)
@@ -355,7 +355,7 @@ def create_recipe(args):
     srcrev = '${AUTOREV}'
     if '://' in args.source:
         # Fetch a URL
-        fetchuri = reformat_git_uri(urlparse.urldefrag(args.source)[0])
+        fetchuri = reformat_git_uri(urldefrag(args.source)[0])
         if args.binary:
             # Assume the archive contains the directory structure verbatim
             # so we need to extract to a subdirectory
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]