From 349b0a1ccd7db4d9df8a715514d632e804aa7c02 Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Wed, 15 Nov 2023 11:53:17 -0500 Subject: [PATCH] mypy: Cleanup "noqa: H301" comments We decided that H301 makes no sense for the "typing" module, just set that in tox.ini instead of every time it is used. Change-Id: Id983fb0a9feef2311bf4b2e6fd70386ab60e974a --- cinder/api/api_utils.py | 2 +- cinder/api/common.py | 2 +- cinder/backup/drivers/ceph.py | 2 +- cinder/cmd/manage.py | 2 +- cinder/context.py | 2 +- cinder/coordination.py | 2 +- cinder/exception.py | 2 +- cinder/flow_utils.py | 2 +- cinder/image/glance.py | 2 +- cinder/image/image_utils.py | 2 +- cinder/policy.py | 2 +- cinder/scheduler/base_weight.py | 2 +- cinder/scheduler/filter_scheduler.py | 2 +- cinder/scheduler/flows/create_volume.py | 2 +- cinder/scheduler/host_manager.py | 2 +- cinder/utils.py | 4 ++-- cinder/volume/api.py | 2 +- cinder/volume/drivers/rbd.py | 2 +- cinder/volume/drivers/remotefs.py | 2 +- cinder/volume/flows/api/create_volume.py | 2 +- cinder/volume/flows/manager/create_volume.py | 2 +- cinder/volume/manager.py | 2 +- cinder/volume/rpcapi.py | 2 +- cinder/volume/volume_types.py | 2 +- cinder/volume/volume_utils.py | 4 ++-- tox.ini | 3 +++ 26 files changed, 30 insertions(+), 27 deletions(-) diff --git a/cinder/api/api_utils.py b/cinder/api/api_utils.py index 606dba692da..7d4d9fd9f62 100644 --- a/cinder/api/api_utils.py +++ b/cinder/api/api_utils.py @@ -13,7 +13,7 @@ from __future__ import annotations import typing -from typing import Any, Generator, Iterable, Optional, Union # noqa: H301 +from typing import Any, Generator, Iterable, Optional, Union from keystoneauth1 import exceptions as ks_exc from keystoneauth1 import identity diff --git a/cinder/api/common.py b/cinder/api/common.py index d015138c64e..74f99e0f55c 100644 --- a/cinder/api/common.py +++ b/cinder/api/common.py @@ -20,7 +20,7 @@ import json import os import re import typing -from typing import Any, Iterable, Optional, Union # noqa: H301 +from typing import Any, Iterable, Optional, Union import urllib from oslo_config import cfg diff --git a/cinder/backup/drivers/ceph.py b/cinder/backup/drivers/ceph.py index 12552559820..0e66c4a05e4 100644 --- a/cinder/backup/drivers/ceph.py +++ b/cinder/backup/drivers/ceph.py @@ -48,7 +48,7 @@ import os import re import subprocess import time -from typing import Dict, List, Optional, Tuple # noqa: H301 +from typing import Dict, List, Optional, Tuple import eventlet from os_brick.initiator import linuxrbd diff --git a/cinder/cmd/manage.py b/cinder/cmd/manage.py index 5783a01700f..5035f6d6bea 100644 --- a/cinder/cmd/manage.py +++ b/cinder/cmd/manage.py @@ -63,7 +63,7 @@ import re import sys import time import typing -from typing import Any, Callable, Optional, Tuple, Union # noqa: H301 +from typing import Any, Callable, Optional, Tuple, Union from oslo_config import cfg from oslo_db import exception as db_exc diff --git a/cinder/context.py b/cinder/context.py index 21454cb42fe..15bbc2690f0 100644 --- a/cinder/context.py +++ b/cinder/context.py @@ -20,7 +20,7 @@ from __future__ import annotations import copy -from typing import Any, Optional # noqa: H301 +from typing import Any, Optional from keystoneauth1.access import service_catalog as ksa_service_catalog from keystoneauth1 import plugin diff --git a/cinder/coordination.py b/cinder/coordination.py index fc5e2e4f47e..a4af748225c 100644 --- a/cinder/coordination.py +++ b/cinder/coordination.py @@ -21,7 +21,7 @@ import inspect import os import re import sys -from typing import Callable, Optional # noqa: H301 +from typing import Callable, Optional import uuid import decorator diff --git a/cinder/exception.py b/cinder/exception.py index d57842f5d6d..e971e1c7c02 100644 --- a/cinder/exception.py +++ b/cinder/exception.py @@ -22,7 +22,7 @@ SHOULD include dedicated exception logging. """ -from typing import Optional, Union # noqa: H301 +from typing import Optional, Union from oslo_log import log as logging from oslo_versionedobjects import exception as obj_exc diff --git a/cinder/flow_utils.py b/cinder/flow_utils.py index 9ba8b486f48..1dd78bb891d 100644 --- a/cinder/flow_utils.py +++ b/cinder/flow_utils.py @@ -13,7 +13,7 @@ from __future__ import annotations import os -from typing import Any, Optional # noqa: H301 +from typing import Any, Optional from oslo_log import log as logging # For more information please visit: https://wiki.openstack.org/wiki/TaskFlow diff --git a/cinder/image/glance.py b/cinder/image/glance.py index cf32516f0ca..181d99fa97f 100644 --- a/cinder/image/glance.py +++ b/cinder/image/glance.py @@ -25,7 +25,7 @@ import shutil import sys import textwrap import time -from typing import (Any, Callable, Iterable, NoReturn, Optional) # noqa: H301 +from typing import (Any, Callable, Iterable, NoReturn, Optional) import urllib import urllib.parse diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py index ea2ce62264d..a3c1eaf2e96 100644 --- a/cinder/image/image_utils.py +++ b/cinder/image/image_utils.py @@ -32,7 +32,7 @@ import math import os import re import tempfile -from typing import ContextManager, Generator, Optional # noqa: H301 +from typing import ContextManager, Generator, Optional import cryptography from cursive import exception as cursive_exception diff --git a/cinder/policy.py b/cinder/policy.py index f7c106a9e0a..185bb9def69 100644 --- a/cinder/policy.py +++ b/cinder/policy.py @@ -17,7 +17,7 @@ import sys import typing -from typing import Optional, Type # noqa: H301 +from typing import Optional, Type from oslo_config import cfg from oslo_log import log as logging diff --git a/cinder/scheduler/base_weight.py b/cinder/scheduler/base_weight.py index 7ae44c2eec5..44e7f7f94b6 100644 --- a/cinder/scheduler/base_weight.py +++ b/cinder/scheduler/base_weight.py @@ -20,7 +20,7 @@ Pluggable Weighing support from __future__ import annotations import abc -from typing import Iterable, Optional # noqa: H301 +from typing import Iterable, Optional from oslo_log import log as logging diff --git a/cinder/scheduler/filter_scheduler.py b/cinder/scheduler/filter_scheduler.py index 59f513769ed..d938a3ea00f 100644 --- a/cinder/scheduler/filter_scheduler.py +++ b/cinder/scheduler/filter_scheduler.py @@ -22,7 +22,7 @@ Weighing Functions. from __future__ import annotations -from typing import (Optional, Union) # noqa: H301 +from typing import (Optional, Union) from oslo_config import cfg from oslo_log import log as logging diff --git a/cinder/scheduler/flows/create_volume.py b/cinder/scheduler/flows/create_volume.py index a9f967a69b7..3ff7a3af83a 100644 --- a/cinder/scheduler/flows/create_volume.py +++ b/cinder/scheduler/flows/create_volume.py @@ -12,7 +12,7 @@ from __future__ import annotations # Remove when only supporting python 3.9+ -from typing import Any, Optional # noqa: H301 +from typing import Any, Optional from oslo_log import log as logging from oslo_utils import excutils diff --git a/cinder/scheduler/host_manager.py b/cinder/scheduler/host_manager.py index c4155d03440..a71f4708dee 100644 --- a/cinder/scheduler/host_manager.py +++ b/cinder/scheduler/host_manager.py @@ -20,7 +20,7 @@ from __future__ import annotations from collections import abc import random import typing -from typing import (Any, Iterable, Optional, Type, Union) # noqa: H301 +from typing import (Any, Iterable, Optional, Type, Union) from oslo_config import cfg from oslo_log import log as logging diff --git a/cinder/utils.py b/cinder/utils.py index 9958c5a7fe7..823bd22c81c 100644 --- a/cinder/utils.py +++ b/cinder/utils.py @@ -44,8 +44,8 @@ import stat import sys import tempfile import typing -from typing import Callable, Iterable, Iterator # noqa: H301 -from typing import Optional, Type, Union # noqa: H301 +from typing import Callable, Iterable, Iterator +from typing import Optional, Type, Union import eventlet from eventlet import tpool diff --git a/cinder/volume/api.py b/cinder/volume/api.py index ccf58523c4c..ef6646364ca 100644 --- a/cinder/volume/api.py +++ b/cinder/volume/api.py @@ -21,7 +21,7 @@ from __future__ import annotations import ast import collections import datetime -from typing import (Any, DefaultDict, Iterable, Optional, Union) # noqa: H301 +from typing import (Any, DefaultDict, Iterable, Optional, Union) from castellan import key_manager from oslo_config import cfg diff --git a/cinder/volume/drivers/rbd.py b/cinder/volume/drivers/rbd.py index 0b3ccb9f044..18eed8d1893 100644 --- a/cinder/volume/drivers/rbd.py +++ b/cinder/volume/drivers/rbd.py @@ -23,7 +23,7 @@ import math import os import tempfile import typing -from typing import Any, Optional, Union # noqa: H301 +from typing import Any, Optional, Union import urllib.parse from castellan import key_manager diff --git a/cinder/volume/drivers/remotefs.py b/cinder/volume/drivers/remotefs.py index 11a2fb97deb..2e55fcea3fd 100644 --- a/cinder/volume/drivers/remotefs.py +++ b/cinder/volume/drivers/remotefs.py @@ -27,7 +27,7 @@ import string import tempfile import time import typing -from typing import Callable, List, Optional, Tuple, Union # noqa: H301 +from typing import Callable, List, Optional, Tuple, Union from castellan import key_manager from os_brick.remotefs import remotefs as remotefs_brick diff --git a/cinder/volume/flows/api/create_volume.py b/cinder/volume/flows/api/create_volume.py index 4dbf38a8e5c..d97987d515f 100644 --- a/cinder/volume/flows/api/create_volume.py +++ b/cinder/volume/flows/api/create_volume.py @@ -13,7 +13,7 @@ from __future__ import annotations # Remove when only supporting python 3.9+ -from typing import Any, Optional, Type, Union # noqa: H301 +from typing import Any, Optional, Type, Union from oslo_config import cfg from oslo_log import log as logging diff --git a/cinder/volume/flows/manager/create_volume.py b/cinder/volume/flows/manager/create_volume.py index ac09ed898a3..757a4b87357 100644 --- a/cinder/volume/flows/manager/create_volume.py +++ b/cinder/volume/flows/manager/create_volume.py @@ -15,7 +15,7 @@ from __future__ import annotations import binascii import traceback import typing -from typing import Any, Optional # noqa: H301 +from typing import Any, Optional from castellan import key_manager import os_brick.initiator.connectors diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py index 104291563d0..83c0956a4db 100644 --- a/cinder/volume/manager.py +++ b/cinder/volume/manager.py @@ -40,7 +40,7 @@ from __future__ import annotations # Remove when only supporting Python 3.9+ import functools import time import typing -from typing import Any, Optional, Union # noqa: H301 +from typing import Any, Optional, Union from castellan import key_manager from oslo_config import cfg diff --git a/cinder/volume/rpcapi.py b/cinder/volume/rpcapi.py index 097dc16acdb..4db5b559277 100644 --- a/cinder/volume/rpcapi.py +++ b/cinder/volume/rpcapi.py @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import Optional, Union # noqa: H301 +from typing import Optional, Union from cinder.common import constants from cinder import context diff --git a/cinder/volume/volume_types.py b/cinder/volume/volume_types.py index 41495b03332..a5da0ef05e4 100644 --- a/cinder/volume/volume_types.py +++ b/cinder/volume/volume_types.py @@ -21,7 +21,7 @@ from __future__ import annotations -from typing import Any, Iterable, Optional, Union # noqa: H301 +from typing import Any, Iterable, Optional, Union from oslo_config import cfg from oslo_db import exception as db_exc diff --git a/cinder/volume/volume_utils.py b/cinder/volume/volume_utils.py index 831b137b9a1..04e548e793e 100644 --- a/cinder/volume/volume_utils.py +++ b/cinder/volume/volume_utils.py @@ -33,8 +33,8 @@ import tempfile import time import types import typing -from typing import Any, BinaryIO, Callable, IO # noqa: H301 -from typing import Optional, Union # noqa: H301 +from typing import Any, BinaryIO, Callable, IO +from typing import Optional, Union import uuid from castellan.common.credentials import keystone_password diff --git a/tox.ini b/tox.ini index 5c91bbd0a79..32498db2442 100644 --- a/tox.ini +++ b/tox.ini @@ -285,3 +285,6 @@ deps = -r{toxinidir}/requirements.txt ruff commands = ruff {toxinidir}/cinder {posargs} + +[hacking] +import_exceptions = typing