Pārlūkot izejas kodu

wxGUI: remove compat, subrocess requited by grass.py

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@49642 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 13 gadi atpakaļ
vecāks
revīzija
47f03dd07b

+ 2 - 2
gui/wxpython/Makefile

@@ -9,7 +9,7 @@ include $(MODULE_TOPDIR)/include/Make/Python.make
 
 
 ETCDIR = $(ETC)/gui/wxpython
 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/* \
 	$(wildcard core/* dbmgr/* gcp/* gmodeler/* gui_core/* lmgr/* location_wizard/* \
 	mapdisp/* modules/* nviz/* psmap/* vdigit/* wxplot/* ) \
 	mapdisp/* modules/* nviz/* psmap/* vdigit/* wxplot/* ) \
 	gis_set.py gis_set_error.py wxgui.py README
 	gis_set.py gis_set_error.py wxgui.py README
@@ -17,7 +17,7 @@ DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) $(patsubst %.py,$(ETCDIR)/%.py
 
 
 PYDSTDIRS := $(patsubst %,$(ETCDIR)/%,core dbmgr gcp gmodeler gui_core lmgr location_wizard \
 PYDSTDIRS := $(patsubst %,$(ETCDIR)/%,core dbmgr gcp gmodeler gui_core lmgr location_wizard \
 	mapdisp modules nviz psmap vdigit wxplot)
 	mapdisp modules nviz psmap vdigit wxplot)
-DSTDIRS := $(patsubst %,$(ETCDIR)/%,compat icons scripts xml)
+DSTDIRS := $(patsubst %,$(ETCDIR)/%,icons scripts xml)
 
 
 default: $(DSTFILES) menustrings.py
 default: $(DSTFILES) menustrings.py
 	$(MAKE) parsubdirs
 	$(MAKE) parsubdirs

+ 0 - 5
gui/wxpython/compat/__init__.py

@@ -1,5 +0,0 @@
-"""
-Backward compatibility modules for Python 2.3
-"""
-__author__ = "PSF/GRASS Development Team"
-

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 1149
gui/wxpython/compat/subprocess.py


+ 3 - 9
gui/wxpython/core/gcmd.py

@@ -31,15 +31,7 @@ import errno
 import signal
 import signal
 import locale
 import locale
 import traceback
 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:
 if subprocess.mswindows:
     from win32file import ReadFile, WriteFile
     from win32file import ReadFile, WriteFile
     from win32pipe import PeekNamedPipe
     from win32pipe import PeekNamedPipe
@@ -49,6 +41,8 @@ else:
     import fcntl
     import fcntl
 from threading import Thread
 from threading import Thread
 
 
+import wx
+
 from grass.script import core as grass
 from grass.script import core as grass
 
 
 from core       import globalvar
 from core       import globalvar