Skip to content

Commit

Permalink
transfer steps: broke out _TransferBuildStep init code
Browse files Browse the repository at this point in the history
Move common code of all transfer steps to _TransferBuildStep.__init__().
This fixes pylint warning: 'E0203 (access-member-before-definition)'
  • Loading branch information
Elmir Jagudin committed Sep 3, 2013
1 parent a9646ea commit 20a0802
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
1 change: 0 additions & 1 deletion common/pylintrc
Expand Up @@ -92,7 +92,6 @@ disable=
C1001,
E0101,
E0202,
E0203,
E0211,
E0213,
E0603,
Expand Down
16 changes: 8 additions & 8 deletions master/buildbot/steps/transfer.py
Expand Up @@ -189,6 +189,10 @@ class _TransferBuildStep(BuildStep):
haltOnFailure = True
flunkOnFailure = True

def __init__(self, workdir=None, **buildstep_kwargs):
BuildStep.__init__(self, **buildstep_kwargs)
self.workdir = workdir

# Check that buildslave version used have implementation for
# a remote command. Raise exception if buildslave is to old.
def checkSlaveVersion(self, command):
Expand Down Expand Up @@ -235,11 +239,10 @@ def __init__(self, slavesrc, masterdest,
workdir=None, maxsize=None, blocksize=16*1024, mode=None,
keepstamp=False, url=None,
**buildstep_kwargs):
BuildStep.__init__(self, **buildstep_kwargs)
_TransferBuildStep.__init__(self, workdir=workdir, **buildstep_kwargs)

self.slavesrc = slavesrc
self.masterdest = masterdest
self.workdir = workdir
self.maxsize = maxsize
self.blocksize = blocksize
if not isinstance(mode, (int, type(None))):
Expand Down Expand Up @@ -302,11 +305,10 @@ class DirectoryUpload(_TransferBuildStep):
def __init__(self, slavesrc, masterdest,
workdir=None, maxsize=None, blocksize=16*1024,
compress=None, url=None, **buildstep_kwargs):
BuildStep.__init__(self, **buildstep_kwargs)
_TransferBuildStep.__init__(self, workdir=workdir, **buildstep_kwargs)

self.slavesrc = slavesrc
self.masterdest = masterdest
self.workdir = workdir
self.maxsize = maxsize
self.blocksize = blocksize
if compress not in (None, 'gz', 'bz2'):
Expand Down Expand Up @@ -407,11 +409,10 @@ class FileDownload(_TransferBuildStep):
def __init__(self, mastersrc, slavedest,
workdir=None, maxsize=None, blocksize=16*1024, mode=None,
**buildstep_kwargs):
BuildStep.__init__(self, **buildstep_kwargs)
_TransferBuildStep.__init__(self, workdir=workdir, **buildstep_kwargs)

self.mastersrc = mastersrc
self.slavedest = slavedest
self.workdir = workdir
self.maxsize = maxsize
self.blocksize = blocksize
if not isinstance(mode, (int, type(None))):
Expand Down Expand Up @@ -468,11 +469,10 @@ class StringDownload(_TransferBuildStep):
def __init__(self, s, slavedest,
workdir=None, maxsize=None, blocksize=16*1024, mode=None,
**buildstep_kwargs):
BuildStep.__init__(self, **buildstep_kwargs)
_TransferBuildStep.__init__(self, workdir=workdir, **buildstep_kwargs)

self.s = s
self.slavedest = slavedest
self.workdir = workdir
self.maxsize = maxsize
self.blocksize = blocksize
if not isinstance(mode, (int, type(None))):
Expand Down

0 comments on commit 20a0802

Please sign in to comment.