Changeset 5182

Timestamp:

Mar 31, 2008, 4:58:47 PM (17 years ago)

Author:

ole

Message:

Removed test that only executed on Windows
Also made any further reference to make_plots_from_csv_file raise an Exception.

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• test_util.py (modified) (2 diffs)
• util.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/test_util.py

@@ -1335 +1335 @@
     def test_make_plots_from_csv_files(self):
         
-        if sys.platform == 'win32':  #Windows
+        #if sys.platform == 'win32':  #Windows
             try: 
                 import pylab
@@ -1372 +1372 @@
             
             dir, name=os.path.split(fileName)
-            make_plots_from_csv_file(directories_dic={dir:['gauge', 0, 0]},
-                                output_dir=temp_dir,
-                                base_name='time_series_',
-                                plot_numbers=['3-5'],
-                                quantities=['speed','stage','momentum'],
-                                assess_all_csv_files=True,
-                                extra_plot_name='test')
+            csv2timeseries_graphs(directories_dic={dir:['gauge', 0, 0]},
+                                  output_dir=temp_dir,
+                                  base_name='time_series_',
+                                  plot_numbers=['3-5'],
+                                  quantities=['speed','stage','momentum'],
+                                  assess_all_csv_files=True,
+                                  extra_plot_name='test')
             
             #print dir+sep+name[:-4]+'_stage_test.png'

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -1512 +1512 @@
                                 assess_all_csv_files=True,
                                 extra_plot_name='test' ):
-    
-    print 'make_plots_from_csv_file has been replaced by csv2timeseries_graphs ',
-    print 'Please use "from anuga.abstract_2d_finite_volumes.util import csv2timeseries_graphs"'
-    
+
+    msg = 'make_plots_from_csv_file has been replaced by csv2timeseries_graphs ',
+    msg += 'Please use "from anuga.abstract_2d_finite_volumes.util import csv2timeseries_graphs"'
+
+    raise Exception, msg
     return csv2timeseries_graphs(directories_dic,
                                  output_dir,