From 0f5d97670301afe9255971e3132fa5fd40c3e9fd Mon Sep 17 00:00:00 2001 From: Hyun Park Date: Sat, 5 Mar 2022 12:47:59 -0500 Subject: [PATCH] make fastly_service.py work with python3 --- library/fastly_service.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/library/fastly_service.py b/library/fastly_service.py index e1dbcc2..eb2c83d 100644 --- a/library/fastly_service.py +++ b/library/fastly_service.py @@ -140,8 +140,8 @@ response: Moved Permanently ''' -import httplib -import urllib +import http.client as httplib +import urllib.parse as urllib import json import os import traceback @@ -234,7 +234,7 @@ def read_config(self, config, validate_choices, param_name): return value def to_json(self): - return {k: v for k, v in self.__dict__.iteritems() if v or not self.schema[k].get('omit_empty', False)} + return {k: v for k, v in self.__dict__.items() if v or not self.schema[k].get('omit_empty', False)} def __eq__(self, other): return self.__dict__ == other.__dict__ @@ -717,7 +717,7 @@ def get_service_by_name(self, service_name): return self.get_service(service_id) if response.status == 404: return None - raise Exception("Error searching for service '%s'" % service_name) + raise Exception("Error searching for service '%s' : %s" % (service_name, response.error())) def get_service(self, service_id): response = self._request('/service/%s/details' % urllib.quote(service_id, '')) @@ -725,7 +725,7 @@ def get_service(self, service_id): return FastlyService(response.payload) if response.status == 404: return None - raise Exception("Error fetching service details for service '%s'" % service_id) + raise Exception("Error fetching service details for service '%s' : %s" % (service_id, response.error())) def create_service(self, service_name): response = self._request('/service', 'POST', {'name': service_name}) @@ -1315,7 +1315,7 @@ def run(self): self.module.exit_json(changed=result.changed, service_id=result.service.id, actions=result.actions) except Exception as err: - self.module.fail_json(msg=err.message, trace=traceback.format_exc()) + self.module.fail_json(msg=str(err), trace=traceback.format_exc()) def main():