[GRASS-SVN] r49642 - in grass/trunk/gui/wxpython: . core

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-09 05:07:47 -0800 (Fri, 09 Dec 2011)
New Revision: 49642

Removed:
   grass/trunk/gui/wxpython/compat/
Modified:
   grass/trunk/gui/wxpython/Makefile
   grass/trunk/gui/wxpython/core/gcmd.py
Log:
wxGUI: remove compat, subrocess requited by grass.py

Modified: grass/trunk/gui/wxpython/Makefile
===================================================================
--- grass/trunk/gui/wxpython/Makefile	2011-12-09 12:18:59 UTC (rev 49641)
+++ grass/trunk/gui/wxpython/Makefile	2011-12-09 13:07:47 UTC (rev 49642)
@@ -9,7 +9,7 @@
 
 ETCDIR = $(ETC)/gui/wxpython
 
-SRCFILES := $(wildcard compat/* icons/*.* scripts/* xml/*) \
+SRCFILES := $(wildcard icons/*.* scripts/* xml/*) \
 	$(wildcard core/* dbmgr/* gcp/* gmodeler/* gui_core/* lmgr/* location_wizard/* \
 	mapdisp/* modules/* nviz/* psmap/* vdigit/* wxplot/* ) \
 	gis_set.py gis_set_error.py wxgui.py README
@@ -17,7 +17,7 @@
 
 PYDSTDIRS := $(patsubst %,$(ETCDIR)/%,core dbmgr gcp gmodeler gui_core lmgr location_wizard \
 	mapdisp modules nviz psmap vdigit wxplot)
-DSTDIRS := $(patsubst %,$(ETCDIR)/%,compat icons scripts xml)
+DSTDIRS := $(patsubst %,$(ETCDIR)/%,icons scripts xml)
 
 default: $(DSTFILES) menustrings.py
 	$(MAKE) parsubdirs

Modified: grass/trunk/gui/wxpython/core/gcmd.py
===================================================================
--- grass/trunk/gui/wxpython/core/gcmd.py	2011-12-09 12:18:59 UTC (rev 49641)
+++ grass/trunk/gui/wxpython/core/gcmd.py	2011-12-09 13:07:47 UTC (rev 49642)
@@ -31,15 +31,7 @@
 import signal
 import locale
 import traceback
-
-import wx
-
-try:
-    import subprocess
-except:
-    compatPath = os.path.join(globalvar.ETCWXDIR, "compat")
-    sys.path.append(compatPath)
-    import subprocess
+import subprocess
 if subprocess.mswindows:
     from win32file import ReadFile, WriteFile
     from win32pipe import PeekNamedPipe
@@ -49,6 +41,8 @@
     import fcntl
 from threading import Thread
 
+import wx
+
 from grass.script import core as grass
 
 from core       import globalvar