Move static methods out of Maintainers class

We're not writing C++, they are still scoped to the module namespace, so
making them @staticmethod just makes using them require more verbiage.

8 files changed, 125 insertions, 126 deletions

diff --git a/calm/calm.py b/calm/calm.py
index dc5df16..1757da3 100755
--- a/calm/calm.py
+++ b/calm/calm.py
@@ -131,10 +131,10 @@ def process_relarea(args):
 
 def process_uploads(args, state):
     # read maintainer list
-    mlist = maintainers.Maintainer.read(args, getattr(args, 'orphanmaint', None))
+    mlist = maintainers.read(args, getattr(args, 'orphanmaint', None))
 
     # make the list of all packages
-    all_packages = maintainers.Maintainer.all_packages(mlist)
+    all_packages = maintainers.all_packages(mlist)
 
     # for each maintainer
     for name in sorted(mlist.keys()):
@@ -260,7 +260,7 @@ def process_uploads(args, state):
             irk.irk("calm %s" % msg)
 
     # record updated reminder times for maintainers
-    maintainers.Maintainer.update_reminder_times(mlist)
+    maintainers.update_reminder_times(mlist)
 
     return state.packages
 
diff --git a/calm/compare-arches b/calm/compare-arches
index 37e1861..4e2dd19 100755
--- a/calm/compare-arches
+++ b/calm/compare-arches
@@ -91,8 +91,8 @@ def main(args):
         print("%s is only in arch %s" % (p, [a for a in exists if exists[a]]))
 
     # are there any packages which have a maintainer, but don't exist?
-    mlist = maintainers.Maintainer.read(args, getattr(args, 'orphanmaint', None))
-    all_packages = maintainers.Maintainer.all_packages(mlist)
+    mlist = maintainers.read(args, getattr(args, 'orphanmaint', None))
+    all_packages = maintainers.all_packages(mlist)
 
     for p in sorted(all_packages):
         if p not in union:
diff --git a/calm/maintainers.py b/calm/maintainers.py
index c494484..16b219c 100644
--- a/calm/maintainers.py
+++ b/calm/maintainers.py
@@ -102,125 +102,124 @@ class Maintainer(object):
         mlist.setdefault(name, Maintainer(name))
         return mlist[name]
 
-    # add maintainers which have existing directories
-    @classmethod
-    def add_directories(self, mlist, homedirs):
-        self._homedirs = homedirs
-
-        for n in os.listdir(homedirs):
-            if not os.path.isdir(os.path.join(homedirs, n)):
-                continue
-
-            m = Maintainer._find(mlist, n)
-
-            for e in ['!email', '!mail']:
-                email = os.path.join(homedirs, m.name, e)
-                if os.path.isfile(email):
-                    with open(email) as f:
-                        for l in f:
-                            # one address per line, ignore blank and comment lines
-                            if l.startswith('#'):
-                                continue
-                            l = l.strip()
-                            if l:
-                                m.email.append(l)
-            if not m.email:
-                logging.error("no email address known for maintainer '%s'" % (m.name))
-
-        return mlist
-
-    # add maintainers from the package maintainers list, with the packages they
-    # maintain
-    @staticmethod
-    def add_packages(mlist, pkglist, orphanMaint=None):
-        with open(pkglist) as f:
-            for (i, l) in enumerate(f):
-                l = l.rstrip()
-
-                # match lines of the form '<package> <maintainer(s)|status>'
-                match = re.match(r'^(\S+)\s+(.+)$', l)
-                if match:
-                    pkg = match.group(1)
-                    rest = match.group(2)
-
-                    # does rest starts with a status in all caps?
-                    status_match = re.match(r'^([A-Z]+)\b.*$', rest)
-                    if status_match:
-                        status = status_match.group(1)
-
-                        # ignore packages marked as 'OBSOLETE'
-                        if status == 'OBSOLETE':
-                            continue
 
-                        # orphaned packages get the default maintainer if we
-                        # have one, otherwise they are assigned to 'ORPHANED'
-                        elif status == 'ORPHANED':
-                            if orphanMaint is not None:
-                                m = orphanMaint
-                            else:
-                                m = status
+# add maintainers which have existing directories
+def add_directories(mlist, homedirs):
+    Maintainer._homedirs = homedirs
 
-                            # also add any previous maintainer(s) listed
-                            prevm = re.match(r'^ORPHANED\s\((.*)\)', rest)
-                            if prevm:
-                                m = m + '/' + prevm.group(1)
+    for n in os.listdir(homedirs):
+        if not os.path.isdir(os.path.join(homedirs, n)):
+            continue
 
