Changeset 4104

Timestamp:

Dec 20, 2006, 2:08:58 PM (18 years ago)

Author:

ole

Message:

Merciless enforcement of style guide

File:

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

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -70 +70 @@
             2.7, 2.4, 5.2, 0.3
 
-        The first two columns are always implicitly assumed to be x, y coordinates.
+        The first two columns are always implicitly assumed to be x, y
+        coordinates.
         Use the same delimiter for the attribute names and the data
 
@@ -89 +90 @@
         The format for a Points dictionary is:
 
-          ['pointlist'] a 2 column array describing points. 1st column x, 2nd column y.
-          ['attributelist'], a dictionary of 1D arrays, representing attribute values
-          at the point.  The dictionary key is the attribute header.
-          ['geo_reference'] a Geo_refernece object. Use if the point information
-            is relative. This is optional.
+          ['pointlist'] a 2 column array describing points. 1st column x,
+          2nd column y.
+          ['attributelist'], a dictionary of 1D arrays, representing
+          attribute values at the point.  The dictionary key is the attribute
+          header.
+          ['geo_reference'] a Geo_refernece object. Use if the point
+          information is relative. This is optional.
             eg
             dic['pointlist'] = [[1.0,2.0],[3.0,5.0]]
@@ -132 +135 @@
 
         else:
-            # watch for case where file name and points, attributes etc are provided!!
+            # watch for case where file name and points,
+            # attributes etc are provided!!
             # if file name then all provided info will be removed!
             self.import_points_file(file_name, delimiter, verbose)
@@ -500 +504 @@
                     try:
                         fd = open(file_name)
-                        data_points, attributes, geo_reference = _read_xya_file(fd, ',')
+                        data_points, attributes, geo_reference =\
+                                     _read_xya_file(fd, ',')
                     except TitleError:
                         fd.close()
                         fd = open(file_name)
-                        data_points, attributes, geo_reference = _read_xya_file(fd, ' ')
+                        data_points, attributes, geo_reference =\
+                                     _read_xya_file(fd, ' ')
                 else:
                     fd = open(file_name)
-                    data_points, attributes, geo_reference = _read_xya_file(fd, delimiter)
+                    data_points, attributes, geo_reference =\
+                                 _read_xya_file(fd, delimiter)
                 fd.close()
             except (IndexError,ValueError,SyntaxError):
@@ -516 +523 @@
                 fd.close()  
                 # Catch this to add an error message
-                msg = 'Could not open file or incorrect file format %s:%s' %(file_name, e)
+                msg = 'Could not open file or incorrect file format %s:%s'\
+                      %(file_name, e)
                 raise IOError, msg
                 
         elif file_name[-4:]== ".pts":
             try:
-                data_points, attributes, geo_reference = _read_pts_file(file_name, verbose)
+                data_points, attributes, geo_reference =\
+                             _read_pts_file(file_name, verbose)
             except IOError, e:    
                 msg = 'Could not open file %s ' %file_name
@@ -530 +539 @@
             #
             try:
-                data_points, attributes, geo_reference = _read_csv_file(file_name, verbose)
+                data_points, attributes, geo_reference =\
+                             _read_csv_file(file_name, verbose)
             except IOError, e:    
                 msg = 'Could not open file %s ' %file_name
@@ -682 +692 @@
         return Geospatial_data(pointlist, att_dict)
 
-def _read_pts_file(file_name, verbose = False):
+def _read_pts_file(file_name, verbose=False):
     """Read .pts NetCDF file
     
@@ -737 +747 @@
 
 
-def _read_csv_file(file_name, verbose = False):
+def _read_csv_file(file_name, verbose=False):
     """Read .csv file
     
@@ -765 +775 @@
 
 CSV_DELIMITER = ','
-def _read_csv_file_header(file_pointer, delimiter=CSV_DELIMITER,
+def _read_csv_file_header(file_pointer,
+                          delimiter=CSV_DELIMITER,
                           verbose=False):
 
@@ -777 +788 @@
 def _read_csv_file_blocking(file_pointer, header,
                             delimiter=CSV_DELIMITER,
-                            max_read_lines = 500,
-                            verbose = False):
+                            max_read_lines=500,
+                            verbose=False):
     
 
@@ -977 +988 @@
     
     for key in point_atts['attributelist'].keys():
-        point_atts['attributelist'][key]= array(point_atts['attributelist'][key]).astype(Float)
+        point_atts['attributelist'][key]=\
+                array(point_atts['attributelist'][key]).astype(Float)
     return point_atts