Rename serialize functions

qubesdbus/domain_manager.py

@@ -69,8 +69,8 @@ def main(args=None):
     ''' Main function '''  # pylint: disable=unused-argument
     loop = GLib.MainLoop()
     app = qubes.Qubes()
-    data = qubesdbus.serialize.qubes(app)
-    domains = [qubesdbus.serialize.domain(vm) for vm in app.domains]
+    data = qubesdbus.serialize.qubes_data(app)
+    domains = [qubesdbus.serialize.domain_data(vm) for vm in app.domains]
     _ = DomainManager(data, domains)
     print("Service running...")
     loop.run()

qubesdbus/labels.py

@@ -66,7 +66,7 @@ def main(args=None):
     loop = GLib.MainLoop()
     app = qubes.Qubes()
 
-    labels_data = [qubesdbus.serialize.label(label)
+    labels_data = [qubesdbus.serialize.label_data(label)
                    for label in app.labels.values()]
     _ = Labels(labels_data)
     print("Service running...")

qubesdbus/serialize.py

@@ -84,12 +84,7 @@
                            'is_qrexec_running', ]
 
 
-def _init_states(states):
-    # type: (List[str]) -> Dict[str,Callable[[str, bool], Tuple[str,dbus.Boolean]]]
-    result = {
-    }  # type: Dict[str,Callable[[str, bool], Tuple[str,dbus.Boolean]]]
-
-def qubes(app):
+def qubes_data(app):
     ''' Serialize `qubes.Qubes` to a dictionary '''
     # type: (Qubes) -> Dict[dbus.String, Any]
     result = {}
@@ -102,7 +97,7 @@ def qubes(app):
 
     return result
 
-def domain(vm):
+def domain_data(vm):
     ''' Serializes a `qubes.vm.qubesvm.QubesVM` to a dictionary '''
     # type: (QubesVM) -> Dict[dbus.String, Any]
     result = {dbus.String('state'): 'halted'}
@@ -130,7 +125,7 @@ def domain(vm):
     return result
 
 
-def label(lab):
+def label_data(lab):
     # type: (Label) -> Dict[dbus.String, Any]
     result = {}
     for name in dir(lab):