From: Volker Theile Date: Mon, 4 Mar 2019 16:20:32 +0000 (+0100) Subject: mgr/dashboard: Cleanup Python code X-Git-Tag: v14.1.1~30^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c7ee45666f2ecaafa6bb42d7c4d27a93dd2514a;p=ceph.git mgr/dashboard: Cleanup Python code Signed-off-by: Volker Theile --- diff --git a/src/pybind/mgr/dashboard/controllers/__init__.py b/src/pybind/mgr/dashboard/controllers/__init__.py index af79f8ac2aba..28f5998e876c 100644 --- a/src/pybind/mgr/dashboard/controllers/__init__.py +++ b/src/pybind/mgr/dashboard/controllers/__init__.py @@ -9,7 +9,6 @@ import json import os import pkgutil import sys -from six import add_metaclass if sys.version_info >= (3, 0): from urllib.parse import unquote # pylint: disable=no-name-in-module,import-error diff --git a/src/pybind/mgr/dashboard/controllers/iscsi.py b/src/pybind/mgr/dashboard/controllers/iscsi.py index b57b1d809efe..4568355d4236 100644 --- a/src/pybind/mgr/dashboard/controllers/iscsi.py +++ b/src/pybind/mgr/dashboard/controllers/iscsi.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # pylint: disable=too-many-branches - from __future__ import absolute_import from copy import deepcopy diff --git a/src/pybind/mgr/dashboard/controllers/pool.py b/src/pybind/mgr/dashboard/controllers/pool.py index b20e19842f17..5732674b01a2 100644 --- a/src/pybind/mgr/dashboard/controllers/pool.py +++ b/src/pybind/mgr/dashboard/controllers/pool.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import - import cherrypy from . import ApiController, RESTController, Endpoint, ReadPermission, Task diff --git a/src/pybind/mgr/dashboard/controllers/settings.py b/src/pybind/mgr/dashboard/controllers/settings.py index 2f2ec3e902ee..a484580ee1c1 100644 --- a/src/pybind/mgr/dashboard/controllers/settings.py +++ b/src/pybind/mgr/dashboard/controllers/settings.py @@ -4,7 +4,6 @@ from contextlib import contextmanager import cherrypy - from . import ApiController, RESTController from ..settings import Settings as SettingsModule, Options from ..security import Scope diff --git a/src/pybind/mgr/dashboard/controllers/summary.py b/src/pybind/mgr/dashboard/controllers/summary.py index 2571b281cfd2..0b2d51e52747 100644 --- a/src/pybind/mgr/dashboard/controllers/summary.py +++ b/src/pybind/mgr/dashboard/controllers/summary.py @@ -3,7 +3,6 @@ from __future__ import absolute_import import json - from . import ApiController, Endpoint, BaseController from .. import mgr from ..security import Permission, Scope diff --git a/src/pybind/mgr/dashboard/plugins/lru_cache.py b/src/pybind/mgr/dashboard/plugins/lru_cache.py index 82ec0c74983f..19ad1b85062d 100644 --- a/src/pybind/mgr/dashboard/plugins/lru_cache.py +++ b/src/pybind/mgr/dashboard/plugins/lru_cache.py @@ -4,7 +4,6 @@ This is a minimal implementation of lru_cache function. Based on Python 3 functools and backports.functools_lru_cache. """ - from __future__ import absolute_import from functools import wraps diff --git a/src/pybind/mgr/dashboard/plugins/ttl_cache.py b/src/pybind/mgr/dashboard/plugins/ttl_cache.py index 8a7715b10b52..a0698542b43a 100644 --- a/src/pybind/mgr/dashboard/plugins/ttl_cache.py +++ b/src/pybind/mgr/dashboard/plugins/ttl_cache.py @@ -3,7 +3,6 @@ This is a minimal implementation of TTL-ed lru_cache function. Based on Python 3 functools and backports.functools_lru_cache. """ - from __future__ import absolute_import from functools import wraps