fetch2: remove last remaining usage of deprecated bb.data APIs

PATCH New Andre McCurdy 1 participant 1 message Mar 3, 2017

lore

Share & tools

lore

Andre McCurdy

author

2017-03-03 00:22 UTC #0 lore raw

PATCH 1/1 fetch2: remove last remaining usage of deprecated bb.data APIs

Signed-off-by Andre McCurdy <[email protected]>

---
 lib/bb/fetch2/__init__.py | 3 +--
 lib/bb/fetch2/npm.py      | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

lib/bb/fetch2/__init__.py +1 -2

index 0205c3d..2f9813e 100644
@@ -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"

@@ -1179,7 +1178,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:

lib/bb/fetch2/npm.py +0 -1

index 780f26d..73a75fe 100644
@@ -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

Signature · 1 line

1.9.1