-                        else:
-                            logging.error("unknown package status '%s' in line %s:%d: '%s'" % (status, pkglist, i, l))
+        m = Maintainer._find(mlist, n)
+
+        for e in ['!email', '!mail']:
+            email = os.path.join(homedirs, m.name, e)
+            if os.path.isfile(email):
+                with open(email) as f:
+                    for l in f:
+                        # one address per line, ignore blank and comment lines
+                        if l.startswith('#'):
                             continue
+                        l = l.strip()
+                        if l:
+                            m.email.append(l)
+        if not m.email:
+            logging.error("no email address known for maintainer '%s'" % (m.name))
+
+    return mlist
+
+
+# add maintainers from the package maintainers list, with the packages they
+# maintain
+def add_packages(mlist, pkglist, orphanMaint=None):
+    with open(pkglist) as f:
+        for (i, l) in enumerate(f):
+            l = l.rstrip()
+
+            # match lines of the form '<package> <maintainer(s)|status>'
+            match = re.match(r'^(\S+)\s+(.+)$', l)
+            if match:
+                pkg = match.group(1)
+                rest = match.group(2)
+
+                # does rest starts with a status in all caps?
+                status_match = re.match(r'^([A-Z]+)\b.*$', rest)
+                if status_match:
+                    status = status_match.group(1)
+
+                    # ignore packages marked as 'OBSOLETE'
+                    if status == 'OBSOLETE':
+                        continue
+
+                    # orphaned packages get the default maintainer if we
+                    # have one, otherwise they are assigned to 'ORPHANED'
+                    elif status == 'ORPHANED':
+                        if orphanMaint is not None:
+                            m = orphanMaint
+                        else:
+                            m = status
+
+                        # also add any previous maintainer(s) listed
+                        prevm = re.match(r'^ORPHANED\s\((.*)\)', rest)
+                        if prevm:
+                            m = m + '/' + prevm.group(1)
                     else:
-                        m = rest
-
-                    # joint maintainers are separated by '/'
-                    for name in m.split('/'):
-                        name = name.strip()
-
-                        # is the maintainer name ascii?
-                        #
-                        # (despite containing spaces, think of these as an account
-                        # name, rather than a display name)
-                        try:
-                            name.encode('ascii')
-                        except UnicodeError:
-                            logging.error("non-ascii maintainer name '%s' in line %s:%d, skipped" % (rest, pkglist, i))
-                            continue
+                        logging.error("unknown package status '%s' in line %s:%d: '%s'" % (status, pkglist, i, l))
+                        continue
+                else:
+                    m = rest
 
-                        m = Maintainer._find(mlist, name)
-                        m.pkgs.append(pkg)
+                # joint maintainers are separated by '/'
+                for name in m.split('/'):
+                    name = name.strip()
 
-                else:
-                    logging.error("unrecognized line in %s:%d: '%s'" % (pkglist, i, l))
+                    # is the maintainer name ascii?
+                    #
+                    # (despite containing spaces, think of these as an account
+                    # name, rather than a display name)
+                    try:
+                        name.encode('ascii')
+                    except UnicodeError:
+                        logging.error("non-ascii maintainer name '%s' in line %s:%d, skipped" % (rest, pkglist, i))
+                        continue
 
-        return mlist
+                    m = Maintainer._find(mlist, name)
+                    m.pkgs.append(pkg)
 
-    # create maintainer list
-    @staticmethod
-    def read(args, orphanmaint=None):
-        mlist = {}
-        mlist = Maintainer.add_directories(mlist, args.homedir)
-        mlist = Maintainer.add_packages(mlist, args.pkglist, orphanmaint)
+            else:
+                logging.error("unrecognized line in %s:%d: '%s'" % (pkglist, i, l))
 
-        return mlist
+    return mlist
 
-    # invert to a per-package list of maintainers
-    @staticmethod
-    def invert(mlist):
-        _pkgs = defaultdict(list)
-        # for each maintainer
-        for m in mlist.values():
-            # for each package
-            for p in m.pkgs:
-                # add the maintainer name
-                _pkgs[p].append(m.name)
 
-        return _pkgs
+# create maintainer list
+def read(args, orphanmaint=None):
+    mlist = {}
+    mlist = add_directories(mlist, args.homedir)
+    mlist = add_packages(mlist, args.pkglist, orphanmaint)
 
-    @staticmethod
-    def update_reminder_times(mlist):
-        for m in mlist.values():
-            m._update_reminder_time()
+    return mlist
 
