[GRASS-SVN] r39587 - in grass/trunk/gui/wxpython: . gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-10-19 18:40:00 -0400 (Mon, 19 Oct 2009)
New Revision: 39587

Modified:
   grass/trunk/gui/wxpython/gui_modules/dbm.py
   grass/trunk/gui/wxpython/wxgui.py
Log:
wxGUI/dbm: fix encoding strings
	   (merge r39586 from devbr6)


Modified: grass/trunk/gui/wxpython/gui_modules/dbm.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/dbm.py	2009-10-19 22:37:19 UTC (rev 39586)
+++ grass/trunk/gui/wxpython/gui_modules/dbm.py	2009-10-19 22:40:00 UTC (rev 39587)
@@ -33,6 +33,7 @@
 import locale
 import tempfile
 import copy
+import types
 
 ### i18N
 import gettext
@@ -289,7 +290,7 @@
         j = 0
         
         for value in record.split('|'):
-            if self.columns[columns[j]]['ctype'] != type(str):
+            if self.columns[columns[j]]['ctype'] != types.StringType:
                 try:
                     ### casting disabled (2009/03)
                     ### self.itemDataMap[i].append(self.columns[columns[j]]['ctype'](value))

Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py	2009-10-19 22:37:19 UTC (rev 39586)
+++ grass/trunk/gui/wxpython/wxgui.py	2009-10-19 22:40:00 UTC (rev 39587)
@@ -23,7 +23,6 @@
 import os
 import time
 import traceback
-import types
 import re
 import string
 import getopt