[GRASS-SVN] r72402 - grass/branches/releasebranch_7_2/lib/init

[svn_grass at osgeo.org]

Author: martinl
Date: 2018-03-20 04:00:17 -0700 (Tue, 20 Mar 2018)
New Revision: 72402

Modified:
   grass/branches/releasebranch_7_2/lib/init/grass.py
Log:
disable to_text_string() in grass.py, see #3508 (merge r72374 from trunk)

Modified: grass/branches/releasebranch_7_2/lib/init/grass.py
===================================================================
--- grass/branches/releasebranch_7_2/lib/init/grass.py	2018-03-20 10:52:41 UTC (rev 72401)
+++ grass/branches/releasebranch_7_2/lib/init/grass.py	2018-03-20 11:00:17 UTC (rev 72402)
@@ -56,7 +56,7 @@
     ENCODING = 'UTF-8'
     print("Default locale not found, using UTF-8")  # intentionally not translatable
 
-
+# currently not used, see https://trac.osgeo.org/grass/ticket/3508
 def to_text_string(obj, encoding=ENCODING):
     """Convert `obj` to (unicode) text string"""
     if PY2:
@@ -613,11 +613,15 @@
             pass
 
         if sys_man_path:
-            os.environ['MANPATH'] = to_text_string(sys_man_path)
+            # to_text_string disabled, see https://trac.osgeo.org/grass/ticket/3508
+            # os.environ['MANPATH'] = to_text_string(sys_man_path)
+            os.environ['MANPATH'] = sys_man_path
             path_prepend(addons_man_path, 'MANPATH')
             path_prepend(grass_man_path, 'MANPATH')
         else:
-            os.environ['MANPATH'] = to_text_string(addons_man_path)
+            # to_text_string disabled, see https://trac.osgeo.org/grass/ticket/3508
+            # os.environ['MANPATH'] = to_text_string(addons_man_path)
+            os.environ['MANPATH'] = addons_man_path
             path_prepend(grass_man_path, 'MANPATH')
 
     # Set LD_LIBRARY_PATH (etc) to find GRASS shared libraries