Use enum2int from Orange

orangecontrib/text/widgets/owkeywords.py

@@ -15,6 +15,7 @@
 from Orange.widgets import gui
 from Orange.widgets.settings import DomainContextHandler, ContextSetting, \
     Setting
+from Orange.widgets.utils import enum2int
 from Orange.widgets.utils.concurrent import ConcurrentWidgetMixin, TaskState
 from Orange.widgets.utils.itemmodels import PyTableModel, TableModel
 from Orange.widgets.widget import Input, Output, OWWidget, Msg
@@ -23,7 +24,6 @@
 from orangecontrib.text.keywords import ScoringMethods, AggregationMethods, \
     YAKE_LANGUAGE_MAPPING, RAKE_LANGUAGES
 from orangecontrib.text.preprocess import BaseNormalizer
-from orangecontrib.text.widgets.utils import enum2int
 from orangecontrib.text.widgets.utils.words import create_words_table, \
     WORDS_COLUMN_NAME
 

orangecontrib/text/widgets/owscoredocuments.py

@@ -24,6 +24,7 @@
 from Orange.data.util import get_unique_names
 from Orange.util import wrap_callback
 from Orange.widgets.settings import ContextSetting, PerfectDomainContextHandler, Setting
+from Orange.widgets.utils import enum2int
 from Orange.widgets.utils.annotated_data import create_annotated_table, add_columns
 from Orange.widgets.utils.concurrent import ConcurrentWidgetMixin, TaskState
 from Orange.widgets.utils.itemmodels import PyTableModel, TableModel
@@ -36,7 +37,6 @@
 from orangecontrib.text import Corpus
 from orangecontrib.text.preprocess import BaseNormalizer, NGrams, BaseTokenFilter
 from orangecontrib.text.vectorization.sbert import SBERT
-from orangecontrib.text.widgets.utils import enum2int
 
 from orangecontrib.text.widgets.utils.words import create_words_table
 

orangecontrib/text/widgets/utils/__init__.py

@@ -1,24 +1,3 @@
-from enum import IntEnum, Enum
-from typing import Union
-
 from .decorators import *
 from .widgets import *
 from .concurrent import asynchronous
-
-
-def enum2int(enum: Union[Enum, IntEnum]) -> int:
-    """
-    PyQt5 uses IntEnum like object for settings, for example SortOrder while
-    PyQt6 uses Enum. PyQt5's IntEnum also does not support value attribute.
-    This function transform both settings objects to int.
-
-    Parameters
-    ----------
-    enum
-        IntEnum like object or Enum object with Qt's settings
-
-    Returns
-    -------
-    Settings transformed to int
-    """
-    return int(enum) if isinstance(enum, int) else enum.value

requirements.txt

@@ -10,7 +10,7 @@ lemmagen3
 nltk>=3.0.5     # TweetTokenizer introduced in 3.0.5
 numpy
 odfpy>=1.3.5
-Orange3 >=3.34.0
+Orange3 >=3.35.0
 orange-widget-base >=4.20.0
 orange-canvas-core
 owlready2

tox.ini

@@ -25,7 +25,7 @@ deps =
     {env:PYQT_PYPI_NAME:PyQt5}=={env:PYQT_PYPI_VERSION:5.15.*}
     {env:WEBENGINE_PYPI_NAME:PyQtWebEngine}=={env:WEBENGINE_PYPI_VERSION:5.15.*}
     oldest: scikit-learn==1.0.1
-    oldest: orange3==3.34.0
+    oldest: orange3==3.35.0
     oldest: orange-canvas-core==0.1.30
     oldest: orange-widget-base==4.20.0
     oldest: pandas==1.4.0