finish Python 2 -> 3 migration, remove dependecy on Six

gnocchiclient/benchmark.py

@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import argparse
+import copyreg
 import datetime
 import functools
 import itertools
@@ -27,8 +28,6 @@
 
 import iso8601
 
-import six.moves
-
 from gnocchiclient import utils
 from gnocchiclient.v1 import metric_cli
 
@@ -43,7 +42,7 @@ def _pickle_method(m):
  return getattr, (m.im_self, m.im_func.func_name)
 
 
-six.moves.copyreg.pickle(types.MethodType, _pickle_method)
+copyreg.pickle(types.MethodType, _pickle_method)
 
 
 def _positive_non_zero_int(argument_value):
@@ -60,7 +59,7 @@ def _positive_non_zero_int(argument_value):
  return value
 
 
-class StopWatch(object):
+class StopWatch:
  def __init__(self):
  self.started_at = time.monotonic()
 
@@ -79,7 +78,7 @@ def submit_job(self, times, fn, *args, **kwargs):
  self.sw = StopWatch()
  self.times = times
  return [self.submit(measure_job, fn, *args, **kwargs)
- for i in six.moves.range(times)]
+ for i in range(times)]
 
  def map_job(self, fn, iterable, **kwargs):
  r = []
@@ -283,13 +282,13 @@ def take_action(self, parsed_args):
  "for the number of points")
 
  random_values = (random.randint(- 2 ** 32, 2 ** 32)
- for _ in six.moves.range(count))
+ for _ in range(count))
  measures = [{"timestamp": ts, "value": v}
  for ts, v
- in six.moves.zip(
- six.moves.range(start,
-  end,
-  (end - start) // count),
+ in zip(
+ range(start,
+ end,
+ (end - start) // count),
  random_values)]
 
  times = parsed_args.count // parsed_args.batch

gnocchiclient/exceptions.py

@@ -13,8 +13,6 @@
 
 import re
 
-import six
-
 
 class ClientException(Exception):
  """The base exception class for all exceptions this library raises."""
@@ -250,7 +248,7 @@ def from_response(response, method=None):
  if 'description' in body:
  # Gnocchi json
  desc = body.get('description')
- if desc and isinstance(desc, six.text_type):
+ if desc and isinstance(desc, str):
  for enhanced_cls in enhanced_classes:
  if enhanced_cls.match.match(desc):
  cls = enhanced_cls

gnocchiclient/gendoc.py

@@ -12,8 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from __future__ import absolute_import
-
 import fnmatch
 
 from cliff import sphinxext

gnocchiclient/tests/functional/base.py

@@ -16,8 +16,6 @@
 import time
 import unittest
 
-import six
-
 
 class ClientTestBase(unittest.TestCase):
  """Base class for gnocchiclient tests.
@@ -57,8 +55,6 @@ def _run(self, binary, action, flags='', params='',
 
  cmd = ' '.join([os.path.join(self.cli_dir, binary),
  flags, action, params, fmt])
- if six.PY2:
- cmd = cmd.encode('utf-8')
  cmd = shlex.split(cmd)
  result = ''
  result_err = ''
@@ -73,8 +69,6 @@ def _run(self, binary, action, flags='', params='',
  cmd,
  result,
  result_err)
- if not six.PY2:
- result = os.fsdecode(result)
 
  if not has_output and not fail_ok and action != 'help':
  self.assertEqual("", result)

gnocchiclient/utils.py

@@ -11,13 +11,11 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+import urllib.parse
 from dateutil import tz
 
 import iso8601
 
-import six
-from six.moves.urllib import parse as urllib_parse
-
 
 def add_query_argument(cmd, parser, *args, **kwargs):
  return parser.add_argument(
@@ -104,8 +102,8 @@ def dict_to_querystring(objs):
  values = [values]
  strings.append("&".join(
  ("%s=%s" % (k, v)
- for v in map(urllib_parse.quote,
- map(six.text_type, values)))))
+ for v in map(urllib.parse.quote,
+ map(str, values)))))
  return "&".join(strings)
 
 

gnocchiclient/v1/base.py

@@ -13,10 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import six
 
-
-class Manager(object):
+class Manager:
  DEFAULT_HEADERS = {
  "Accept": "application/json",
  }
@@ -26,7 +24,7 @@ def __init__(self, client):
 
  def _set_default_headers(self, kwargs):
  headers = kwargs.get('headers', {})
- for k, v in six.iteritems(self.DEFAULT_HEADERS):
+ for k, v in self.DEFAULT_HEADERS.items():
  if k not in headers:
  headers[k] = v
  kwargs['headers'] = headers

gnocchiclient/v1/client.py

@@ -27,7 +27,7 @@
 from gnocchiclient.v1 import status
 
 
-class Client(object):
+class Client:
  """Client for the Gnocchi v1 API.
 
  :param session: keystoneauth1 session

setup.cfg

@@ -28,7 +28,6 @@ install_requires =
  cliff>=2.10 # Apache-2.0
  ujson
  keystoneauth1>=2.0.0
- six
  futurist
  iso8601
  python-dateutil