collection 교체

collection/community/general/plugins/module_utils/memset.py

@@ -7,14 +7,16 @@
 #
 # Copyright (c) 2018, Simon Weald <ansible@simonweald.com>
 #
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+# Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause)
+# SPDX-License-Identifier: BSD-2-Clause
 
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from ansible.module_utils.six.moves.urllib.parse import urlencode
-from ansible.module_utils.urls import open_url, urllib_error
+from ansible.module_utils.urls import open_url
 from ansible.module_utils.basic import json
+import ansible.module_utils.six.moves.urllib.error as urllib_error
 
 
 class Response(object):
@@ -25,6 +27,7 @@ class Response(object):
     def __init__(self):
         self.content = None
         self.status_code = None
+        self.stderr = None
 
     def json(self):
         return json.loads(self.content)
@@ -74,11 +77,15 @@ def memset_api_call(api_key, api_method, payload=None):
             msg = "Memset API returned a {0} response ({1}, {2})." . format(response.status_code, response.json()['error_type'], response.json()['error'])
         else:
             msg = "Memset API returned an error ({0}, {1})." . format(response.json()['error_type'], response.json()['error'])
+    except urllib_error.URLError as e:
+        has_failed = True
+        msg = "An URLError occurred ({0})." . format(type(e))
+        response.stderr = "{0}" . format(e)
 
     if msg is None:
         msg = response.json()
 
-    return(has_failed, msg, response)
+    return has_failed, msg, response
 
 
 def check_zone_domain(data, domain):
@@ -92,7 +99,7 @@ def check_zone_domain(data, domain):
             if zone_domain['domain'] == domain:
                 exists = True
 
-    return(exists)
+    return exists
 
 
 def check_zone(data, name):
@@ -109,7 +116,7 @@ def check_zone(data, name):
         if counter == 1:
             exists = True
 
-    return(exists, counter)
+    return exists, counter
 
 
 def get_zone_id(zone_name, current_zones):
@@ -135,4 +142,4 @@ def get_zone_id(zone_name, current_zones):
         zone_id = None
         msg = 'Zone ID could not be returned as duplicate zone names were detected'
 
-    return(zone_exists, msg, counter, zone_id)
+    return zone_exists, msg, counter, zone_id