-    # a list of all packages
-    @staticmethod
-    def all_packages(mlist):
-        return list(itertools.chain.from_iterable(mlist[m].pkgs for m in mlist))
+
+# invert to a per-package list of maintainers
+def invert(mlist):
+    _pkgs = defaultdict(list)
+    # for each maintainer
+    for m in mlist.values():
+        # for each package
+        for p in m.pkgs:
+            # add the maintainer name
+            _pkgs[p].append(m.name)
+
+    return _pkgs
+
+
+def update_reminder_times(mlist):
+    for m in mlist.values():
+        m._update_reminder_time()
+
+
+# a list of all packages
+def all_packages(mlist):
+    return list(itertools.chain.from_iterable(mlist[m].pkgs for m in mlist))
diff --git a/calm/mkgitoliteconf.py b/calm/mkgitoliteconf.py
index 39c185c..0e12c6e 100755
--- a/calm/mkgitoliteconf.py
+++ b/calm/mkgitoliteconf.py
@@ -51,10 +51,10 @@ def transform_username(name):
 def do_main(args):
     # read maintainer list
     mlist = {}
-    mlist = maintainers.Maintainer.add_packages(mlist, args.pkglist, getattr(args, 'orphanmaint', None))
+    mlist = maintainers.add_packages(mlist, args.pkglist, getattr(args, 'orphanmaint', None))
 
     # make the list of all packages
-    maintainers.Maintainer.all_packages(mlist)
+    maintainers.all_packages(mlist)
 
     # invert to a per-package list of maintainers
     pkgs = defaultdict(list)
diff --git a/calm/mkmaintdir b/calm/mkmaintdir
index 2023ae6..88c385a 100755
--- a/calm/mkmaintdir
+++ b/calm/mkmaintdir
@@ -71,8 +71,8 @@ def main(args):
 
     # create maintainer list
     mlist = {}
-    mlist = maintainers.Maintainer.add_directories(mlist, args.homedir)
-    mlist = maintainers.Maintainer.add_packages(mlist, args.pkglist, args.orphanmaint)
+    mlist = maintainers.add_directories(mlist, args.homedir)
+    mlist = maintainers.add_packages(mlist, args.pkglist, args.orphanmaint)
 
     # create or suggest removal for each maintainer directory
     for name in sorted(mlist.keys()):
diff --git a/calm/package.py b/calm/package.py
index 66d03df..3ad4252 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -915,10 +915,10 @@ def validate_package_maintainers(args, packages):
 
     # read maintainer list
     mlist = {}
-    mlist = maintainers.Maintainer.add_packages(mlist, args.pkglist)
+    mlist = maintainers.add_packages(mlist, args.pkglist)
 
     # make the list of all packages
-    all_packages = maintainers.Maintainer.all_packages(mlist)
+    all_packages = maintainers.all_packages(mlist)
 
     # validate that all packages are in the package list
     for p in sorted(packages):
@@ -1165,8 +1165,8 @@ def write_repo_json(args, packages, f):
     for arch in packages:
         package_list.update(packages[arch])
 
-    mlist = maintainers.Maintainer.read(args, None)
-    pkg_maintainers = maintainers.Maintainer.invert(mlist)
+    mlist = maintainers.read(args, None)
+    pkg_maintainers = maintainers.invert(mlist)
 
     pl = []
     for pn in sorted(package_list):
diff --git a/calm/pkg2html.py b/calm/pkg2html.py
index f554f39..3750e81 100755
--- a/calm/pkg2html.py
+++ b/calm/pkg2html.py
@@ -135,8 +135,8 @@ def update_package_listings(args, packages):
     summaries = os.path.join(args.htdocs, 'summary')
     ensure_dir_exists(args, summaries)
 
-    mlist = maintainers.Maintainer.read(args, None)
-    pkg_maintainers = maintainers.Maintainer.invert(mlist)
+    mlist = maintainers.read(args, None)
+    pkg_maintainers = maintainers.invert(mlist)
 
     toremove = glob.glob(os.path.join(summaries, '*'))
 
diff --git a/test/test_calm.py b/test/test_calm.py
index 17aeb86..8c926bf 100755
--- a/test/test_calm.py
+++ b/test/test_calm.py
@@ -306,8 +306,8 @@ class CalmTest(unittest.TestCase):
         self.maxDiff = None
 
         mlist = {}
-        mlist = maintainers.Maintainer.add_directories(mlist, 'testdata/homes')
-        mlist = maintainers.Maintainer.add_packages(mlist, 'testdata/pkglist/cygwin-pkg-maint', None)
+        mlist = maintainers.add_directories(mlist, 'testdata/homes')
+        mlist = maintainers.add_packages(mlist, 'testdata/pkglist/cygwin-pkg-maint', None)
 
         compare_with_expected_file(self, 'testdata/pkglist', mlist)
 
@@ -329,7 +329,7 @@ class CalmTest(unittest.TestCase):
         pkglist = ['after-ready', 'not-ready', 'testpackage', 'testpackage2']
 
         mlist = {}
-        mlist = maintainers.Maintainer.add_directories(mlist, 'testdata/homes')
+        mlist = maintainers.add_directories(mlist, 'testdata/homes')
         m = mlist['Blooey McFooey']
         m.pkgs.extend(pkglist + ['not-on-package-list'])