From df0fd4958f19c34c3ade602a6f6e84d09c6122fe Mon Sep 17 00:00:00 2001 From: Adrian Czarnecki Date: Sun, 22 Nov 2020 21:14:02 +0100 Subject: [PATCH] Remove six Change-Id: I898c97fda4e1e93c64c6b75fbfea5af80ffd684a Story: 2008305 Task: 41274 --- lower-constraints.txt | 1 - monasca_persister/kafka/confluent_kafka_persister.py | 4 +--- monasca_persister/kafka/legacy_kafka_persister.py | 4 +--- monasca_persister/repositories/abstract_repository.py | 4 +--- .../repositories/cassandra/abstract_repository.py | 4 +--- .../repositories/influxdb/abstract_repository.py | 4 +--- monasca_persister/repositories/persister.py | 5 +---- monasca_persister/tests/test_influxdb_metrics_repository.py | 3 +-- requirements.txt | 1 - 9 files changed, 7 insertions(+), 23 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 374c2137..3c75890d 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -50,7 +50,6 @@ requests==2.14.2 requestsexceptions==1.2.0 rfc3986==0.3.1 simplejson==3.8.1 -six==1.10.0 smmap==0.9.0 Sphinx==2.0.0 stestr==1.0.0 diff --git a/monasca_persister/kafka/confluent_kafka_persister.py b/monasca_persister/kafka/confluent_kafka_persister.py index a9c5202a..0d017fa6 100644 --- a/monasca_persister/kafka/confluent_kafka_persister.py +++ b/monasca_persister/kafka/confluent_kafka_persister.py @@ -10,14 +10,12 @@ # License for the specific language governing permissions and limitations # under the License. from monasca_common.kafka import client_factory -import six from monasca_persister.repositories import persister from monasca_persister.repositories import singleton -@six.add_metaclass(singleton.Singleton) -class ConfluentKafkaPersister(persister.Persister): +class ConfluentKafkaPersister(persister.Persister, metaclass=singleton.Singleton): def __init__(self, kafka_conf, repository, client_id=""): super(ConfluentKafkaPersister, self).__init__(kafka_conf, repository) diff --git a/monasca_persister/kafka/legacy_kafka_persister.py b/monasca_persister/kafka/legacy_kafka_persister.py index 8289127d..e6e4847b 100644 --- a/monasca_persister/kafka/legacy_kafka_persister.py +++ b/monasca_persister/kafka/legacy_kafka_persister.py @@ -10,14 +10,12 @@ # License for the specific language governing permissions and limitations # under the License. from monasca_common.kafka import client_factory -import six from monasca_persister.repositories import persister from monasca_persister.repositories import singleton -@six.add_metaclass(singleton.Singleton) -class LegacyKafkaPersister(persister.Persister): +class LegacyKafkaPersister(persister.Persister, metaclass=singleton.Singleton): def __init__(self, kafka_conf, zookeeper_conf, repository): super(LegacyKafkaPersister, self).__init__(kafka_conf, repository) diff --git a/monasca_persister/repositories/abstract_repository.py b/monasca_persister/repositories/abstract_repository.py index 6e9301cd..a9fce999 100644 --- a/monasca_persister/repositories/abstract_repository.py +++ b/monasca_persister/repositories/abstract_repository.py @@ -13,11 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import abc -import six -@six.add_metaclass(abc.ABCMeta) -class AbstractRepository(object): +class AbstractRepository(object, metaclass=abc.ABCMeta): def __init__(self): super(AbstractRepository, self).__init__() diff --git a/monasca_persister/repositories/cassandra/abstract_repository.py b/monasca_persister/repositories/cassandra/abstract_repository.py index 4f1bd347..0a8db5a6 100644 --- a/monasca_persister/repositories/cassandra/abstract_repository.py +++ b/monasca_persister/repositories/cassandra/abstract_repository.py @@ -16,7 +16,6 @@ import abc from oslo_config import cfg -import six from monasca_persister.repositories import abstract_repository from monasca_persister.repositories.cassandra import connection_util @@ -25,8 +24,7 @@ from monasca_persister.repositories import data_points conf = cfg.CONF -@six.add_metaclass(abc.ABCMeta) -class AbstractCassandraRepository(abstract_repository.AbstractRepository): +class AbstractCassandraRepository(abstract_repository.AbstractRepository, metaclass=abc.ABCMeta): def __init__(self): super(AbstractCassandraRepository, self).__init__() diff --git a/monasca_persister/repositories/influxdb/abstract_repository.py b/monasca_persister/repositories/influxdb/abstract_repository.py index 90aace7e..34e40570 100644 --- a/monasca_persister/repositories/influxdb/abstract_repository.py +++ b/monasca_persister/repositories/influxdb/abstract_repository.py @@ -15,7 +15,6 @@ import abc import influxdb from oslo_config import cfg -import six from monasca_persister.repositories import abstract_repository from monasca_persister.repositories import data_points @@ -23,8 +22,7 @@ from monasca_persister.repositories import data_points DATABASE_NOT_FOUND_MSG = "database not found" -@six.add_metaclass(abc.ABCMeta) -class AbstractInfluxdbRepository(abstract_repository.AbstractRepository): +class AbstractInfluxdbRepository(abstract_repository.AbstractRepository, metaclass=abc.ABCMeta): def __init__(self): super(AbstractInfluxdbRepository, self).__init__() diff --git a/monasca_persister/repositories/persister.py b/monasca_persister/repositories/persister.py index 9762b695..075af4ad 100644 --- a/monasca_persister/repositories/persister.py +++ b/monasca_persister/repositories/persister.py @@ -13,20 +13,17 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. -from abc import ABCMeta import os from oslo_config import cfg from oslo_log import log -import six from monasca_persister.repositories import singleton LOG = log.getLogger(__name__) -@six.add_metaclass(singleton.Singleton) -class Persister(six.with_metaclass(ABCMeta, object)): +class Persister(object, metaclass=singleton.Singleton): def __init__(self, kafka_conf, repository): diff --git a/monasca_persister/tests/test_influxdb_metrics_repository.py b/monasca_persister/tests/test_influxdb_metrics_repository.py index ada0ee82..ac442beb 100644 --- a/monasca_persister/tests/test_influxdb_metrics_repository.py +++ b/monasca_persister/tests/test_influxdb_metrics_repository.py @@ -19,7 +19,6 @@ import influxdb from influxdb.exceptions import InfluxDBClientError from oslotest import base from oslo_config import cfg -import six from monasca_persister.repositories.influxdb.metrics_repository import MetricInfluxdbRepository @@ -37,7 +36,7 @@ class TestMetricInfluxdbRepository(base.BaseTestCase): def _test_process_message(self, metrics_repo, data_points, metric, tenant): _dp, _tenant = metrics_repo.process_message(metric) - self.assertIsInstance(_dp, six.string_types) + self.assertIsInstance(_dp, str) self.assertEqual(_tenant, tenant) data_points.append(_tenant, _dp) diff --git a/requirements.txt b/requirements.txt index bbc6e546..0d443e71 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,6 @@ oslo.config>=5.2.0 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 -six>=1.10.0 # MIT monasca-common>=2.16.0 # Apache-2.0 cassandra-driver>=3.21.0 simplejson>=3.8.1