Merge "Remove six"

Author: Zuul

HACKING.rst

@@ -14,7 +14,6 @@ Cloudkitty Specific Commandments
 - [C312] Use assertTrue(...) rather than assertEqual(True, ...).
 - [C313] Validate that logs are not translated.
 - [C314] str() and unicode() cannot be used on an exception.
-  Remove or use six.text_type().
 - [C315] Translated messages cannot be concatenated.  String should be
   included in translated message.
 - [C317] `oslo_` should be used instead of `oslo.`

cloudkitty/api/v1/controllers/collector.py

@@ -16,7 +16,6 @@
 from oslo_log import log as logging
 import pecan
 from pecan import rest
-import six
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
@@ -47,7 +46,7 @@ def get_one(self, service):
             return collector_models.ServiceToCollectorMapping(
                 **mapping.as_dict())
         except db_api.NoSuchMapping as e:
-            pecan.abort(404, six.text_type(e))
+            pecan.abort(404, e.args[0])
 
     @wsme_pecan.wsexpose(collector_models.ServiceToCollectorMappingCollection,
                          wtypes.text)
@@ -94,7 +93,7 @@ def delete(self, service):
         try:
             self._db.delete_mapping(service)
         except db_api.NoSuchMapping as e:
-            pecan.abort(404, six.text_type(e))
+            pecan.abort(404, e.args[0])
 
 
 class CollectorStateController(rest.RestController):

cloudkitty/api/v1/controllers/info.py

@@ -17,7 +17,6 @@
 from oslo_log import log as logging
 import pecan
 from pecan import rest
-import six
 import voluptuous
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
@@ -70,7 +69,7 @@ def get_one_metric(metric_name):
     policy.authorize(pecan.request.context, 'info:get_metric_info', {})
     metric = _find_metric(metric_name, metrics_conf)
     if not metric:
-        pecan.abort(404, six.text_type(metric_name))
+        pecan.abort(404, str(metric_name))
     info = metric.copy()
     info['metric_id'] = info['alt_name']
     return info_models.CloudkittyMetricInfo(**info)

cloudkitty/backend/__init__.py

@@ -15,11 +15,8 @@
 #
 import abc
 
-import six
 
-
-@six.add_metaclass(abc.ABCMeta)
-class BaseIOBackend(object):
+class BaseIOBackend(object, metaclass=abc.ABCMeta):
     def __init__(self, path):
         self.open(path)
 

cloudkitty/collector/__init__.py

@@ -18,7 +18,6 @@
 
 from oslo_config import cfg
 from oslo_log import log as logging
-import six
 from stevedore import driver
 from voluptuous import All
 from voluptuous import Any
@@ -153,8 +152,7 @@ def __init__(self, collector, resource):
         self.resource = resource
 
 
-@six.add_metaclass(abc.ABCMeta)
-class BaseCollector(object):
+class BaseCollector(object, metaclass=abc.ABCMeta):
     collector_name = None
 
     def __init__(self, **kwargs):

cloudkitty/collector/gnocchi.py

@@ -16,8 +16,6 @@
 from datetime import timedelta
 import requests
 
-import six
-
 from gnocchiclient import auth as gauth
 from gnocchiclient import client as gclient
 from gnocchiclient import exceptions as gexceptions
@@ -93,7 +91,7 @@
     BASIC_AGGREGATION_METHODS.add("rate:%s" % agg)
 
 EXTRA_AGGREGATION_METHODS_FOR_ARCHIVE_POLICY = set(
-    (str(i) + 'pct' for i in six.moves.range(1, 100)))
+    (str(i) + 'pct' for i in range(1, 100)))
 
 for agg in list(EXTRA_AGGREGATION_METHODS_FOR_ARCHIVE_POLICY):
     EXTRA_AGGREGATION_METHODS_FOR_ARCHIVE_POLICY.add("rate:%s" % agg)
@@ -321,7 +319,7 @@ def _fetch_metric(self, metric_name, start, end,
             # FIXME(peschk_l): gnocchiclient seems to be raising a BadRequest
             # when it should be raising MetricNotFound
             if isinstance(e, gexceptions.BadRequest):
-                if 'Metrics not found' not in six.text_type(e):
+                if 'Metrics not found' not in e.args[0]:
                     raise
             LOG.warning('[{scope}] Skipping this metric for the '
                         'current cycle.'.format(scope=project_id, err=e))

cloudkitty/common/policy.py

@@ -23,7 +23,6 @@
 from oslo_policy import opts as policy_opts
 from oslo_policy import policy
 from oslo_utils import excutils
-import six
 
 from cloudkitty.common import policies
 
@@ -53,7 +52,7 @@ def __init__(self, **kwargs):
         super(PolicyNotAuthorized, self).__init__(self.msg)
 
     def __unicode__(self):
-        return six.text_type(self.msg)
+        return str(self.msg)
 
 
 def reset():

cloudkitty/db/api.py

@@ -17,7 +17,6 @@
 
 from oslo_config import cfg
 from oslo_db import api as db_api
-import six
 
 _BACKEND_MAPPING = {'sqlalchemy': 'cloudkitty.db.sqlalchemy.api'}
 IMPL = db_api.DBAPI.from_config(cfg.CONF,
@@ -30,8 +29,7 @@ def get_instance():
     return IMPL
 
 
-@six.add_metaclass(abc.ABCMeta)
-class State(object):
+class State(object, metaclass=abc.ABCMeta):
     """Base class for state tracking."""
 
     @abc.abstractmethod
@@ -68,8 +66,7 @@ def set_metadata(self, name, metadata):
         """
 
 
-@six.add_metaclass(abc.ABCMeta)
-class ModuleInfo(object):
+class ModuleInfo(object, metaclass=abc.ABCMeta):
     """Base class for module info management."""
 
     @abc.abstractmethod
@@ -114,8 +111,7 @@ def __init__(self, service):
         self.service = service
 
 
-@six.add_metaclass(abc.ABCMeta)
-class ServiceToCollectorMapping(object):
+class ServiceToCollectorMapping(object, metaclass=abc.ABCMeta):
     """Base class for service to collector mapping."""
 
     @abc.abstractmethod

cloudkitty/fetcher/__init__.py

@@ -14,7 +14,6 @@
 #    under the License.
 #
 import abc
-import six
 
 from oslo_config import cfg
 
@@ -27,8 +26,7 @@
 cfg.CONF.register_opts(fetcher_opts, 'fetcher')
 
 
-@six.add_metaclass(abc.ABCMeta)
-class BaseFetcher(object):
+class BaseFetcher(object, metaclass=abc.ABCMeta):
     """CloudKitty tenants fetcher.
 
     Provides Cloudkitty integration with a backend announcing ratable scopes.

cloudkitty/hacking/checks.py

@@ -17,7 +17,6 @@
 import re
 
 from hacking import core
-import six
 
 
 """
@@ -150,7 +149,7 @@ def _find_name(self, node):
             if obj_name is None:
                 return None
             return obj_name + '.' + method_name
-        elif isinstance(node, six.string_types):
+        elif isinstance(node, str):
             return node
         else:  # could be Subscript, Call or many more
             return None
@@ -221,7 +220,7 @@ class CheckForStrUnicodeExc(BaseASTChecker):
     version = "1.0"
 
     CHECK_DESC = ('C314 str() and unicode() cannot be used on an '
-                  'exception.  Remove or use six.text_type()')
+                  'exception.  Remove it.')
 
     def __init__(self, tree, filename):
         super(CheckForStrUnicodeExc, self).__init__(tree, filename)