=== modified file 'mandos-ctl'
--- mandos-ctl	2019-03-03 16:20:02 +0000
+++ mandos-ctl	2019-03-03 16:25:45 +0000
@@ -268,81 +268,6 @@
     return value
 
 
-class TableOfClients(object):
-    tableheaders = {
-        "Name": "Name",
-        "Enabled": "Enabled",
-        "Timeout": "Timeout",
-        "LastCheckedOK": "Last Successful Check",
-        "LastApprovalRequest": "Last Approval Request",
-        "Created": "Created",
-        "Interval": "Interval",
-        "Host": "Host",
-        "Fingerprint": "Fingerprint",
-        "KeyID": "Key ID",
-        "CheckerRunning": "Check Is Running",
-        "LastEnabled": "Last Enabled",
-        "ApprovalPending": "Approval Is Pending",
-        "ApprovedByDefault": "Approved By Default",
-        "ApprovalDelay": "Approval Delay",
-        "ApprovalDuration": "Approval Duration",
-        "Checker": "Checker",
-        "ExtendedTimeout": "Extended Timeout",
-        "Expires": "Expires",
-        "LastCheckerStatus": "Last Checker Status",
-    }
-
-    def __init__(self, clients, keywords, tableheaders=None):
-        self.clients = clients
-        self.keywords = keywords
-        if tableheaders is not None:
-            self.tableheaders = tableheaders
-
-    def __str__(self):
-        return "\n".join(self.rows())
-
-    if sys.version_info.major == 2:
-        __unicode__ = __str__
-        def __str__(self):
-            return str(self).encode(locale.getpreferredencoding())
-
-    def rows(self):
-        format_string = self.row_formatting_string()
-        rows = [self.header_line(format_string)]
-        rows.extend(self.client_line(client, format_string)
-                    for client in self.clients)
-        return rows
-
-    def row_formatting_string(self):
-        "Format string used to format table rows"
-        return " ".join("{{{key}:{width}}}".format(
-            width=max(len(self.tableheaders[key]),
-                      *(len(self.string_from_client(client, key))
-                        for client in self.clients)),
-            key=key)
-                        for key in self.keywords)
-
-    def string_from_client(self, client, key):
-        return self.valuetostring(client[key], key)
-
-    @staticmethod
-    def valuetostring(value, keyword):
-        if isinstance(value, dbus.Boolean):
-            return "Yes" if value else "No"
-        if keyword in ("Timeout", "Interval", "ApprovalDelay",
-                       "ApprovalDuration", "ExtendedTimeout"):
-            return milliseconds_to_string(value)
-        return str(value)
-
-    def header_line(self, format_string):
-        return format_string.format(**self.tableheaders)
-
-    def client_line(self, client, format_string):
-        return format_string.format(
-            **{key: self.string_from_client(client, key)
-               for key in self.keywords})
-
-
 ## Classes for commands.
 
 # Abstract classes first
@@ -396,12 +321,89 @@
 class PrintTableCmd(PrintCmd):
     def __init__(self, verbose=False):
         self.verbose = verbose
+
     def output(self, clients):
         if self.verbose:
             keywords = self.all_keywords
         else:
             keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
-        return str(TableOfClients(clients.values(), keywords))
+        return str(self.TableOfClients(clients.values(), keywords))
+
+    class TableOfClients(object):
+        tableheaders = {
+            "Name": "Name",
+            "Enabled": "Enabled",
+            "Timeout": "Timeout",
+            "LastCheckedOK": "Last Successful Check",
+            "LastApprovalRequest": "Last Approval Request",
+            "Created": "Created",
+            "Interval": "Interval",
+            "Host": "Host",
+            "Fingerprint": "Fingerprint",
+            "KeyID": "Key ID",
+            "CheckerRunning": "Check Is Running",
+            "LastEnabled": "Last Enabled",
+            "ApprovalPending": "Approval Is Pending",
+            "ApprovedByDefault": "Approved By Default",
+            "ApprovalDelay": "Approval Delay",
+            "ApprovalDuration": "Approval Duration",
+            "Checker": "Checker",
+            "ExtendedTimeout": "Extended Timeout",
+            "Expires": "Expires",
+            "LastCheckerStatus": "Last Checker Status",
+        }
+
+        def __init__(self, clients, keywords, tableheaders=None):
+            self.clients = clients
+            self.keywords = keywords
+            if tableheaders is not None:
+                self.tableheaders = tableheaders
+
+        def __str__(self):
+            return "\n".join(self.rows())
+
+        if sys.version_info.major == 2:
+            __unicode__ = __str__
+            def __str__(self):
+                return str(self).encode(locale.getpreferredencoding())
+
+        def rows(self):
+            format_string = self.row_formatting_string()
+            rows = [self.header_line(format_string)]
+            rows.extend(self.client_line(client, format_string)
+                        for client in self.clients)
+            return rows
+
+        def row_formatting_string(self):
+            "Format string used to format table rows"
+            return " ".join("{{{key}:{width}}}".format(
+                width=max(len(self.tableheaders[key]),
+                          *(len(self.string_from_client(client, key))
+                            for client in self.clients)),
+                key=key)
+                            for key in self.keywords)
+
+        def string_from_client(self, client, key):
+            return self.valuetostring(client[key], key)
+
+        @staticmethod
+        def valuetostring(value, keyword):
+            if isinstance(value, dbus.Boolean):
+                return "Yes" if value else "No"
+            if keyword in ("Timeout", "Interval", "ApprovalDelay",
+                           "ApprovalDuration", "ExtendedTimeout"):
+                return milliseconds_to_string(value)
+            return str(value)
+
+        def header_line(self, format_string):
+            return format_string.format(**self.tableheaders)
+
+        def client_line(self, client, format_string):
+            return format_string.format(
+                **{key: self.string_from_client(client, key)
+                   for key in self.keywords})
+
+
 
 class DumpJSONCmd(PrintCmd):
     def output(self, clients):