Changeset 1439

Timestamp:

May 20, 2005, 3:20:56 PM (20 years ago)

Author:

duncan

Message:

simplify

File:

• inundation/ga/storm_surge/pmesh/load_mesh/loadASCII.py (modified) (2 diffs)

inundation/ga/storm_surge/pmesh/load_mesh/loadASCII.py

@@ -115 +115 @@
             msg = 'Extension %s is unknown' %ofile[-4:]
             raise IOError, msg
-    except SyntaxError:
+    except (SyntaxError,IndexError):
             msg = 'File could not be opened'
-            raise IOError, msg
-    except IndexError:
-            msg = 'File could not be opened'
-            raise IOError, msg
-        
+            raise IOError, msg       
     return dict
 
@@ -1011 +1007 @@
                 points_dict = _read_xya_file(fd, delimiter)
             fd.close()
-        except SyntaxError:
-            fd.close()    
-            msg = 'File could not be opened'
-            raise IOError, msg
-        except IndexError:
-            fd.close()    
-            msg = 'File could not be opened'
-            raise IOError, msg
-        except ValueError: # thrown by geo_ref, read ASCII
+        except (IndexError,ValueError,SyntaxError):
             fd.close()    
             msg = 'File could not be opened'