openbsdrcctl: turn badvar into a tuple and fix lint warnings

saltstack · Jan 6, 2015 · 7b99eeb · 7b99eeb
1 parent 113c56a
commit 7b99eeb
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/salt/modules/openbsdrcctl.py b/salt/modules/openbsdrcctl.py
@@ -91,12 +91,12 @@ def get_all():
 
         salt '*' service.get_all
     '''
-    badvar = [ "_timeout", "_user" ]
+    badvar = ("_timeout", "_user")
     ret = []
     service = _cmd()
     for svc in __salt__['cmd.run']('{0} getall'.format(service)).splitlines():
         svc = re.sub('(_flags|)=.*$', '', svc)
-        if not svc.endswith(tuple(badvar)):
+        if not svc.endswith(badvar):
             ret.append(svc)
     return sorted(ret)
 
@@ -111,13 +111,13 @@ def get_disabled():
 
         salt '*' service.get_disabled
     '''
-    badvar = [ "_timeout", "_user" ]
+    badvar = ("_timeout", "_user")
     ret = []
     service = _cmd()
     for svc in __salt__['cmd.run']('{0} getall'.format(service)).splitlines():
         if svc.endswith("=NO"):
             svc = re.sub('(_flags|)=.*$', '', svc)
-            if not svc.endswith(tuple(badvar)):
+            if not svc.endswith(badvar):
                 ret.append(svc)
     return sorted(ret)
 
@@ -132,13 +132,13 @@ def get_enabled():
 
         salt '*' service.get_enabled
     '''
-    badvar = [ "_timeout", "_user" ]
+    badvar = ("_timeout", "_user")
     ret = []
     service = _cmd()
     for svc in __salt__['cmd.run']('{0} getall'.format(service)).splitlines():
         if not svc.endswith("=NO"):
             svc = re.sub('(_flags|)=.*$', '', svc)
-            if not svc.endswith(tuple(badvar)):
+            if not svc.endswith(badvar):
                 ret.append(svc)
     return sorted(ret)