summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliangke <lokyse@163.com>2017-12-02 20:36:48 +0800
committerliangke <lokyse@163.com>2017-12-02 21:00:06 +0800
commit7ef4d9292529e9a3336368430361f9a63f48c54d (patch)
treef062f83375d8f744e67da1575758c2bcb1179aee
parent39096ae6373df60a059fd6545cae730393e9a24e (diff)
Fix pep8 issue
Do not use bare except. Change-Id: I4c95a43341411074a06b9206c8c605c7826ed430 Issue-ID: MULTICLOUD-131 Signed-off-by: liangke <lokyse@163.com>
-rw-r--r--multivimbroker/multivimbroker/pub/utils/fileutil.py2
-rw-r--r--multivimbroker/multivimbroker/pub/utils/restcall.py5
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