Changeset 4660

Timestamp:

Aug 7, 2007, 10:28:50 AM (17 years ago)

Author:

duncan

Message:

removing delimiter from geospatial_data.py

File:

• anuga_core/source/anuga/geospatial_data/geospatial_data.py (modified) (4 diffs)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -35 +35 @@
                  default_attribute_name=None,
                  file_name=None,
-                 delimiter=None,
                  latitudes=None,
                  longitudes=None,
@@ -119 +118 @@
             dic['attributelist']['elevation'] = [[7.0,5.0]
                 
-        delimiter: is the file delimiter that will be used when 
-            importing a .xya file, which is being phased out.
-            
         verbose:
 
@@ -136 +132 @@
         self.max_read_lines = max_read_lines
 
-        if delimiter is not None:
-            msg = 'Specifying delimiters will be removed.'
-            msg = 'Text file format is moving to comma seperated .txt files.'
-            warn(msg, DeprecationWarning) 
         if file_name is None:
-            if delimiter is not None:
-                msg = 'No file specified yet a delimiter is provided!'
-                raise ValueError, msg
-            
             if latitudes is not None or longitudes is not None or \
                    points_are_lats_longs:
@@ -167 +155 @@
                     print 'Loading Geospatial data from file: %s' %file_name
             
-            self.import_points_file(file_name, delimiter, verbose)
+            self.import_points_file(file_name, verbose=verbose)
                 
             self.check_data_points(self.data_points)