Skip to content

Commit

Permalink
Factor creating task objects into a separate method.
Browse files Browse the repository at this point in the history
Signed-off-by: mulhern <amulhern@redhat.com>
  • Loading branch information
mulkieran committed Jun 24, 2015
1 parent b50f796 commit 6fcb922
Showing 1 changed file with 17 additions and 13 deletions.
30 changes: 17 additions & 13 deletions blivet/formats/fs.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,19 +100,7 @@ def __init__(self, **kwargs):

DeviceFormat.__init__(self, **kwargs)

# Create task objects
self._info = self._infoClass(self)
self._fsck = self._fsckClass(self)
self._mkfs = self._mkfsClass(self)
self._mount = self._mountClass(self)
self._readlabel = self._readlabelClass(self)
self._resize = self._resizeClass(self)
self._sync = self._syncClass(self)
self._writelabel = self._writelabelClass(self)

# These two may depend on info class, so create them after
self._minsize = self._minsizeClass(self)
self._sizeinfo = self._sizeinfoClass(self)
self._createTaskObjects()

self._current_info = None # info obtained by _info task

Expand Down Expand Up @@ -143,6 +131,22 @@ def __init__(self, **kwargs):
if self.supported:
self.loadModule()

def _createTaskObjects(self):
""" Create task objects belonging to this master object. """
# pylint: disable=attribute-defined-outside-init
self._info = self._infoClass(self)
self._fsck = self._fsckClass(self)
self._mkfs = self._mkfsClass(self)
self._mount = self._mountClass(self)
self._readlabel = self._readlabelClass(self)
self._resize = self._resizeClass(self)
self._sync = self._syncClass(self)
self._writelabel = self._writelabelClass(self)

# These two may depend on info class, so create them after
self._minsize = self._minsizeClass(self)
self._sizeinfo = self._sizeinfoClass(self)

def __repr__(self):
s = DeviceFormat.__repr__(self)
s += (" mountpoint = %(mountpoint)s mountopts = %(mountopts)s\n"
Expand Down

0 comments on commit 6fcb922

Please sign in to comment.