Merge pull request #30 from NilashishC/master

Fix exception handling in template

Reviewed-by: Nilashish Chakraborty <[email protected]>
             https://github.com/NilashishC

Author: ansible-zuul[bot]

roles/resource_module/templates/module_directory/network_os/network_os_facts.py.j2

@@ -100,7 +100,7 @@ def main():
     try:
         ansible_facts, warning = result
         warnings.extend(warning)
-    except TypeError, KeyError:
+    except (TypeError, KeyError):
         ansible_facts = result
 
     module.exit_json(ansible_facts=ansible_facts, warnings=warnings)

roles/resource_module/templates/module_utils/network_os/config/resource/resource.py.j2

@@ -43,7 +43,7 @@ class {{ resource|capitalize }}(ConfigBase, {{ resource|capitalize }}Args):
         result = Facts().get_facts(self._module, self._connection, self.gather_subset, self.gather_network_resources)
         try:
             facts = result[0]
-        except TypeError, KeyError:
+        except (TypeError, KeyError):
             facts = result
         {{ resource }}_facts = facts['ansible_network_resources'].get('{{ resource }}')
         if not {{ resource }}_facts: