2to3 update

pynemo/tests/gcoms_break_depth_test.py

@@ -23,8 +23,8 @@ class Test(unittest.TestCase):
         self.lon,self.lat = np.meshgrid(self.lon, self.lat)
         #gcoms_break_depth.gcoms_boundary_masks(self.bathy, -1, 0)
         
-        print self.bathy.shape
-        print self.bathy
+        print(self.bathy.shape)
+        print(self.bathy)
         pass
 
 
@@ -39,10 +39,10 @@ class Test(unittest.TestCase):
         self.bathy[self.bathy>=0] = 0
         self.bathy = self.bathy*-1        
         tmp  = gcoms_break_depth.polcoms_select_domain(self.bathy, self.lat, self.lon, roi, 200)
-        self.assertEquals(tmp[32,0],1,"Set the break select correctly")
-        self.assertEquals(tmp[40,0],1,"Set the break select correctly 40")        
-        self.assertEquals(tmp[50,0],1,"Set the break select correctly 50")        
-        self.assertEquals(tmp[60,0],1,"Set the break select correctly 60")        
+        self.assertEqual(tmp[32,0],1,"Set the break select correctly")
+        self.assertEqual(tmp[40,0],1,"Set the break select correctly 40")        
+        self.assertEqual(tmp[50,0],1,"Set the break select correctly 50")        
+        self.assertEqual(tmp[60,0],1,"Set the break select correctly 60")        
                 
     def testGcomsBreakDepth(self):
         r = 18        

pynemo/tests/nemo_bdy_msk_c_test.py

@@ -11,8 +11,8 @@ class Test(unittest.TestCase):
 
     def testMaskData(self):
         mask = Mask('data/grid_C/NNA_R12_bathy_meter_bench.nc')
-        print mask.data.shape
-        self.assertEqual(mask.data.shape,(401L,351L),'Mask reading failed')
+        print(mask.data.shape)
+        self.assertEqual(mask.data.shape,(401,351),'Mask reading failed')
 
 
 if __name__ == "__main__":

pynemo/tests/nemo_bdy_setup_test.py

@@ -45,7 +45,7 @@ class Test(unittest.TestCase):
         
         #test
         setup = Setup('test.bdy')
-        self.assertEquals(setup.settings,{'nonambigious':True},"Didn't recognize valid setting")
+        self.assertEqual(setup.settings,{'nonambigious':True},"Didn't recognize valid setting")
         
         #delete file
         os.remove('test.bdy')                
@@ -64,12 +64,12 @@ class Test(unittest.TestCase):
                 
         #test
         setup = Setup('test.bdy')
-        print setup.settings
-        self.assertEquals(setup.settings['nonambigious'],False,"Didn't recognize logical setting")
-        self.assertEquals(setup.settings['floatval'],10.9,"Didn't recognize rn value in setting")
-        self.assertEquals(setup.settings['floatval2'],20.9,"Didn't recongnize nn value in setting")
-        self.assertEquals(setup.settings['stringval'],'coordinates.nc',"Didn't recognize cn string value in setting")
-        self.assertEquals(setup.settings['stringval2'],'gregorian',"Didn't recognize sn string value in setting")
+        print(setup.settings)
+        self.assertEqual(setup.settings['nonambigious'],False,"Didn't recognize logical setting")
+        self.assertEqual(setup.settings['floatval'],10.9,"Didn't recognize rn value in setting")
+        self.assertEqual(setup.settings['floatval2'],20.9,"Didn't recongnize nn value in setting")
+        self.assertEqual(setup.settings['stringval'],'coordinates.nc',"Didn't recognize cn string value in setting")
+        self.assertEqual(setup.settings['stringval2'],'gregorian',"Didn't recognize sn string value in setting")
         
         #delete file
         os.remove('test.bdy')

pynemo/tests/reader_ncml_test.py

@@ -34,7 +34,7 @@ class Test(unittest.TestCase):
         testfile = os.path.join(testpath, "testremote.ncml")
         sd = Reader(testfile,0).grid
         dataset = Data2(sd.dataset,"time_counter")
-        self.assertEquals(len(dataset), 8, "There should 8 datasets")
+        self.assertEqual(len(dataset), 8, "There should 8 datasets")
     
     def testVariable(self):
         init_jnius()
@@ -80,11 +80,11 @@ class Test(unittest.TestCase):
         testpath, file_name = os.path.split(__file__)
         testfile = os.path.join(testpath, "testremote.ncml")
         repo = Reader(testfile,0)
-        self.assertEquals(len(repo['t'].time_counter), 8, "Time counter should be 8")
-        self.assertEquals(repo['t'].time_counter[0], 691416000, "The first time value doesn't match")
+        self.assertEqual(len(repo['t'].time_counter), 8, "Time counter should be 8")
+        self.assertEqual(repo['t'].time_counter[0], 691416000, "The first time value doesn't match")
         repo = Reader(testfile,100)
-        self.assertEquals(len(repo['t'].time_counter), 8, "Time counter should be 8")
-        self.assertEquals(repo['t'].time_counter[0], 691416100, "The first time value doesn't match")
+        self.assertEqual(len(repo['t'].time_counter), 8, "Time counter should be 8")
+        self.assertEqual(repo['t'].time_counter[0], 691416100, "The first time value doesn't match")
 
 if __name__ == "__main__":
     #import sys;sys.argv = ['', 'Test.testName']