[GRASS-SVN] r74419 - grass/trunk/scripts/v.rast.stats/testsuite

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Apr 24 13:25:54 PDT 2019


Author: sbl
Date: 2019-04-24 13:25:54 -0700 (Wed, 24 Apr 2019)
New Revision: 74419

Modified:
   grass/trunk/scripts/v.rast.stats/testsuite/test_v_rast_stats.py
Log:
make test_v_rast_stats.py pass with Python 2 and 3

Modified: grass/trunk/scripts/v.rast.stats/testsuite/test_v_rast_stats.py
===================================================================
--- grass/trunk/scripts/v.rast.stats/testsuite/test_v_rast_stats.py	2019-04-24 20:24:50 UTC (rev 74418)
+++ grass/trunk/scripts/v.rast.stats/testsuite/test_v_rast_stats.py	2019-04-24 20:25:54 UTC (rev 74419)
@@ -61,7 +61,7 @@
         v_db_select = SimpleModule("v.db.select", map="zone_map")
 
         self.runModule(v_db_select)
-        self.assertLooksLike(univar_string, v_db_select.outputs.stdout.encode('utf-8'))
+        self.assertLooksLike(univar_string, str(v_db_select.outputs.stdout))
 
 
     def test_line_d(self):
@@ -75,7 +75,7 @@
         v_db_select = SimpleModule("v.db.select", map="test_line")
         
         self.runModule(v_db_select)
-        self.assertLooksLike(output_str, v_db_select.outputs.stdout.encode('utf-8'))
+        self.assertLooksLike(output_str, str(v_db_select.outputs.stdout))
 
 
     def test_line(self):
@@ -90,7 +90,7 @@
         v_db_select = SimpleModule("v.db.select", map="test_line")
         
         self.runModule(v_db_select)
-        self.assertLooksLike(output_str, v_db_select.outputs.stdout.encode('utf-8'))
+        self.assertLooksLike(output_str, str(v_db_select.outputs.stdout))
 
 
 class TestRastStatsFails(TestCase):



More information about the grass-commit mailing list