Changeset 4660


Ignore:
Timestamp:
Aug 7, 2007, 10:28:50 AM (17 years ago)
Author:
duncan
Message:

removing delimiter from geospatial_data.py

File:
1 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/geospatial_data/geospatial_data.py

    r4659 r4660  
    3535                 default_attribute_name=None,
    3636                 file_name=None,
    37                  delimiter=None,
    3837                 latitudes=None,
    3938                 longitudes=None,
     
    119118            dic['attributelist']['elevation'] = [[7.0,5.0]
    120119               
    121         delimiter: is the file delimiter that will be used when
    122             importing a .xya file, which is being phased out.
    123            
    124120        verbose:
    125121
     
    136132        self.max_read_lines = max_read_lines
    137133
    138         if delimiter is not None:
    139             msg = 'Specifying delimiters will be removed.'
    140             msg = 'Text file format is moving to comma seperated .txt files.'
    141             warn(msg, DeprecationWarning)
    142134        if file_name is None:
    143             if delimiter is not None:
    144                 msg = 'No file specified yet a delimiter is provided!'
    145                 raise ValueError, msg
    146            
    147135            if latitudes is not None or longitudes is not None or \
    148136                   points_are_lats_longs:
     
    167155                    print 'Loading Geospatial data from file: %s' %file_name
    168156           
    169             self.import_points_file(file_name, delimiter, verbose)
     157            self.import_points_file(file_name, verbose=verbose)
    170158               
    171159            self.check_data_points(self.data_points)
Note: See TracChangeset for help on using the changeset viewer.