From 6623d79adaf445081e68b307355292077800d4f4 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 9 Apr 2010 17:11:03 -0700 Subject: Stop using functions via 'bb' that were moved from there to other modules (Bitbake rev: 03a6c26f8da226f442c3cab557e4733f7cd6eeac) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bitbake/lib/bb/fetch/__init__.py') diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py index 15292c6b7..b1b5eda35 100644 --- a/bitbake/lib/bb/fetch/__init__.py +++ b/bitbake/lib/bb/fetch/__init__.py @@ -118,9 +118,9 @@ def uri_replace(uri, uri_find, uri_replace, d): # bb.msg.note(1, bb.msg.domain.Fetcher, "uri_replace: operating on %s" % uri) if not uri or not uri_find or not uri_replace: bb.msg.debug(1, bb.msg.domain.Fetcher, "uri_replace: passed an undefined value, not replacing") - uri_decoded = list(bb.decodeurl(uri)) - uri_find_decoded = list(bb.decodeurl(uri_find)) - uri_replace_decoded = list(bb.decodeurl(uri_replace)) + uri_decoded = list(decodeurl(uri)) + uri_find_decoded = list(decodeurl(uri_find)) + uri_replace_decoded = list(decodeurl(uri_replace)) result_decoded = ['','','','','',{}] for i in uri_find_decoded: loc = uri_find_decoded.index(i) @@ -141,7 +141,7 @@ def uri_replace(uri, uri_find, uri_replace, d): # else: # for j in i: # FIXME: apply replacements against options - return bb.encodeurl(result_decoded) + return encodeurl(result_decoded) methods = [] urldata_cache = {} @@ -474,7 +474,7 @@ class FetchData(object): """ def __init__(self, url, d): self.localfile = "" - (self.type, self.host, self.path, self.user, self.pswd, self.parm) = bb.decodeurl(data.expand(url, d)) + (self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(data.expand(url, d)) self.date = Fetch.getSRCDate(self, d) self.url = url if not self.user and "user" in self.parm: -- cgit v1.2.3