removed six

Author: Matias Melograno

setup.py

@@ -18,7 +18,6 @@
     'pyyaml>=5.1',
     'future>=0.15.2',
     'docopt>=0.6.2',
-    'six>=1.10.0',
     'enum34;python_version<"3.4"',
     'futures>=3.0.5;python_version<"3"'
 ]

splitio/api/telemetry.py

@@ -1,7 +1,6 @@
 """Telemetry API Module."""
 import logging
 
-import six
 from future.utils import raise_from
 
 from splitio.api import APIException, headers_from_metadata
@@ -39,7 +38,7 @@ def _build_latencies(latencies):
         """
         return [
             {'name': name, 'latencies': latencies_list}
-            for name, latencies_list in six.iteritems(latencies)
+            for name, latencies_list in latencies.items()
         ]
 
     def flush_latencies(self, latencies):
@@ -77,7 +76,7 @@ def _build_gauges(gauges):
         """
         return [
             {'name': name, 'value': value}
-            for name, value in six.iteritems(gauges)
+            for name, value in gauges.items()
         ]
 
     def flush_gauges(self, gauges):
@@ -115,7 +114,7 @@ def _build_counters(counters):
         """
         return [
             {'name': name, 'delta': value}
-            for name, value in six.iteritems(counters)
+            for name, value in counters.items()
         ]
 
     def flush_counters(self, counters):

splitio/client/client.py

@@ -4,7 +4,6 @@
 
 import logging
 import time
-import six
 from splitio.engine.evaluator import Evaluator, CONTROL
 from splitio.engine.splitters import Splitter
 from splitio.models.impressions import Impression, Label
@@ -309,7 +308,7 @@ def get_treatments(self, key, features, attributes=None):
         """
         with_config = self._make_evaluations(key, features, attributes, 'get_treatments',
                                              self._METRIC_GET_TREATMENTS)
-        return {feature: result[0] for (feature, result) in six.iteritems(with_config)}
+        return {feature: result[0] for (feature, result) in with_config.items()}
 
     def _build_impression(  # pylint: disable=too-many-arguments
             self,

splitio/client/input_validator.py

@@ -7,8 +7,6 @@
 import re
 import math
 
-import six
-
 from splitio.api import APIException
 from splitio.client.key import Key
 from splitio.engine.evaluator import CONTROL
@@ -53,7 +51,7 @@ def _check_is_string(value, name, operation):
     :return: The result of validation
     :rtype: True|False
     """
-    if isinstance(value, six.string_types) is False:
+    if isinstance(value, str) is False:
         _LOGGER.error(
             '%s: you passed an invalid %s, %s must be a non-empty string.',
             operation, name, name
@@ -121,7 +119,7 @@ def _check_can_convert(value, name, operation):
     :return: The result of validation
     :rtype: None|string
     """
-    if isinstance(value, six.string_types):
+    if isinstance(value, str):
         return value
     else:
         # check whether if isnan and isinf are really necessary
@@ -173,7 +171,7 @@ def _check_valid_object_key(key, name, operation):
             '%s: you passed a null %s, %s must be a non-empty string.',
             operation, name, name)
         return None
-    if isinstance(key, six.string_types):
+    if isinstance(key, str):
         if not _check_string_not_empty(key, name, operation):
             return None
     key_str = _check_can_convert(key, name, operation)
@@ -515,8 +513,8 @@ def valid_properties(properties):
 
     valid_properties = dict()
 
-    for property, element in six.iteritems(properties):
-        if not isinstance(property, six.string_types):  # Exclude property if is not string
+    for property, element in properties.items():
+        if not isinstance(property, str):  # Exclude property if is not string
             continue
 
         valid_properties[property] = None
@@ -525,14 +523,14 @@ def valid_properties(properties):
         if element is None:
             continue
 
-        if not isinstance(element, six.string_types) and not isinstance(element, Number) \
+        if not isinstance(element, str) and not isinstance(element, Number) \
            and not isinstance(element, bool):
             _LOGGER.warning('Property %s is of invalid type. Setting value to None', element)
             element = None
 
         valid_properties[property] = element
 
-        if isinstance(element, six.string_types):
+        if isinstance(element, str):
             size += len(element)
 
         if size > MAX_PROPERTIES_LENGTH_BYTES:

splitio/client/listener.py

@@ -2,7 +2,6 @@
 
 import abc
 
-from six import add_metaclass
 from future.utils import raise_from
 
 
@@ -56,8 +55,7 @@ def log_impression(self, impression, attributes=None):
                 exc
             )
 
-@add_metaclass(abc.ABCMeta)  #pylint: disable=too-few-public-methods
-class ImpressionListener(object):
+class ImpressionListener(object, metaclass=abc.ABCMeta):
     """Impression listener interface."""
 
     @abc.abstractmethod

splitio/engine/evaluator.py

@@ -1,6 +1,5 @@
 """Split evaluator module."""
 import logging
-import six
 from splitio.models.grammar.condition import ConditionType
 from splitio.models.impressions import Label
 
@@ -135,7 +134,7 @@ def evaluate_features(self, features, matching_key, bucketing_key, attributes=No
         return {
             feature: self._evaluate_treatment(feature, matching_key,
                                               bucketing_key, attributes, split)
-            for (feature, split) in six.iteritems(self._split_storage.fetch_many(features))
+            for (feature, split) in self._split_storage.fetch_many(features).items()
         }
 
     def _get_treatment_for_split(self, split, matching_key, bucketing_key, attributes=None):

splitio/engine/hashfns/murmur3py.py

@@ -3,9 +3,6 @@
 from __future__ import absolute_import, division, print_function, \
     unicode_literals
 
-from six.moves import range
-
-
 def murmur32_py(key, seed=0x0):
     """
     Pure python implementation of murmur32 hash.

splitio/engine/impressions.py

@@ -4,8 +4,6 @@
 from collections import defaultdict, namedtuple
 from enum import Enum
 
-import six
-
 from splitio.models.impressions import Impression
 from splitio.engine.hashfns import murmur_128
 from splitio.engine.cache.lru import SimpleLruCache
@@ -151,7 +149,7 @@ def pop_all(self):
             self._data = defaultdict(lambda: 0)
 
         return [Counter.CountPerFeature(k.feature, k.timeframe, v)
-                for (k, v) in six.iteritems(old)]
+                for (k, v) in old.items()]
 
 
 class Manager(object):  # pylint:disable=too-few-public-methods

splitio/models/grammar/condition.py

@@ -2,7 +2,6 @@
 
 from enum import Enum
 from future.utils import python_2_unicode_compatible
-import six
 
 from splitio.models.grammar import matchers
 from splitio.models.grammar import partitions
@@ -103,7 +102,7 @@ def to_json(self):
             'label': self._label,
             'matcherGroup': {
                 'combiner': next(
-                    (k, v) for k, v in six.iteritems(_MATCHER_COMBINERS) if v == self._combiner
+                    (k, v) for k, v in _MATCHER_COMBINERS.items() if v == self._combiner
                 )[0],
                 'matchers': [m.to_json() for m in self.matchers]
             },

splitio/models/grammar/matchers/base.py

@@ -1,13 +1,10 @@
 """Abstract matcher module."""
 import abc
 
-from six import add_metaclass
-
 from splitio.client.key import Key
 
 
-@add_metaclass(abc.ABCMeta)
-class Matcher(object):
+class Matcher(object, metaclass=abc.ABCMeta):
     """Matcher abstract class."""
 
     def __init__(self, raw_matcher):