Python 3 compatibility: ran 2to3 with default options

Author: PierreRaybaut

qwt/color_map.py

@@ -113,7 +113,7 @@ def rgb(self, mode, pos):
 class QwtColorMap(object):
 
     # enum Format
-    RGB, Indexed = range(2)
+    RGB, Indexed = list(range(2))
 
     def __init__(self, format_=None):
         if format_ is None:
@@ -148,7 +148,7 @@ def __init__(self):
 class QwtLinearColorMap(QwtColorMap):
 
     # enum Mode
-    FixedColors, ScaledColors = range(2)
+    FixedColors, ScaledColors = list(range(2))
 
     def __init__(self, *args):
         color1, color2 = QColor(Qt.blue), QColor(Qt.yellow)

qwt/column_symbol.py

@@ -86,7 +86,7 @@ class QwtColumnSymbol(object):
     UserStyle = 1000
 
     # enum FrameStyle
-    NoFrame, Plain, Raised = range(3)
+    NoFrame, Plain, Raised = list(range(3))
 
     def __init__(self, style):
         self.__data = QwtColumnSymbol_PrivateData()
@@ -140,7 +140,7 @@ def drawBox(self, painter, rect):
 class QwtColumnRect(object):
 
     # enum Direction
-    LeftToRight, RightToLeft, BottomToTop, TopToBottom = range(4)
+    LeftToRight, RightToLeft, BottomToTop, TopToBottom = list(range(4))
 
     def __init__(self):
         self.hInterval = QwtInterval()

qwt/curve_fitter.py

@@ -26,7 +26,7 @@ def __init__(self):
 
 class QwtSplineCurveFitter(QwtCurveFitter):
     # enum FitMode
-    Auto, Spline, ParametricSpline = range(3)
+    Auto, Spline, ParametricSpline = list(range(3))
 
     def __init__(self):
         super(QwtSplineCurveFitter, self).__init__()

qwt/legend_data.py

@@ -10,10 +10,10 @@
 class QwtLegendData(object):
 
     # enum Mode
-    ReadOnly, Clickable, Checkable = range(3)
+    ReadOnly, Clickable, Checkable = list(range(3))
 
     # enum Role
-    ModeRole, TitleRole, IconRole = range(3)
+    ModeRole, TitleRole, IconRole = list(range(3))
     UserRole = 32
 
     def __init__(self):

qwt/null_paintdevice.py

@@ -157,7 +157,7 @@ def nullDevice(self):
 class QwtNullPaintDevice(QPaintDevice):
 
     # enum Mode
-    NormalMode, PolygonPathMode, PathMode = range(3)
+    NormalMode, PolygonPathMode, PathMode = list(range(3))
 
     def __init__(self):
         super(QwtNullPaintDevice, self).__init__()

qwt/painter.py

@@ -379,7 +379,7 @@ def drawFocusRect(self, *args):
                             "(s) (%s given)" % len(args))
 
     def drawRoundFrame(self, painter, rect, palette, lineWidth, frameStyle):
-        Plain, Sunken, Raised = range(3)
+        Plain, Sunken, Raised = list(range(3))
         style = Plain
         if (frameStyle & QFrame.Sunken) == QFrame.Sunken:
             style = Sunken
@@ -511,7 +511,7 @@ def drawRoundedFrame(self, painter, rect, xRadius, yRadius,
         r = rect.adjusted(lw2, lw2, -lw2, -lw2)
         path = QPainterPath()
         path.addRoundedRect(r, xRadius, yRadius)
-        Plain, Sunken, Raised = range(3)
+        Plain, Sunken, Raised = list(range(3))
         style = Plain
         if (frameStyle & QFrame.Sunken) == QFrame.Sunken:
             style = Sunken

qwt/painter_command.py

@@ -43,7 +43,7 @@ class QwtPainterCommand(object):
 
     # enum Type
     Invalid = -1
-    Path, Pixmap, Image, State = range(4)
+    Path, Pixmap, Image, State = list(range(4))
 
     def __init__(self, *args):
         if len(args) == 0:

qwt/plot.py

@@ -131,10 +131,10 @@ class QwtPlot(QFrame, QwtPlotDict):
     SIG_LEGEND_DATA_CHANGED = Signal("PyQt_PyObject", "PyQt_PyObject")
 
     # enum Axis
-    yLeft, yRight, xBottom, xTop, axisCnt = range(5)
+    yLeft, yRight, xBottom, xTop, axisCnt = list(range(5))
 
     # enum LegendPosition
-    LeftLegend, RightLegend, BottomLegend, TopLegend = range(4)
+    LeftLegend, RightLegend, BottomLegend, TopLegend = list(range(4))
 
     def __init__(self, *args):
         if len(args) == 0:
@@ -867,7 +867,7 @@ class QwtPlotItem(object):
      Rtti_PlotIntervalCurve, Rtti_PlotHistogram, Rtti_PlotSpectrogram,
      Rtti_PlotSVG, Rtti_PlotTradingCurve, Rtti_PlotBarChart,
      Rtti_PlotMultiBarChart, Rtti_PlotShape, Rtti_PlotTextLabel,
-     Rtti_PlotZone) = range(17)
+     Rtti_PlotZone) = list(range(17))
     Rtti_PlotUserItem = 1000
 
     # enum ItemAttribute

qwt/plot_canvas.py

@@ -314,7 +314,7 @@ class QwtPlotCanvas(QFrame):
     ImmediatePaint = 8
 
     # enum FocusIndicator
-    NoFocusIndicator, CanvasFocusIndicator, ItemFocusIndicator = range(3)
+    NoFocusIndicator, CanvasFocusIndicator, ItemFocusIndicator = list(range(3))
 
     def __init__(self, plot=None):
         super(QwtPlotCanvas, self).__init__(plot)

qwt/plot_curve.py

@@ -68,7 +68,7 @@ class QwtPlotCurve(QwtPlotSeriesItem, QwtSeriesStore):
 
     # enum CurveStyle
     NoCurve = -1
-    Lines, Sticks, Steps, Dots = range(4)
+    Lines, Sticks, Steps, Dots = list(range(4))
     UserCurve = 100
 
     # enum CurveAttribute