fix: renamed varibles to avoid shadowing

Author: casperr0

mamonsu/lib/get_keys.py

@@ -5,11 +5,11 @@
 class GetKeys(object):
     plg_type = 'all'
 
-    def txt(self, type, plugins=None):
+    def txt(self, plg_type, plugins=None):
         # sort plugins!
         if plugins is None:
             plugins = []
-        self.plg_type = type
+        self.plg_type = plg_type
         plugins.sort(key=lambda x: x.__class__.__name__)
         # create template
         template_data = self._get_all('keys_and_queries', plugins)  # get data from all plugins

mamonsu/lib/sender.py

@@ -15,10 +15,10 @@ def __init__(self):
     def _hash(self, key, host=None):
         return '{0}_+_{1}'.format(host, key)
 
-    def _key_from_hash(self, hash, host=None):
-        result = hash.split('{0}_+_'.format(host))
+    def _key_from_hash(self, hash_string, host=None):
+        result = hash_string.split('{0}_+_'.format(host))
         if len(result) == 1:
-            return hash
+            return hash_string
         else:
             return result[1]
 

mamonsu/lib/zbx_template.py

@@ -117,12 +117,12 @@ def turn_agent_type(self, xml):
         xml = re.sub(r"<type>2", "<type>0", xml)
         return xml
 
-    def xml(self, type, plugins=None):
+    def xml(self, plg_type, plugins=None):
         # sort plugins!
         if plugins is None:
             plugins = []
         plugins.sort(key=lambda x: x.__class__.__name__)
-        self.plg_type = type
+        self.plg_type = plg_type
         # create template
         template_data = {'template': self.Template, 'application': self.Application}
         if Plugin.Type == 'agent':