From dcc4579cfa50c02120efb630759380e3b6c85c03 Mon Sep 17 00:00:00 2001 From: Thomas Thrainer Date: Mon, 29 Apr 2013 13:51:20 +0200 Subject: [PATCH] Rename _JoinProcDataPerMinor to _JoinLinesPerMinor In the new context of the DRBD8Info class, the name _JoinProcDataPerMinor doesn't fit any more. _JoinLinesPerMinor reflects more precisely what's done, and doesn't imply that the data comes from /proc/drbd. Signed-off-by: Thomas Thrainer Signed-off-by: Michele Tartara Reviewed-by: Michele Tartara --- lib/block/drbd.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/block/drbd.py b/lib/block/drbd.py index f7667a1..5f1d47b 100644 --- a/lib/block/drbd.py +++ b/lib/block/drbd.py @@ -46,7 +46,7 @@ class DRBD8Status(object): # pylint: disable=R0902 """A DRBD status representation class. Note that this class is meant to be used to parse one of the entries returned - from L{DRBD8Info._JoinProcDataPerMinor}. + from L{DRBD8Info._JoinLinesPerMinor}. """ UNCONF_RE = re.compile(r"\s*[0-9]+:\s*cs:Unconfigured$") @@ -165,7 +165,7 @@ class DRBD8Info(object): def __init__(self, lines): self._version = self._ParseVersion(lines) - self._minors, self._line_per_minor = self._JoinProcDataPerMinor(lines) + self._minors, self._line_per_minor = self._JoinLinesPerMinor(lines) def GetVersion(self): """Return the DRBD version. @@ -216,7 +216,7 @@ class DRBD8Info(object): return retval - def _JoinProcDataPerMinor(self, lines): + def _JoinLinesPerMinor(self, lines): """Transform the raw lines into a dictionary based on the minor. @return: a dictionary of minor: joined lines from /proc/drbd -- 1.7.10.4