From: liangke <lokyse@163.com>
Date: Sat, 2 Dec 2017 12:36:48 +0000 (+0800)
Subject: Fix pep8 issue
X-Git-Tag: v1.1.2~89
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=7ef4d9292529e9a3336368430361f9a63f48c54d

Fix pep8 issue

Do not use bare except.

Change-Id: I4c95a43341411074a06b9206c8c605c7826ed430
Issue-ID: MULTICLOUD-131
Signed-off-by: liangke <lokyse@163.com>
---

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