Changeset 1022

Timestamp:

Mar 7, 2005, 12:09:59 PM (20 years ago)

Author:

duncan

Message:

bug fix

Location:

inundation/ga/storm_surge/pyvolution/coordinate_transforms

Files:

• geo_reference.py (modified) (1 diff)
• test_geo_reference.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/coordinate_transforms/geo_reference.py

@@ -45 +45 @@
 
     def __repr__(self):
-        return "(%f,%f, %s)" % (self.xllcorner,self.yllcorner, self.zone)
+        return "(%f,%f, %i)" % (self.xllcorner,self.yllcorner, self.zone)
     
     def __cmp__(self,other):
         # FIXME (DSG) add a tolerence
+        if other is None:
+            return 1
         cmp = 0
         if not (self.xllcorner == self.xllcorner):

inundation/ga/storm_surge/pyvolution/coordinate_transforms/test_geo_reference.py

@@ -18 +18 @@
     def test_read_write_NetCDF(self):
         from Scientific.IO.NetCDF import NetCDFFile
-        g = Geo_reference(1.9,1.9,'zone65')
+        g = Geo_reference(1.9,1.9,1)
         file_name = tempfile.mktemp(".geo_referenceTest")
         
@@ -33 +33 @@
         
     def test___cmp__(self):
-        g = Geo_reference(1.9,1.9,'zone65')
-        new_g = Geo_reference(1.9,1.9,'zone65')
+        g = Geo_reference(1.9,1.9,1)
+        new_g = Geo_reference(1.9,1.9,1)
      
         self.failUnless(g == new_g, 'test___cmp__ failed')