[GRASS-SVN] r65439 - in grass/branches/releasebranch_7_0: . lib/python lib/python/pygrass/modules/interface

[svn_grass at osgeo.org]

Author: zarch
Date: 2015-06-11 05:13:11 -0700 (Thu, 11 Jun 2015)
New Revision: 65439

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/python/Makefile
   grass/branches/releasebranch_7_0/lib/python/pygrass/modules/interface/env.py
Log:
pygrass: backport r65438, Remove dictionary comprehension for backward compatibility with python2.6


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Added: svn:mergeinfo
   + /grass/trunk:64971,65076-65077,65096,65119,65190,65287,65289-65290,65336-65337,65438

Modified: grass/branches/releasebranch_7_0/lib/python/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/Makefile	2015-06-11 10:12:15 UTC (rev 65438)
+++ grass/branches/releasebranch_7_0/lib/python/Makefile	2015-06-11 12:13:11 UTC (rev 65439)
@@ -5,7 +5,7 @@
 
 PYDIR = $(ETC)/python/grass
 
-SUBDIRS = exceptions script ctypes temporal pygrass pydispatch imaging
+SUBDIRS = exceptions script ctypes temporal pygrass pydispatch imaging gunittest
 
 default: $(PYDIR)/__init__.py
 	$(MAKE) subdirs

Modified: grass/branches/releasebranch_7_0/lib/python/pygrass/modules/interface/env.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/pygrass/modules/interface/env.py	2015-06-11 10:12:15 UTC (rev 65438)
+++ grass/branches/releasebranch_7_0/lib/python/pygrass/modules/interface/env.py	2015-06-11 12:13:11 UTC (rev 65439)
@@ -15,8 +15,8 @@
     if gisrc is None:
         raise RuntimeError('You are not in a GRASS session, GISRC not found.')
     with open(gisrc, mode='r') as grc:
-        env = {k.strip(): v.strip() for k, v in [row.split(':')
-                                                 for row in grc if row]}
+        env = dict([(k.strip(), v.strip())
+                    for k, v in [row.split(':') for row in grc if row]])
     return env