From 4ab9ad6868e63115ccf7259a152c9fa67fbee2c9 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 13 Jan 2010 00:17:23 +0100 Subject: Migrate overlay classes to using super() --- layman/overlays/bzr.py | 4 ++-- layman/overlays/cvs.py | 4 ++-- layman/overlays/darcs.py | 4 ++-- layman/overlays/git.py | 4 ++-- layman/overlays/mercurial.py | 4 ++-- layman/overlays/rsync.py | 6 +++--- layman/overlays/svn.py | 6 +++--- layman/overlays/tar.py | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py index debf617..6d7aa8c 100644 --- a/layman/overlays/bzr.py +++ b/layman/overlays/bzr.py @@ -43,7 +43,7 @@ class BzrOverlay(Overlay): def __init__(self, xml, config, ignore = 0, quiet = False): - Overlay.__init__(self, xml, config, ignore) + super(BzrOverlay, self).__init__(xml, config, ignore) def add(self, base, quiet = False): '''Add overlay.''' @@ -65,5 +65,5 @@ class BzrOverlay(Overlay): def supported(self): '''Overlay type supported?''' - return Overlay.supported(self, [(self.command(), 'bzr', + return super(BzrOverlay, self).supported([(self.command(), 'bzr', 'dev-util/bzr'),]) diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py index 5c8d376..1e28cfc 100644 --- a/layman/overlays/cvs.py +++ b/layman/overlays/cvs.py @@ -43,7 +43,7 @@ class CvsOverlay(Overlay): def __init__(self, xml, config, ignore = 0, quiet = False): - Overlay.__init__(self, xml, config, ignore, quiet) + super(CvsOverlay, self).__init__(xml, config, ignore, quiet) _subpath = xml.find('subpath') if _subpath != None: @@ -100,5 +100,5 @@ class CvsOverlay(Overlay): def supported(self): '''Overlay type supported?''' - return Overlay.supported(self, [(self.command(), 'cvs', + return super(CvsOverlay, self).supported([(self.command(), 'cvs', 'dev-util/cvs'),]) diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py index 9604f6a..049c0e2 100644 --- a/layman/overlays/darcs.py +++ b/layman/overlays/darcs.py @@ -42,7 +42,7 @@ class DarcsOverlay(Overlay): def __init__(self, xml, config, ignore = 0, quiet = False): - Overlay.__init__(self, xml, config, ignore) + super(DarcsOverlay, self).__init__(xml, config, ignore) def add(self, base, quiet = False): '''Add overlay.''' @@ -63,5 +63,5 @@ class DarcsOverlay(Overlay): def supported(self): '''Overlay type supported?''' - return Overlay.supported(self, [(self.command(), 'darcs', + return super(DarcsOverlay, self).supported([(self.command(), 'darcs', 'dev-util/darcs'),]) diff --git a/layman/overlays/git.py b/layman/overlays/git.py index c91938e..7a9a3d7 100644 --- a/layman/overlays/git.py +++ b/layman/overlays/git.py @@ -41,7 +41,7 @@ class GitOverlay(Overlay): def __init__(self, xml, config, ignore = 0, quiet = False): - Overlay.__init__(self, xml, config, ignore) + super(GitOverlay, self).__init__(xml, config, ignore) def add(self, base, quiet = False): '''Add overlay.''' @@ -76,5 +76,5 @@ class GitOverlay(Overlay): def supported(self): '''Overlay type supported?''' - return Overlay.supported(self, [(self.command(), 'git', + return super(GitOverlay, self).supported([(self.command(), 'git', 'dev-util/git'),]) diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py index daa686c..3ee068c 100644 --- a/layman/overlays/mercurial.py +++ b/layman/overlays/mercurial.py @@ -42,7 +42,7 @@ class MercurialOverlay(Overlay): def __init__(self, xml, config, ignore = 0, quiet = False): - Overlay.__init__(self, xml, config, ignore) + super(MercurialOverlay, self).__init__(xml, config, ignore) def add(self, base, quiet = False): '''Add overlay.''' @@ -63,5 +63,5 @@ class MercurialOverlay(Overlay): def supported(self): '''Overlay type supported?''' - return Overlay.supported(self, [(self.command(), 'mercurial', + return super(MercurialOverlay, self).supported([(self.command(), 'mercurial', 'dev-util/mercurial'),]) diff --git a/layman/overlays/rsync.py b/layman/overlays/rsync.py index f906817..9856ba1 100644 --- a/layman/overlays/rsync.py +++ b/layman/overlays/rsync.py @@ -42,14 +42,14 @@ class RsyncOverlay(Overlay): def __init__(self, xml, config, ignore = 0, quiet = False): - Overlay.__init__(self, xml, config, ignore) + super(RsyncOverlay, self).__init__(xml, config, ignore) def add(self, base, quiet = False): '''Add overlay.''' self.supported() - Overlay.add(self, base) + super(RsyncOverlay, self).add(base) return self.sync(base) @@ -73,5 +73,5 @@ class RsyncOverlay(Overlay): def supported(self): '''Overlay type supported?''' - return Overlay.supported(self, [(self.command(), 'rsync', + return super(RsyncOverlay, self).supported([(self.command(), 'rsync', 'net-misc/rsync'),]) diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py index ca9db80..da26f00 100644 --- a/layman/overlays/svn.py +++ b/layman/overlays/svn.py @@ -41,14 +41,14 @@ class SvnOverlay(Overlay): def __init__(self, xml, config, ignore = 0, quiet = False): - Overlay.__init__(self, xml, config, ignore) + super(SvnOverlay, self).__init__(xml, config, ignore) def add(self, base, quiet = False): '''Add overlay.''' self.supported() - Overlay.add(self, base) + super(SvnOverlay, self).add(base) if quiet: quiet_option = '-q ' @@ -74,5 +74,5 @@ class SvnOverlay(Overlay): def supported(self): '''Overlay type supported?''' - return Overlay.supported(self, [(self.command(), 'svn', + return super(SvnOverlay, self).supported([(self.command(), 'svn', 'dev-util/subversion'),]) diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py index 65dba7f..a5474a9 100644 --- a/layman/overlays/tar.py +++ b/layman/overlays/tar.py @@ -67,7 +67,7 @@ class TarOverlay(Overlay): def __init__(self, xml, config, ignore = 0, quiet = False): - Overlay.__init__(self, xml, config, ignore) + super(TarOverlay, self).__init__(xml, config, ignore) _subpath = xml.find('subpath') if _subpath != None: @@ -177,7 +177,7 @@ class TarOverlay(Overlay): def supported(self): '''Overlay type supported?''' - return Overlay.supported(self, [(self.command(), 'tar', 'app-arch/tar'), ]) + return super(TarOverlay, self).supported([(self.command(), 'tar', 'app-arch/tar'), ]) if __name__ == '__main__': import doctest -- cgit v1.2.3-1-g7c22