Bladeren bron

wxGUI/timeline: fix https://trac.osgeo.org/grass/ticket/3753

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@74095 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 6 jaren geleden
bovenliggende
commit
faf0e1b05a
2 gewijzigde bestanden met toevoegingen van 5 en 5 verwijderingen
  1. 4 4
      gui/wxpython/timeline/frame.py
  2. 1 1
      gui/wxpython/timeline/g.gui.timeline.py

+ 4 - 4
gui/wxpython/timeline/frame.py

@@ -286,7 +286,7 @@ class TimelineFrame(wx.Frame):
             startY = self.timeData[name]['south']
             dY = self.timeData[name]['north'] - np.array(startY)
 
-            color = colors.next()
+            color = next(colors)
             plots.append(self.axes3d.bar3d(startX, startY, startZ, dX, dY, dZ,
                                            color=color, alpha=ALPHA))
 
@@ -334,9 +334,9 @@ class TimelineFrame(wx.Frame):
             # TODO: mixed
             if mapType == 'interval':
                 end = convert(self.timeData[name]['end_datetime'])
-                lookUpData = zip(start, end)
+                lookUpData = list(zip(start, end))
                 duration = end - np.array(start)
-                barData = zip(start, duration)
+                barData = list(zip(start, duration))
                 lookUp.AddDataset(type_='bar', yrange=(i - 0.1, i + 0.1),
                                   xranges=lookUpData, datasetName=name)
 
@@ -348,7 +348,7 @@ class TimelineFrame(wx.Frame):
                     yrange=i,
                     xranges=pointData,
                     datasetName=name)
-            color = colors.next()
+            color = next(colors)
             if mapType == 'interval':
                 plots.append(
                     self.axes2d.broken_barh(

+ 1 - 1
gui/wxpython/timeline/g.gui.timeline.py

@@ -50,7 +50,7 @@ def main():
         # TODO: why do we need this special check here, the reason of error
         # is wrong intallation or something, no need to report this to the
         # user in a nice way
-        gscript.fatal(e.message)
+        gscript.fatal(str(e))
 
     datasets = options['inputs'].strip().split(',')
     datasets = [data for data in datasets if data]