diff options
Diffstat (limited to 'multivimbroker')
| -rw-r--r-- | multivimbroker/multivimbroker/pub/utils/fileutil.py | 2 | ||||
| -rw-r--r-- | multivimbroker/multivimbroker/pub/utils/restcall.py | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/multivimbroker/multivimbroker/pub/utils/fileutil.py b/multivimbroker/multivimbroker/pub/utils/fileutil.py index a33186e..2e8c6c5 100644 --- a/multivimbroker/multivimbroker/pub/utils/fileutil.py +++ b/multivimbroker/multivimbroker/pub/utils/fileutil.py @@ -43,7 +43,7 @@ def download_file_from_http(url, local_dir, file_name): save_file.close() req.close() is_download_ok = True - except: + except Exception: logger.error(traceback.format_exc()) logger.error("Failed to download %s to %s.", url, local_file_name) return is_download_ok, local_file_name diff --git a/multivimbroker/multivimbroker/pub/utils/restcall.py b/multivimbroker/multivimbroker/pub/utils/restcall.py index ccdbada..d068182 100644 --- a/multivimbroker/multivimbroker/pub/utils/restcall.py +++ b/multivimbroker/multivimbroker/pub/utils/restcall.py @@ -81,7 +81,7 @@ def call_req(base_url, user, passwd, auth_type, resource, method, raise ex except urllib2.URLError as err: ret = [2, str(err), resp_status, resp] - except Exception as ex: + except Exception: logger.error(traceback.format_exc()) logger.error("[%s]ret=%s" % (callid, str(sys.exc_info()))) res_info = str(sys.exc_info()) @@ -89,9 +89,6 @@ def call_req(base_url, user, passwd, auth_type, resource, method, res_info = "The URL[%s] request \ failed or is not responding." % full_url ret = [3, res_info, resp_status, resp] - except: - logger.error(traceback.format_exc()) - ret = [4, str(sys.exc_info()), resp_status, resp] # logger.debug("[%s]ret=%s" % (callid, str(ret))) return ret |