Merge pull request #13 from petrasovaa/fix-digitizer-py3

wxGUI/digitizer: fixes for python 3
OSGeo · May 22, 2019 · 826170d · 826170d
2 parents b43bb26 + f7047e0
commit 826170d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/gui/wxpython/dbmgr/dialogs.py b/gui/wxpython/dbmgr/dialogs.py
@@ -439,7 +439,7 @@ def UpdateDialog(self, map=None, query=None, cats=None, fid=-1,
         if fid > 0:
             self.fid = fid
         elif len(self.cats.keys()) > 0:
-            self.fid = self.cats.keys()[0]
+            self.fid = list(self.cats.keys())[0]
         else:
             self.fid = -1
 
@@ -530,7 +530,7 @@ def UpdateDialog(self, map=None, query=None, cats=None, fid=-1,
                     ctype = columns[name]['ctype']
 
                     if columns[name]['values'][idx] is not None:
-                        if columns[name]['ctype'] != types.StringType:
+                        if not isinstance(columns[name]['ctype'], six.string_types):
                             value = str(columns[name]['values'][idx])
                         else:
                             value = columns[name]['values'][idx]

diff --git a/gui/wxpython/vdigit/wxdigit.py b/gui/wxpython/vdigit/wxdigit.py
@@ -1767,7 +1767,7 @@ def InitCats(self):
                 Vect_cidx_get_cat_by_index(self.poMapInfo, i, j,
                                            byref(cat), byref(type), byref(id))
                 if field in self.cats:
-                    if cat > self.cats[field]:
+                    if self.cats[field] is None or cat.value > self.cats[field]:
                         self.cats[field] = cat.value
                 else:
                     self.cats[field] = cat.value

diff --git a/gui/wxpython/vdigit/wxdisplay.py b/gui/wxpython/vdigit/wxdisplay.py
@@ -22,10 +22,13 @@
 import locale
 import six
 
+import os
+import sys
 import wx
 
 from core.debug import Debug
 from core.settings import UserSettings
+from core.gcmd import DecodeString
 from gui_core.wrap import Rect
 
 try:
@@ -48,6 +51,8 @@ def print_error(msg, type):
     """Redirect stderr"""
     global log
     if log:
+        if sys.version_info.major >= 3:
+            msg = DecodeString(msg.data)
         log.write(msg + os.linesep)
     else:
         print(msg)
@@ -346,7 +351,9 @@ def _drawObject(self, robj):
                             point_beg.y,
                             0,
                             0))
-                    pdc.SetIdBounds(dcId, wx.RectPP(point_beg, point_end))
+                    pdc.SetIdBounds(dcId, Rect(point_beg.x, point_beg.y,
+                                               point_end.x - point_beg.x,
+                                               point_end.y - point_beg.y))
                     pdc.DrawLine(point_beg.x, point_beg.y,
                                  point_end.x, point_end.y)
                     i += 1