Refactor function safecopy().

* Change ignore_ptns from [] to (). A mutable default value isn't
as expected when invoke in the second time.
>>> def safecopy(ignore_ptns=[]):
...     ignore_ptns += ['*.pyc']
...     print ignore_ptns
...
>>> safecopy()
['*.pyc']
>>> safecopy()
['*.pyc', '*.pyc']

* Add a list into ignore_ptns rather than a string
>>> l = []
>>> l += os.path.basename('/usr/bin')
>>> l
['b', 'i', 'n']

* Include all exception classes by (), otherwise it will catch
OSError and assign this exception instance to a local variable
named IOError.
* Move shutil.ignore_patterns() out of try block since it can
never throw OSError nor IOError.
* Remove useless try/except/raise block which catches every
error but reraise it. It's the same as without this try block.

Change-Id: I8837169bbf4acbadf4a2cfd8ac999d371831d86a

diff --git a/mic/rt_util.py b/mic/rt_util.py
index 247c456552c8a6be4d34f0f53371f4f7f4106f33..2a31f4a218c8a9a2ea2ac0a0b158424587470d25 100644 (file)
--- a/mic/rt_util.py
+++ b/mic/rt_util.py
@@ -197,7 +197,8 @@ def sync_mic(bootstrap, binpth = '/usr/bin/mic',
     with open(_path(binpth), 'w') as wf:
         wf.write(mic_cont)
 
-def safecopy(src, dst, symlinks=False, ignore_ptns=[]):
+
+def safecopy(src, dst, symlinks=False, ignore_ptns=()):
     if os.path.isdir(src):
         if os.path.isdir(dst):
             dst = os.path.join(dst, os.path.basename(src))
@@ -207,20 +208,16 @@ def safecopy(src, dst, symlinks=False, ignore_ptns=[]):
         src = src.rstrip('/')
         # check common prefix to ignore copying itself
         if dst.startswith(src + '/'):
-            ignore_ptns += os.path.basename(src)
+            ignore_ptns = list(ignore_ptns) + [ os.path.basename(src) ]
 
+        ignores = shutil.ignore_patterns(*ignore_ptns)
         try:
-            ignores = shutil.ignore_patterns(*ignore_ptns)
             shutil.copytree(src, dst, symlinks, ignores)
-        except OSError, IOError:
+        except (OSError, IOError):
             shutil.rmtree(dst, ignore_errors=True)
             raise
-
     else:
-        try:
-            if not os.path.isdir(dst):
-                makedirs(os.path.dirname(dst))
+        if not os.path.isdir(dst):
+            makedirs(os.path.dirname(dst))
 
-            shutil.copy2(src, dst)
-        except:
-            raise
+        shutil.copy2(src, dst)