Simplify rule._logprof_header_localvars() implementations

utils/apparmor/rule/abi.py

@@ -50,7 +50,7 @@ class AbiRule(IncludeRule):
             return ('%s%s "%s",%s' % (space, self.rule_name, self.path, self.comment))
 
     def _logprof_header_localvars(self):
-        return [_('Abi'), self.get_clean()]
+        return _('Abi'), self.get_clean()
 
 
 class AbiRuleset(IncludeRuleset):

utils/apparmor/rule/alias.py

@@ -92,11 +92,7 @@ class AliasRule(BaseRule):
         return True
 
     def _logprof_header_localvars(self):
-        headers = []
+        return _('Alias'), '%s -> %s' % (self.orig_path, self.target)
-
-        return headers + [
-            _('Alias'), '%s -> %s' % (self.orig_path, self.target),
-        ]
 
 
 class AliasRuleset(BaseRuleset):

utils/apparmor/rule/boolean.py

@@ -99,11 +99,7 @@ class BooleanRule(BaseRule):
         return True
 
     def _logprof_header_localvars(self):
-        headers = []
+        return _('Boolean Variable'), self.get_clean()
-
-        return headers + [
-            _('Boolean Variable'), self.get_clean(),
-        ]
 
 
 class BooleanRuleset(BaseRuleset):

utils/apparmor/rule/capability.py

@@ -125,9 +125,7 @@ class CapabilityRule(BaseRule):
     def _logprof_header_localvars(self):
         cap_txt = logprof_value_or_all(self.capability, self.all_caps)
 
-        return [
+        return _('Capability'), cap_txt
-            _('Capability'), cap_txt,
-        ]
 
 
 class CapabilityRuleset(BaseRuleset):

utils/apparmor/rule/dbus.py

@@ -288,25 +288,25 @@ class DbusRule(BaseRule):
         return True
 
     def _logprof_header_localvars(self):
-        access      = logprof_value_or_all(self.access,     self.all_access)
+        access    = logprof_value_or_all(self.access,    self.all_access)     # noqa: E221
-        bus         = logprof_value_or_all(self.bus,        self.all_buses)
+        bus       = logprof_value_or_all(self.bus,       self.all_buses)      # noqa: E221
-        path        = logprof_value_or_all(self.path,       self.all_paths)
+        path      = logprof_value_or_all(self.path,      self.all_paths)      # noqa: E221
-        name        = logprof_value_or_all(self.name,       self.all_names)
+        name      = logprof_value_or_all(self.name,      self.all_names)      # noqa: E221
-        interface   = logprof_value_or_all(self.interface,  self.all_interfaces)
+        interface = logprof_value_or_all(self.interface, self.all_interfaces)
-        member      = logprof_value_or_all(self.member,     self.all_members)
+        member    = logprof_value_or_all(self.member,    self.all_members)    # noqa: E221
-        peername    = logprof_value_or_all(self.peername,   self.all_peernames)
+        peername  = logprof_value_or_all(self.peername,  self.all_peernames)  # noqa: E221
-        peerlabel   = logprof_value_or_all(self.peerlabel,  self.all_peerlabels)
+        peerlabel = logprof_value_or_all(self.peerlabel, self.all_peerlabels)
 
-        return [
+        return (
-            _('Access mode'),   access,
+            _('Access mode'), access,
-            _('Bus'),           bus,
+            _('Bus'),         bus,
-            _('Path'),          path,
+            _('Path'),        path,
-            _('Name'),          name,
+            _('Name'),        name,
-            _('Interface'),     interface,
+            _('Interface'),   interface,
-            _('Member'),        member,
+            _('Member'),      member,
-            _('Peer name'),     peername,
+            _('Peer name'),   peername,
-            _('Peer label'),    peerlabel,
+            _('Peer label'),  peerlabel,
-        ]
+        )
 
 
 class DbusRuleset(BaseRuleset):

utils/apparmor/rule/include.py

@@ -108,7 +108,7 @@ class IncludeRule(BaseRule):
         return True
 
     def _logprof_header_localvars(self):
-        return [_('Include'), self.get_clean()]
+        return _('Include'), self.get_clean()
 
     def get_full_paths(self, profile_dir):
         """get list of full paths of an include (can contain multiple paths if self.path is a directory)"""

utils/apparmor/rule/network.py

@@ -169,10 +169,10 @@ class NetworkRule(BaseRule):
         family    = logprof_value_or_all(self.domain,           self.all_domains)  # noqa: E221
         sock_type = logprof_value_or_all(self.type_or_protocol, self.all_type_or_protocols)
 
-        return [
+        return (
             _('Network Family'), family,
             _('Socket Type'), sock_type,
-        ]
+        )
 
 
 class NetworkRuleset(BaseRuleset):

utils/apparmor/rule/ptrace.py

@@ -151,10 +151,10 @@ class PtraceRule(BaseRule):
         access = logprof_value_or_all(self.access, self.all_access)
         peer   = logprof_value_or_all(self.peer,   self.all_peers)  # noqa: E221
 
-        return [
+        return (
             _('Access mode'), access,
             _('Peer'), peer,
-        ]
+        )
 
 
 class PtraceRuleset(BaseRuleset):

utils/apparmor/rule/rlimit.py

@@ -220,17 +220,15 @@ class RlimitRule(BaseRule):
         return True
 
     def _logprof_header_localvars(self):
-        rlimit_txt = self.rlimit
-
         if self.all_values:
             values_txt = 'infinity'
         else:
             values_txt = self.value
 
-        return [
+        return (
-            _('Rlimit'), rlimit_txt,
+            _('Rlimit'), self.rlimit,
             _('Value'),  values_txt,
-        ]
+        )
 
 
 class RlimitRuleset(BaseRuleset):

utils/apparmor/rule/signal.py

@@ -211,11 +211,11 @@ class SignalRule(BaseRule):
         signal = logprof_value_or_all(self.signal, self.all_signals)
         peer   = logprof_value_or_all(self.peer,   self.all_peers)  # noqa: E221
 
-        return [
+        return (
             _('Access mode'), access,
             _('Signal'), signal,
-            _('Peer'), peer
+            _('Peer'), peer,
-        ]
+        )
 
 
 class SignalRuleset(BaseRuleset):

utils/apparmor/rule/userns.py

@@ -112,9 +112,7 @@ class UserNamespaceRule(BaseRule):
     def _logprof_header_localvars(self):
         access = logprof_value_or_all(self.access, self.all_access)
 
-        return (
+        return _('Access mode'), access
-            _('Access mode'), access,
-        )
 
 
 class UserNamespaceRuleset(BaseRuleset):

utils/apparmor/rule/variable.py

@@ -118,11 +118,7 @@ class VariableRule(BaseRule):
         return True
 
     def _logprof_header_localvars(self):
-        headers = []
+        return _('Variable'), self.get_clean()
-
-        return headers + [
-            _('Variable'), self.get_clean(),
-        ]
 
 
 class VariableRuleset(BaseRuleset):