Dropped Python 3.8: remove unnecessary `from __future__ import annota…

…tions` statements
PlotPyStack · Nov 6, 2024 · ae359f6 · ae359f6
1 parent e2ea090
commit ae359f6
Show file tree

Hide file tree

Showing 27 changed files with 9 additions and 57 deletions.
diff --git a/doc/dev/contribute.rst b/doc/dev/contribute.rst
@@ -19,8 +19,9 @@ Moreover, the following guidelines should be followed:
   should follow the `Google style <http://google-styleguide.googlecode.com/svn/trunk/pyguide.html?showone=Comments#Comments>`_.
 
 * Add typing annotations for all functions and methods. The annotations should
-  use the future syntax (``from __future__ import annotations``) and the
-  ``if TYPE_CHECKING`` pattern to avoid circular imports (see
+  use the future syntax ``from __future__ import annotations`` (see
+  `PEP 563 <https://www.python.org/dev/peps/pep-0563/>`_)
+  and the ``if TYPE_CHECKING`` pattern to avoid circular imports (see
   `PEP 484 <https://www.python.org/dev/peps/pep-0484/>`_).
 
 .. note::

diff --git a/guidata/configtools.py b/guidata/configtools.py
@@ -34,8 +34,6 @@
 .. autofunction:: add_image_module_path
 """
 
-from __future__ import annotations
-
 import gettext
 import os
 import os.path as osp

diff --git a/guidata/dataset/autodoc.py b/guidata/dataset/autodoc.py
@@ -3,8 +3,6 @@
 classes.
 """
 
-from __future__ import annotations
-
 import logging
 import re
 from inspect import Parameter, Signature

diff --git a/guidata/dataset/conv.py b/guidata/dataset/conv.py
@@ -22,8 +22,6 @@
 .. autofunction:: guidata.dataset.create_dataset_from_dict
 """
 
-from __future__ import annotations
-
 import inspect
 from typing import TYPE_CHECKING, Any
 

diff --git a/guidata/dataset/note_directive.py b/guidata/dataset/note_directive.py
@@ -4,8 +4,6 @@
 
 """Sphinx directive to display a note about how to instanciate a dataset class"""
 
-from __future__ import annotations
-
 from typing import TYPE_CHECKING, Type
 
 from docutils import nodes

diff --git a/guidata/dataset/qtitemwidgets.py b/guidata/dataset/qtitemwidgets.py
@@ -15,8 +15,6 @@
 Example: ChoiceWidget <--> ChoiceItem, ImageChoiceItem
 """
 
-from __future__ import annotations
-
 import datetime
 import os
 import os.path as osp

diff --git a/guidata/env.py b/guidata/env.py
@@ -7,8 +7,6 @@
 Execution environmnent utilities
 """
 
-from __future__ import annotations
-
 import argparse
 import enum
 import os

diff --git a/guidata/io/base.py b/guidata/io/base.py
@@ -120,11 +120,12 @@ def end(self, section: str) -> None:
             section (str): The name of the section to end.
         """
         sect = self.option.pop(-1)
-        assert (
-            sect == section
-        ), "Ending section does not match the current section: %s != %s" % (
-            sect,
-            section,
+        assert sect == section, (
+            "Ending section does not match the current section: %s != %s"
+            % (
+                sect,
+                section,
+            )
         )
 
 

diff --git a/guidata/io/h5fmt.py b/guidata/io/h5fmt.py
@@ -7,8 +7,6 @@
 HDF5 files (.h5)
 """
 
-from __future__ import annotations
-
 import datetime
 import sys
 from collections.abc import Callable, Sequence

diff --git a/guidata/io/inifmt.py b/guidata/io/inifmt.py
@@ -7,8 +7,6 @@
 Configuration files (.ini)
 """
 
-from __future__ import annotations
-
 from typing import Any
 
 from guidata.io.base import BaseIOHandler, GroupContext, WriterMixin

diff --git a/guidata/io/jsonfmt.py b/guidata/io/jsonfmt.py
@@ -12,8 +12,6 @@
 
 # pylint: disable=invalid-name  # Allows short reference names like x, y, ...
 
-from __future__ import annotations
-
 import json
 import os
 from collections.abc import Callable, Sequence

diff --git a/guidata/qthelpers.py b/guidata/qthelpers.py
@@ -53,8 +53,6 @@
 .. autofunction:: save_restore_stds
 """
 
-from __future__ import annotations
-
 import os
 import os.path as osp
 import sys

diff --git a/guidata/tests/unit/test_dataset_from_func.py b/guidata/tests/unit/test_dataset_from_func.py
@@ -12,8 +12,6 @@
 
 # guitest: show
 
-from __future__ import annotations
-
 import numpy as np
 
 from guidata.dataset import create_dataset_from_func

diff --git a/guidata/tests/unit/test_h5fmt.py b/guidata/tests/unit/test_h5fmt.py
@@ -12,8 +12,6 @@
 * Serialize and deserialize a data model, handling versioning and compatibility breaks.
 """
 
-from __future__ import annotations
-
 import atexit
 import os
 import os.path as osp

diff --git a/guidata/tests/unit/test_jsonfmt.py b/guidata/tests/unit/test_jsonfmt.py
@@ -12,8 +12,6 @@
 * Serialize and deserialize a data model, handling versioning and compatibility breaks.
 """
 
-from __future__ import annotations
-
 import atexit
 import os
 import os.path as osp

diff --git a/guidata/tests/widgets/test_arrayeditor_unit.py b/guidata/tests/widgets/test_arrayeditor_unit.py
@@ -10,8 +10,6 @@
 
 # guitest: show
 
-from __future__ import annotations
-
 from typing import Any
 
 import numpy as np

diff --git a/guidata/tests/widgets/test_theme.py b/guidata/tests/widgets/test_theme.py
@@ -7,8 +7,6 @@
 Test dark/light theme switching
 """
 
-from __future__ import annotations
-
 import os
 import sys
 from typing import Literal

diff --git a/guidata/utils/encoding.py b/guidata/utils/encoding.py
@@ -11,8 +11,6 @@
 source code (Utilities/__init___.py) Copyright © 2003-2009 Detlev Offenbach
 """
 
-from __future__ import annotations
-
 import os
 import re
 from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF32

diff --git a/guidata/utils/genreqs.py b/guidata/utils/genreqs.py
@@ -12,8 +12,6 @@
 This module is derived from the `genreqs.py` module of the `DataLab` project.
 """
 
-from __future__ import annotations
-
 import configparser as cp
 import os
 import os.path as osp

diff --git a/guidata/utils/misc.py b/guidata/utils/misc.py
@@ -26,8 +26,6 @@
 .. autofunction:: decode_fs_string
 """
 
-from __future__ import annotations
-
 import collections.abc
 import ctypes
 import locale

diff --git a/guidata/widgets/about.py b/guidata/widgets/about.py
@@ -6,8 +6,6 @@
 
 """
 
-from __future__ import annotations
-
 import platform
 import sys
 

diff --git a/guidata/widgets/arrayeditor/arrayeditor.py b/guidata/widgets/arrayeditor/arrayeditor.py
@@ -16,8 +16,6 @@
 Module that provides array editor dialog boxes to edit various types of NumPy arrays
 """
 
-from __future__ import annotations
-
 from typing import Generic
 
 import numpy as np

diff --git a/guidata/widgets/arrayeditor/arrayhandler.py b/guidata/widgets/arrayeditor/arrayhandler.py
@@ -18,8 +18,6 @@
 models/widgets and views. They handle data access and changes.
 """
 
-from __future__ import annotations
-
 import copy
 from typing import Any, Generic, TypeVar, Union, cast
 

diff --git a/guidata/widgets/arrayeditor/datamodel.py b/guidata/widgets/arrayeditor/datamodel.py
@@ -16,8 +16,6 @@
 Data models for the array editor widget.
 """
 
-from __future__ import annotations
-
 from abc import abstractmethod
 from collections.abc import Callable
 from functools import reduce

diff --git a/guidata/widgets/arrayeditor/editorwidget.py b/guidata/widgets/arrayeditor/editorwidget.py
@@ -14,8 +14,6 @@
 
 """Array editor widget"""
 
-from __future__ import annotations
-
 import io
 from typing import Any, Generic, Sequence, cast
 

diff --git a/guidata/widgets/dockable.py b/guidata/widgets/dockable.py
@@ -11,8 +11,6 @@
 into a QMainWindow.
 """
 
-from __future__ import annotations
-
 from qtpy.QtCore import Qt
 from qtpy.QtWidgets import QDockWidget, QWidget
 

diff --git a/guidata/widgets/objecteditor.py b/guidata/widgets/objecteditor.py
@@ -14,8 +14,6 @@
 
 """
 
-from __future__ import annotations
-
 from typing import TYPE_CHECKING
 
 import numpy as np
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,8 +6,6 @@ @@
     """
-    from __future__ import annotations
     import platform
     import sys
@@ Expand Down @@