bitbake/fetch2: Rename Fetch class to FetchMethod

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index bdec67776f32dcf224315168d69e581dc1d93086..b60ed0ce67393b444760ec5d93c013bd2dc00077 100644 (file)
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -587,7 +587,7 @@ class FetchData(object):
         self.localpath = None
         self.lockfile = None
         (self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(data.expand(url, d))
-        self.date = Fetch.getSRCDate(self, d)
+        self.date = FetchMethod.getSRCDate(self, d)
         self.url = url
         if not self.user and "user" in self.parm:
             self.user = self.parm["user"]
@@ -618,7 +618,7 @@ class FetchData(object):
         if self.method.supports_srcrev():
             self.revisions = {}
             for name in self.names:
-                self.revisions[name] = Fetch.srcrev_internal_helper(self, d, name)
+                self.revisions[name] = FetchMethod.srcrev_internal_helper(self, d, name)
 
             # add compatibility code for non name specified case
             if len(self.names) == 1:
@@ -645,7 +645,7 @@ class FetchData(object):
             self.localpath = self.method.localpath(self.url, self, d)
 
 
-class Fetch(object):
+class FetchMethod(object):
     """Base class for 'fetch'ing data"""
 
     def __init__(self, urls = []):
@@ -893,7 +893,7 @@ class Fetch(object):
         uselocalcount = bb.data.getVar("BB_LOCALCOUNT_OVERRIDE", d, True) or False
         count = None
         if uselocalcount:
-            count = Fetch.localcount_internal_helper(ud, d, name)
+            count = FetchMethod.localcount_internal_helper(ud, d, name)
         if count is None:
             count = localcounts[key + '_count'] or "0"
 

diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py
index 22168a83510f6e5a77b6580cef672e338f9c95dc..e69bc4c8ec51b8079d67af08ab0d1b9b4a2e99c2 100644 (file)
--- a/bitbake/lib/bb/fetch2/bzr.py
+++ b/bitbake/lib/bb/fetch2/bzr.py
@@ -28,9 +28,9 @@ import sys
 import logging
 import bb
 from bb import data
-from bb.fetch2 import Fetch, FetchError, runfetchcmd, logger
+from bb.fetch2 import FetchMethod, FetchError, runfetchcmd, logger
 
-class Bzr(Fetch):
+class Bzr(FetchMethod):
     def supports(self, url, ud, d):
         return ud.type in ['bzr']
 

diff --git a/bitbake/lib/bb/fetch2/cvs.py b/bitbake/lib/bb/fetch2/cvs.py
index d792328c2502144bd3d76c9fdd5a7e240e5b1b18..b440ed7b1770ecbc2c29610737e08e80ffb4fca6 100644 (file)
--- a/bitbake/lib/bb/fetch2/cvs.py
+++ b/bitbake/lib/bb/fetch2/cvs.py
@@ -30,9 +30,9 @@ import os
 import logging
 import bb
 from   bb import data
-from bb.fetch2 import Fetch, FetchError, MissingParameterError, logger
+from bb.fetch2 import FetchMethod, FetchError, MissingParameterError, logger
 
-class Cvs(Fetch):
+class Cvs(FetchMethod):
     """
     Class to fetch a module or modules from cvs repositories
     """

diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 1ae1d4030279f9c85415380308cbae9c028ceba3..38e2c93be4a2a88c28259469424bb2b7043072e6 100644 (file)
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -23,11 +23,11 @@ BitBake 'Fetch' git implementation
 import os
 import bb
 from   bb    import data
-from   bb.fetch2 import Fetch
+from   bb.fetch2 import FetchMethod
 from   bb.fetch2 import runfetchcmd
 from   bb.fetch2 import logger
 
-class Git(Fetch):
+class Git(FetchMethod):
     """Class to fetch a module or modules from git repositories"""
     def init(self, d):
         #

diff --git a/bitbake/lib/bb/fetch2/hg.py b/bitbake/lib/bb/fetch2/hg.py
index ffede8cf5a2927c9da7944aea15924a1625c0a6d..d186b009ddfa151fb31cb4930f5e25cc9b4bad87 100644 (file)
--- a/bitbake/lib/bb/fetch2/hg.py
+++ b/bitbake/lib/bb/fetch2/hg.py
@@ -29,13 +29,13 @@ import sys
 import logging
 import bb
 from bb import data
-from bb.fetch2 import Fetch
+from bb.fetch2 import FetchMethod
 from bb.fetch2 import FetchError
 from bb.fetch2 import MissingParameterError
 from bb.fetch2 import runfetchcmd
 from bb.fetch2 import logger
 
-class Hg(Fetch):
+class Hg(FetchMethod):
     """Class to fetch from mercurial repositories"""
     def supports(self, url, ud, d):
         """

diff --git a/bitbake/lib/bb/fetch2/local.py b/bitbake/lib/bb/fetch2/local.py
index 56b20e56d3772c18c786d0003b6dff91474a9e78..7b840a46d319b688ed5d57b81290440cc0b3ecfe 100644 (file)
--- a/bitbake/lib/bb/fetch2/local.py
+++ b/bitbake/lib/bb/fetch2/local.py
@@ -29,9 +29,9 @@ import os
 import bb
 import bb.utils
 from   bb import data
-from   bb.fetch2 import Fetch
+from   bb.fetch2 import FetchMethod
 
-class Local(Fetch):
+class Local(FetchMethod):
     def supports(self, url, urldata, d):
         """
         Check to see if a given url represents a local fetch.

diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py
index 9b97cf1cc73375ccdb30d3cc1f1a2309dec682cb..5c3a6fea68115de7bf0a45ec91cf80594c047c7d 100644 (file)
--- a/bitbake/lib/bb/fetch2/osc.py
+++ b/bitbake/lib/bb/fetch2/osc.py
@@ -11,12 +11,12 @@ import  sys
 import logging
 import  bb
 from    bb       import data
-from    bb.fetch2 import Fetch
+from    bb.fetch2 import FetchMethod
 from    bb.fetch2 import FetchError
 from    bb.fetch2 import MissingParameterError
 from    bb.fetch2 import runfetchcmd
 
-class Osc(Fetch):
+class Osc(FetchMethod):
     """Class to fetch a module or modules from Opensuse build server
        repositories."""
 
@@ -41,7 +41,7 @@ class Osc(Fetch):
             ud.revision = ud.parm['rev']
         else:
             pv = data.getVar("PV", d, 0)
-            rev = Fetch.srcrev_internal_helper(ud, d)
+            rev = FetchMethod.srcrev_internal_helper(ud, d)
             if rev and rev != True:
                 ud.revision = rev
             else:

diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py
index e98440f59f88d48321513346b88f7498b2b1879e..583dfb93bf64b4d47435ea3e9b9664fc6c6620fb 100644 (file)
--- a/bitbake/lib/bb/fetch2/perforce.py
+++ b/bitbake/lib/bb/fetch2/perforce.py
@@ -30,11 +30,11 @@ import os
 import logging
 import bb
 from   bb import data
-from   bb.fetch2 import Fetch
+from   bb.fetch2 import FetchMethod
 from   bb.fetch2 import FetchError
 from   bb.fetch2 import logger
 
-class Perforce(Fetch):
+class Perforce(FetchMethod):
     def supports(self, url, ud, d):
         return ud.type in ['p4']
 

diff --git a/bitbake/lib/bb/fetch2/repo.py b/bitbake/lib/bb/fetch2/repo.py
index 9d890a5e944b9e79e6031a1c565ff544d68ac31b..3b16fc0144e5984cf8dc8bf417cd2d17f8311be0 100644 (file)
--- a/bitbake/lib/bb/fetch2/repo.py
+++ b/bitbake/lib/bb/fetch2/repo.py
@@ -26,10 +26,10 @@ BitBake "Fetch" repo (git) implementation
 import os
 import bb
 from   bb    import data
-from   bb.fetch2 import Fetch
+from   bb.fetch2 import FetchMethod
 from   bb.fetch2 import runfetchcmd
 
-class Repo(Fetch):
+class Repo(FetchMethod):
     """Class to fetch a module or modules from repo (git) repositories"""
     def supports(self, url, ud, d):
         """

diff --git a/bitbake/lib/bb/fetch2/ssh.py b/bitbake/lib/bb/fetch2/ssh.py
index 29cc272193ac0655087b765f47bcfd18e49863ab..8b07b3a71002b59070e3aae2e9bbbda1891ecead 100644 (file)
--- a/bitbake/lib/bb/fetch2/ssh.py
+++ b/bitbake/lib/bb/fetch2/ssh.py
@@ -38,7 +38,7 @@ IETF secsh internet draft:
 
 import re, os
 from   bb import data
-from   bb.fetch2 import Fetch
+from   bb.fetch2 import FetchMethod
 from   bb.fetch2 import FetchError
 
 
@@ -61,7 +61,7 @@ __pattern__ = re.compile(r'''
  $
 ''', re.VERBOSE)
 
-class SSH(Fetch):
+class SSH(FetchMethod):
     '''Class to fetch a module or modules via Secure Shell'''
 
     def supports(self, url, urldata, d):

diff --git a/bitbake/lib/bb/fetch2/svk.py b/bitbake/lib/bb/fetch2/svk.py
index 8220bf3dc27ac3872a63e4ec06fc233161cafb5d..213d0d3ec43f029f06b7a2ecfaf440e2a0fce8e4 100644 (file)
--- a/bitbake/lib/bb/fetch2/svk.py
+++ b/bitbake/lib/bb/fetch2/svk.py
@@ -29,12 +29,12 @@ import os
 import logging
 import bb
 from   bb import data
-from   bb.fetch2 import Fetch
+from   bb.fetch2 import FetchMethod
 from   bb.fetch2 import FetchError
 from   bb.fetch2 import MissingParameterError
 from   bb.fetch2 import logger
 
-class Svk(Fetch):
+class Svk(FetchMethod):
     """Class to fetch a module or modules from svk repositories"""
     def supports(self, url, ud, d):
         """

diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py
index 267c9bb7e6e430acd46aff751ea9f10c1eeb259d..ce862889038cb5a1d9881ca677d6ac01e2a9789a 100644 (file)
--- a/bitbake/lib/bb/fetch2/svn.py
+++ b/bitbake/lib/bb/fetch2/svn.py
@@ -28,13 +28,13 @@ import sys
 import logging
 import bb
 from   bb import data
-from   bb.fetch2 import Fetch
+from   bb.fetch2 import FetchMethod
 from   bb.fetch2 import FetchError
 from   bb.fetch2 import MissingParameterError
 from   bb.fetch2 import runfetchcmd
 from   bb.fetch2 import logger
 
-class Svn(Fetch):
+class Svn(FetchMethod):
     """Class to fetch a module or modules from svn repositories"""
     def supports(self, url, ud, d):
         """

diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index e33265e1cc32d8c32b3fe71d65bd675097faf3f5..8e34b0c2bd766a6075016bedc891da8e38789d75 100644 (file)
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -30,9 +30,9 @@ import logging
 import bb
 import urllib
 from   bb import data
-from   bb.fetch2 import Fetch, FetchError, encodeurl, decodeurl, logger, runfetchcmd
+from   bb.fetch2 import FetchMethod, FetchError, encodeurl, decodeurl, logger, runfetchcmd
 
-class Wget(Fetch):
+class Wget(FetchMethod):
     """Class to fetch urls via 'wget'"""
     def supports(self, url, ud, d):
         """