MNT: make enums use python Enum class and updated Q_ENUM (no 's')

pydm/tests/widgets/test_enum_button.py

@@ -43,11 +43,11 @@ def test_widget_type(qtbot, widget_type):
     qtbot.addWidget(widget)
 
     assert widget.widgetType == WidgetType.PushButton
-    assert isinstance(widget._widgets[0], class_for_type[WidgetType.PushButton])
+    assert isinstance(widget._widgets[0], class_for_type[WidgetType.PushButton.value])
 
     widget.widgetType = widget_type
     assert widget.widgetType == widget_type
-    assert isinstance(widget._widgets[0], class_for_type[widget_type])
+    assert isinstance(widget._widgets[0], class_for_type[widget_type.value])
 
 
 @pytest.mark.parametrize("orientation", [Qt.Horizontal, Qt.Vertical])
@@ -82,7 +82,7 @@ def test_widget_orientation(qtbot, orientation):
     w = item.widget()
     qtbot.addWidget(w)
     assert w is not None
-    assert isinstance(w, class_for_type[widget.widgetType])
+    assert isinstance(w, class_for_type[widget.widgetType.value])
 
 
 @pytest.mark.parametrize(

pydm/widgets/datetime.py

@@ -1,18 +1,19 @@
 import logging
 from qtpy import QtWidgets, QtCore
+from enum import Enum
 
 from .base import PyDMWritableWidget, PyDMWidget
 
 logger = logging.getLogger(__name__)
 
 
-class TimeBase(object):
+class TimeBase(Enum):
     Milliseconds = 0
     Seconds = 1
 
 
-class PyDMDateTimeEdit(QtWidgets.QDateTimeEdit, PyDMWritableWidget, TimeBase):
-    QtCore.Q_ENUMS(TimeBase)
+class PyDMDateTimeEdit(QtWidgets.QDateTimeEdit, PyDMWritableWidget):
+    QtCore.Q_ENUM(TimeBase)
     returnPressed = QtCore.Signal()
     """
     A QDateTimeEdit with support for setting the text via a PyDM Channel, or
@@ -107,8 +108,8 @@ def value_changed(self, new_val):
         self.setDateTime(val)
 
 
-class PyDMDateTimeLabel(QtWidgets.QLabel, PyDMWidget, TimeBase):
-    QtCore.Q_ENUMS(TimeBase)
+class PyDMDateTimeLabel(QtWidgets.QLabel, PyDMWidget):
+    QtCore.Q_ENUM(TimeBase)
     """
     A QLabel with support for setting the text via a PyDM Channel, or
     through the PyDM Rules system.

pydm/widgets/display_format.py

@@ -4,11 +4,12 @@
 
 import logging
 import warnings
+from enum import Enum
 
 logger = logging.getLogger(__name__)
 
 
-class DisplayFormat(object):
+class DisplayFormat(Enum):
     """Display format for showing data in a PyDM widget."""
 
     #: The default display format.

pydm/widgets/enum_button.py

@@ -1,14 +1,16 @@
 import logging
+from enum import Enum
 
-from qtpy.QtCore import Qt, QSize, Property, Slot, Q_ENUMS, QMargins
+from qtpy.QtCore import Qt, QSize, Property, Slot, QMargins
+from PyQt5.QtCore import Q_ENUM
 from qtpy.QtGui import QPainter
 from qtpy.QtWidgets import QWidget, QButtonGroup, QGridLayout, QPushButton, QRadioButton, QStyleOption, QStyle
 
 from .base import PyDMWritableWidget
 from .. import data_plugins
 
 
-class WidgetType(object):
+class WidgetType(Enum):
     PushButton = 0
     RadioButton = 1
 
@@ -18,7 +20,7 @@ class WidgetType(object):
 logger = logging.getLogger(__name__)
 
 
-class PyDMEnumButton(QWidget, PyDMWritableWidget, WidgetType):
+class PyDMEnumButton(QWidget, PyDMWritableWidget):
     """
     A QWidget that renders buttons for every option of Enum Items.
     For now, two types of buttons can be rendered:
@@ -38,7 +40,7 @@ class PyDMEnumButton(QWidget, PyDMWritableWidget, WidgetType):
         Emitted when the user changes the value.
     """
 
-    Q_ENUMS(WidgetType)
+    Q_ENUM(WidgetType)
     WidgetType = WidgetType
 
     def __init__(self, parent=None, init_channel=None):
@@ -399,7 +401,7 @@ def generate_widgets(items):
                 w.deleteLater()
 
             for idx, entry in enumerate(items):
-                w = class_for_type[self._widget_type](parent=self)
+                w = class_for_type[self._widget_type.value](parent=self)
                 w.setCheckable(self.checkable)
                 w.setText(entry)
                 w.setVisible(False)

pydm/widgets/image.py

@@ -1,25 +1,27 @@
 from qtpy.QtWidgets import QActionGroup
-from qtpy.QtCore import Signal, Slot, Property, QTimer, Q_ENUMS, QThread
+from qtpy.QtCore import Signal, Slot, Property, QTimer, QThread
+from PyQt5.QtCore import Q_ENUM
 from pyqtgraph import ImageView, PlotItem
 from pyqtgraph import ColorMap
 from pyqtgraph.graphicsItems.ViewBox.ViewBoxMenu import ViewBoxMenu
 import numpy as np
 import logging
+from enum import Enum
 from .channel import PyDMChannel
 from .colormaps import cmaps, cmap_names, PyDMColorMap
 from .base import PyDMWidget
 
 logger = logging.getLogger(__name__)
 
 
-class ReadingOrder(object):
+class ReadingOrder(Enum):
     """Class to build ReadingOrder ENUM property."""
 
     Fortranlike = 0
     Clike = 1
 
 
-class DimensionOrder(object):
+class DimensionOrder(Enum):
     """
     Class to build DimensionOrder ENUM property.
 
@@ -98,7 +100,11 @@ def run(self):
         self.image_view.needs_redraw = False
 
 
-class PyDMImageView(ImageView, PyDMWidget, PyDMColorMap, ReadingOrder, DimensionOrder):
+class PyDMImageView(
+    ImageView,
+    PyDMWidget,
+    PyDMColorMap,
+):
     """
     A PyQtGraph ImageView with support for Channels and more from PyDM.
 
@@ -126,9 +132,9 @@ class PyDMImageView(ImageView, PyDMWidget, PyDMColorMap, ReadingOrder, Dimension
     ReadingOrder = ReadingOrder
     DimensionOrder = DimensionOrder
 
-    Q_ENUMS(ReadingOrder)
-    Q_ENUMS(DimensionOrder)
-    Q_ENUMS(PyDMColorMap)
+    Q_ENUM(ReadingOrder)
+    Q_ENUM(DimensionOrder)
+    Q_ENUM(PyDMColorMap)
 
     color_maps = cmaps
 

pydm/widgets/label.py

@@ -1,15 +1,16 @@
 from .base import PyDMWidget, TextFormatter, str_types
 from qtpy.QtWidgets import QLabel, QApplication
-from qtpy.QtCore import Qt, Property, Q_ENUMS
+from qtpy.QtCore import Qt, Property
 from .display_format import DisplayFormat, parse_value_for_display
 from pydm.utilities import is_pydm_app, is_qt_designer
 from pydm import config
 from pydm.widgets.base import only_if_channel_set
+from PyQt5.QtCore import Q_ENUM
 
 _labelRuleProperties = {"Text": ["value_changed", str]}
 
 
-class PyDMLabel(QLabel, TextFormatter, PyDMWidget, DisplayFormat, new_properties=_labelRuleProperties):
+class PyDMLabel(QLabel, TextFormatter, PyDMWidget, new_properties=_labelRuleProperties):
     """
     A QLabel with support for setting the text via a PyDM Channel, or
     through the PyDM Rules system.
@@ -27,7 +28,7 @@ class PyDMLabel(QLabel, TextFormatter, PyDMWidget, DisplayFormat, new_properties
         The channel to be used by the widget.
     """
 
-    Q_ENUMS(DisplayFormat)
+    Q_ENUM(DisplayFormat)
     DisplayFormat = DisplayFormat
 
     def __init__(self, parent=None, init_channel=None):

pydm/widgets/line_edit.py

@@ -5,7 +5,8 @@
 import logging
 from functools import partial
 from qtpy.QtWidgets import QLineEdit, QMenu, QApplication
-from qtpy.QtCore import Property, Q_ENUMS, Qt
+from qtpy.QtCore import Property, Qt
+from PyQt5.QtCore import Q_ENUM
 from qtpy.QtGui import QFocusEvent
 from .. import utilities
 from .base import PyDMWritableWidget, TextFormatter, str_types
@@ -14,7 +15,7 @@
 logger = logging.getLogger(__name__)
 
 
-class PyDMLineEdit(QLineEdit, TextFormatter, PyDMWritableWidget, DisplayFormat):
+class PyDMLineEdit(QLineEdit, TextFormatter, PyDMWritableWidget):
     """
     A QLineEdit (writable text field) with support for Channels and more
     from PyDM.
@@ -29,7 +30,7 @@ class PyDMLineEdit(QLineEdit, TextFormatter, PyDMWritableWidget, DisplayFormat):
         The channel to be used by the widget.
     """
 
-    Q_ENUMS(DisplayFormat)
+    Q_ENUM(DisplayFormat)
     DisplayFormat = DisplayFormat
 
     def __init__(self, parent=None, init_channel=None):

pydm/widgets/logdisplay.py

@@ -2,8 +2,10 @@
 import functools
 
 from collections import OrderedDict
+from enum import Enum
 
-from qtpy.QtCore import QObject, Slot, Signal, Property, Q_ENUMS, QSize
+from qtpy.QtCore import QObject, Slot, Signal, Property, QSize
+from PyQt5.QtCore import Q_ENUM
 from qtpy.QtWidgets import (
     QWidget,
     QPlainTextEdit,
@@ -81,7 +83,7 @@ def emit(self, record):
             logger.debug("Handler was destroyed at the C++ level.")
 
 
-class LogLevels(object):
+class LogLevels(Enum):
     NOTSET = 0
     DEBUG = 10
     INFO = 20
@@ -99,16 +101,11 @@ def as_dict():
         OrderedDict
         """
         # First let's remove the internals
-        entries = [
-            (k, v)
-            for k, v in LogLevels.__dict__.items()
-            if not k.startswith("__") and not callable(v) and not isinstance(v, staticmethod)
-        ]
-
+        entries = [(k, v.value) for k, v in LogLevels.__members__.items()]
         return OrderedDict(sorted(entries, key=lambda x: x[1], reverse=False))
 
 
-class PyDMLogDisplay(QWidget, LogLevels):
+class PyDMLogDisplay(QWidget):
     """
     Standard display for Log Output
 
@@ -129,7 +126,7 @@ class PyDMLogDisplay(QWidget, LogLevels):
 
     """
 
-    Q_ENUMS(LogLevels)
+    Q_ENUM(LogLevels)
     LogLevels = LogLevels
     terminator = "\n"
     default_format = "%(asctime)s %(message)s"

pydm/widgets/template_repeater.py

@@ -2,8 +2,10 @@
 import json
 import copy
 import logging
+from enum import Enum
 from qtpy.QtWidgets import QFrame, QApplication, QLabel, QVBoxLayout, QHBoxLayout, QWidget, QStyle, QSizePolicy, QLayout
-from qtpy.QtCore import Qt, QSize, QRect, Property, QPoint, Q_ENUMS
+from qtpy.QtCore import Qt, QSize, QRect, Property, QPoint
+from PyQt5.QtCore import Q_ENUM
 from .base import PyDMPrimitiveWidget
 from pydm.utilities import is_qt_designer
 import pydm.data_plugins
@@ -111,7 +113,7 @@ def smart_spacing(self, pm):
             return parent.spacing()
 
 
-class LayoutType(object):
+class LayoutType(Enum):
     Vertical = 0
     Horizontal = 1
     Flow = 2
@@ -120,7 +122,7 @@ class LayoutType(object):
 layout_class_for_type = (QVBoxLayout, QHBoxLayout, FlowLayout)
 
 
-class PyDMTemplateRepeater(QFrame, PyDMPrimitiveWidget, LayoutType):
+class PyDMTemplateRepeater(QFrame, PyDMPrimitiveWidget):
     """
     PyDMTemplateRepeater takes a .ui file with macro variables as a template, and a JSON
     file (or a list of dictionaries) with a list of values to use to fill in
@@ -140,7 +142,7 @@ class PyDMTemplateRepeater(QFrame, PyDMPrimitiveWidget, LayoutType):
         The parent of this widget.
     """
 
-    Q_ENUMS(LayoutType)
+    Q_ENUM(LayoutType)
     LayoutType = LayoutType
 
     def __init__(self, parent=None):
@@ -391,7 +393,7 @@ def rebuild(self):
             return
         self.setUpdatesEnabled(False)
 
-        layout_class = layout_class_for_type[self.layoutType]
+        layout_class = layout_class_for_type[self.layoutType.value]
         if type(self.layout()) != layout_class:
             if self.layout() is not None:
                 # Trick to remove the existing layout by re-parenting it in an empty widget.

pydm/widgets/timeplot.py

@@ -5,12 +5,14 @@
 from pyqtgraph import BarGraphItem, ViewBox, AxisItem
 import numpy as np
 from qtpy.QtGui import QColor
-from qtpy.QtCore import Signal, Slot, Property, QTimer, Q_ENUMS
+from qtpy.QtCore import Signal, Slot, Property, QTimer
+from PyQt5.QtCore import Q_ENUM
 from .baseplot import BasePlot, BasePlotCurveItem
 from .channel import PyDMChannel
 from ..utilities import remove_protocol
 
 import logging
+from enum import Enum
 
 logger = logging.getLogger(__name__)
 
@@ -24,7 +26,7 @@
 DEFAULT_UPDATE_INTERVAL = 1000  # Plot update rate for fixed rate mode in milliseconds
 
 
-class updateMode(object):
+class updateMode(Enum):
     """updateMode as new type for plot update"""
 
     OnValueChange = 1
@@ -376,7 +378,7 @@ def setUpdatesAsynchronously(self, value):
         Check if value is from updatesAsynchronously(bool) or updateMode(int)
         """
         if isinstance(value, int) and value == updateMode.AtFixedRate or isinstance(value, bool) and value is True:
-            self._update_mode = PyDMTimePlot.AtFixedRate
+            self._update_mode = PyDMTimePlot.AtFixedRated
         else:
             self._update_mode = PyDMTimePlot.OnValueChange
         self.initialize_buffer()
@@ -412,7 +414,7 @@ def channels(self):
         return [self.channel]
 
 
-class PyDMTimePlot(BasePlot, updateMode):
+class PyDMTimePlot(BasePlot):
     """
     PyDMTimePlot is a widget to plot one or more channels vs. time.
 
@@ -440,7 +442,7 @@ class PyDMTimePlot(BasePlot, updateMode):
     OnValueChange = 1
     AtFixedRated = 2
 
-    Q_ENUMS(updateMode)
+    Q_ENUM(updateMode)
     updateMode = updateMode
 
     plot_redrawn_signal = Signal(TimePlotCurveItem)