X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fpub%2Futils%2Ffileutil.py;h=40bf9df17c2e6cab465a72caa4770b3c9edd7b98;hp=a33186ec2eef3df632c9a0831e5a9ca6a4d41581;hb=7c194de2d67a1c71b741345a74ed9a493936fdb0;hpb=b1b0386b5ed988fbbf25e326c3d0ce951eff07cd

diff --git a/multivimbroker/multivimbroker/pub/utils/fileutil.py b/multivimbroker/multivimbroker/pub/utils/fileutil.py
index a33186e..40bf9df 100644
--- a/multivimbroker/multivimbroker/pub/utils/fileutil.py
+++ b/multivimbroker/multivimbroker/pub/utils/fileutil.py
@@ -1,4 +1,5 @@
 # Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 VMware, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,14 +13,17 @@ import os
 import shutil
 import logging
 import traceback
-import urllib2
+# import urllib2
+import urllib.request
+import urllib.parse
+import urllib.error
 
 logger = logging.getLogger(__name__)
 
 
 def make_dirs(path):
     if not os.path.exists(path):
-        os.makedirs(path, 0777)
+        os.makedirs(path, 0o777)
 
 
 def delete_dirs(path):
@@ -28,7 +32,7 @@ def delete_dirs(path):
             shutil.rmtree(path)
     except Exception as e:
         logger.error(traceback.format_exc())
-        logger.error("Failed to delete %s:%s", path, e.message)
+        logger.error("Failed to delete %s:%s", path, e)
 
 
 def download_file_from_http(url, local_dir, file_name):
@@ -36,14 +40,14 @@ def download_file_from_http(url, local_dir, file_name):
     is_download_ok = False
     try:
         make_dirs(local_dir)
-        r = urllib2.Request(url)
-        req = urllib2.urlopen(r)
+        r = urllib.request.Request(url)
+        req = urllib.request.urlopen(r)
         save_file = open(local_file_name, 'wb')
         save_file.write(req.read())
         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