Changeset 65439

Timestamp:

Jun 11, 2015, 5:13:11 AM (9 years ago)

Author:

zarch

Message:

pygrass: backport r65438, Remove dictionary comprehension for backward compatibility with python2.6

Location:

grass/branches/releasebranch_7_0

Files:

• . (modified) (1 prop)
• lib/python/Makefile (modified) (1 diff)
• lib/python/pygrass/modules/interface/env.py (modified) (1 diff)

grass/branches/releasebranch_7_0/lib/python/Makefile

@@ -6 +6 @@
 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

grass/branches/releasebranch_7_0/lib/python/pygrass/modules/interface/env.py

@@ -16 +16 @@
         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