Changeset 4603

Timestamp:

Jul 6, 2007, 3:18:58 PM (17 years ago)

Author:

nick

Message:

testing get_all_sww_file

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (1 diff)
• test_data_manager.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -194 +194 @@
         
 # ANOTHER OPTION, IF NEED IN THE FUTURE, Nick B 7/2007    
-#    def rmgeneric(path, __func__):
-#        ERROR_STR= """Error removing %(path)s, %(error)s """
-#
-#        try:
-#            __func__(path)
-#            print 'Removed ', path
-#        except OSError, (errno, strerror):
-#            print ERROR_STR % {'path' : path, 'error': strerror }
-#                
-#    def removeall(path):
-#    
-#        if not os.path.isdir(path):
-#            return
-#        
-#        files=os.listdir(path)
-#    
-#        for x in files:
-#            fullpath=os.path.join(path, x)
-#            if os.path.isfile(fullpath):
-#                f=os.remove
-#                rmgeneric(fullpath, f)
-#            elif os.path.isdir(fullpath):
-#                removeall(fullpath)
-#                f=os.rmdir
-#                rmgeneric(fullpath, f)
+def rmgeneric(path, __func__,verbose=False):
+    ERROR_STR= """Error removing %(path)s, %(error)s """
+
+    try:
+        __func__(path)
+        if verbose: print 'Removed ', path
+    except OSError, (errno, strerror):
+        print ERROR_STR % {'path' : path, 'error': strerror }
+            
+def removeall(path,verbose=False):
+
+    if not os.path.isdir(path):
+        return
+    
+    files=os.listdir(path)
+
+    for x in files:
+        fullpath=os.path.join(path, x)
+        if os.path.isfile(fullpath):
+            f=os.remove
+            rmgeneric(fullpath, f)
+        elif os.path.isdir(fullpath):
+            removeall(fullpath)
+            f=os.rmdir
+            rmgeneric(fullpath, f,verbose)
 
 

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -7175 +7175 @@
         iterate=get_all_swwfiles(dir,'test')
         
-        del_dir(temp_dir)
+#        del_dir(temp_dir)
+        removeall(temp_dir)
 
         _, name0 = os.path.split(filename0)