[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4965/8267] bitbake: fetch2: remove last remaining usage of deprecated bb.data APIs

[Emmanuele Bassi <ebassi src gnome org>]

commit 0788007ccf66e290a7893248aa507e48366ebdfa
Author: Andre McCurdy <armccurdy gmail com>
Date:   Thu Mar 2 16:22:00 2017 -0800

    bitbake: fetch2: remove last remaining usage of deprecated bb.data APIs
    
    (Bitbake rev: 62dc3c3b40a95f9df31f5c917574c3822fb8bb64)
    
    Signed-off-by: Andre McCurdy <armccurdy gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/fetch2/__init__.py |    3 +--
 bitbake/lib/bb/fetch2/npm.py      |    1 -
 2 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 5209f4d..327da87 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -38,7 +38,6 @@ import pickle
 import errno
 import bb.persist_data, bb.utils
 import bb.checksum
-from bb import data
 import bb.process
 
 __version__ = "2"
@@ -1183,7 +1182,7 @@ class FetchData(object):
         self.mirrortarball = None
         self.basename = None
         self.basepath = None
-        (self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(data.expand(url, d))
+        (self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(d.expand(url))
         self.date = self.getSRCDate(d)
         self.url = url
         if not self.user and "user" in self.parm:
diff --git a/bitbake/lib/bb/fetch2/npm.py b/bitbake/lib/bb/fetch2/npm.py
index 780f26d..73a75fe 100644
--- a/bitbake/lib/bb/fetch2/npm.py
+++ b/bitbake/lib/bb/fetch2/npm.py
@@ -25,7 +25,6 @@ import json
 import subprocess
 import signal
 import bb
-from   bb import data
 from   bb.fetch2 import FetchMethod
 from   bb.fetch2 import FetchError
 from   bb.fetch2 import ChecksumError