[GRASS-SVN] r32544 - grass/trunk/gui/wxpython/gui_modules

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Aug 5 15:47:10 EDT 2008


Author: martinl
Date: 2008-08-05 15:47:09 -0400 (Tue, 05 Aug 2008)
New Revision: 32544

Modified:
   grass/trunk/gui/wxpython/gui_modules/gdialogs.py
Log:
wxGUI: simplify v.in.dxf -l (format reverted r32543)

Modified: grass/trunk/gui/wxpython/gui_modules/gdialogs.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/gdialogs.py	2008-08-05 19:43:19 UTC (rev 32543)
+++ grass/trunk/gui/wxpython/gui_modules/gdialogs.py	2008-08-05 19:47:09 UTC (rev 32544)
@@ -940,12 +940,8 @@
         if self.inputType == 'dxf':
             for line in cmd.ReadStdOutput():
                 layerId = line.split(':')[0].split(' ')[1]
-                layer = line.split(':')[1]
-                try:
-                    layerName, grassName = layer.split('/')
-                except ValueError: # trunk/develbranch_6 -> v.in.dxf -l format changed
-                    layerName = layer.strip()
-                    grassName = utils.GetValidLayerName(layerName)
+                layerName = line.split(':')[1].strip()
+                grassName = utils.GetValidLayerName(layerName)
                 data.append((layerId, layerName.strip(), grassName.strip()))
                 
         else: # gdal/ogr (for ogr maybe to use v.in.ogr -l)



More information about the grass-commit mailing list