[GRASS-SVN] r63956 - in grass/branches/releasebranch_7_0: . lib/gis lib/gis/testsuite

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Jan 5 11:31:58 PST 2015 

Author: martinl
Date: 2015-01-05 11:31:57 -0800 (Mon, 05 Jan 2015)
New Revision: 63956

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/gis/gislib.dox
   grass/branches/releasebranch_7_0/lib/gis/testsuite/gis_lib_env_test.py
Log:
testsuite + doxygen: update for r63830
          (merge r63954-5 from trunk)



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
 63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
 ,63721-63727,63731,63733,63736,63740-63742,63744-63749,63751-63752,63756,63758,63760-63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914,63927,63940-63941,63945
   + /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
 63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
 ,63721-63727,63731,63733,63736,63740-63742,63744-63749,63751-63752,63756,63758,63760-63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914,63927,63940-63941,63945,63954-63955

Modified: grass/branches/releasebranch_7_0/lib/gis/gislib.dox
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/gislib.dox	2015-01-05 16:03:39 UTC (rev 63955)
+++ grass/branches/releasebranch_7_0/lib/gis/gislib.dox	2015-01-05 19:31:57 UTC (rev 63956)
@@ -264,16 +264,16 @@
 
  - G_getenv()
 
- - G__getenv()
+ - G_getenv_nofatal()
 
 These routines look up the variable <em>name</em> in the GRASS
 environment and return its value (which is a character string). If
 <em>name</em> is not set, G_getenv() issues an error message and calls
-exit(). G__setenv() just returns the NULL pointer.
+exit(). G_setenv_nogisrc() just returns the NULL pointer.
 
  - G_setenv()
 
- - G__setenv()
+ - G_setenv_nogisrc()
   
 These routines set the the GRASS environment variable <em>name</em> to
 <em>value</em>. If <em>value</em> is NULL, the <em>name</em> is unset.

Modified: grass/branches/releasebranch_7_0/lib/gis/testsuite/gis_lib_env_test.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/testsuite/gis_lib_env_test.py	2015-01-05 16:03:39 UTC (rev 63955)
+++ grass/branches/releasebranch_7_0/lib/gis/testsuite/gis_lib_env_test.py	2015-01-05 19:31:57 UTC (rev 63956)
@@ -21,11 +21,11 @@
         self.assertEqual(value, "A")
         
         # In memory management
-        libgis.G__setenv("TEST", "B");
+        libgis.G_setenv_nogisrc("TEST", "B");
 
-        value = libgis.G__getenv("TEST")
+        value = libgis.G_getenv_nofatal("TEST")
         self.assertEqual(value, "B")
-        value = libgis.G__getenv2("TEST", libgis.G_VAR_GISRC)
+        value = libgis.G_getenv_nofatal2("TEST", libgis.G_VAR_GISRC)
         self.assertEqual(value, "B")
         # Force reading
         libgis.G__read_gisrc_env()
@@ -35,12 +35,12 @@
         self.assertEqual(value, "A")
 
     def test_switch_env(self):
-        libgis.G__setenv("TEST", "SWITCH");
-        libgis.G__setenv2("TEST", "SWITCH2", libgis.G_VAR_MAPSET);
+        libgis.G_setenv_nogisrc("TEST", "SWITCH");
+        libgis.G_setenv_nogisrc2("TEST", "SWITCH2", libgis.G_VAR_MAPSET);
         # Create alternative env
         libgis.G_create_alt_env()
-        libgis.G__setenv("TEST", "TARGET");
-        libgis.G__setenv2("TEST", "TARGET2", libgis.G_VAR_MAPSET);
+        libgis.G_setenv_nogisrc("TEST", "TARGET");
+        libgis.G_setenv_nogisrc2("TEST", "TARGET2", libgis.G_VAR_MAPSET);
         value = libgis.G_getenv("TEST")
         self.assertEqual(value, "TARGET")
         value = libgis.G_getenv2("TEST", libgis.G_VAR_MAPSET)
@@ -58,8 +58,8 @@
         value = libgis.G_getenv2("TEST", libgis.G_VAR_MAPSET)
         self.assertEqual(value, "C")
  
-        libgis.G__setenv2("TEST", "D", libgis.G_VAR_MAPSET);
-        value = libgis.G__getenv2("TEST", libgis.G_VAR_MAPSET)
+        libgis.G_setenv_nogisrc2("TEST", "D", libgis.G_VAR_MAPSET);
+        value = libgis.G_getenv_nofatal2("TEST", libgis.G_VAR_MAPSET)
         self.assertEqual(value, "D")
         # Force reading
         libgis.G__read_mapset_env()

More information about the grass-commit mailing list