improvements on fetch_many functions

Author: Matias Melograno

splitio/client/client.py

@@ -194,17 +194,14 @@ def get_treatment(self, key, feature, attributes=None):
 
     def _evaluate_features_if_ready(self, matching_key, bucketing_key, features, attributes=None):
         if not self.ready:
-            evaluations = dict()
-            for feature in features:
-                evaluations[feature] = {
+            return {
+                feature: {
                     'treatment': CONTROL,
                     'configurations': None,
-                    'impression': {
-                        'label': Label.NOT_READY,
-                        'change_number': None
-                    }
+                    'impression': {'label': Label.NOT_READY, 'change_number': None}
                 }
-            return evaluations
+                for feature in features
+            }
 
         return self._evaluator.evaluate_features(
             features,

splitio/client/util.py

@@ -17,7 +17,7 @@ def _get_ip():
         # doesn't even have to be reachable
         sock.connect(('10.255.255.255', 1))
         ip_address = sock.getsockname()[0]
-    except Exception:  #pylint: disable=broad-except
+    except Exception:  # pylint: disable=broad-except
         ip_address = 'unknown'
     finally:
         sock.close()
@@ -61,7 +61,7 @@ def get_calls(classes_filter=None):
             inspect.getframeinfo(frame[0]).function
             for frame in inspect.stack()
             if classes_filter is None
-            or 'self' in frame[0].f_locals and frame[0].f_locals['self'].__class__.__name__ in classes_filter  #pylint: disable=line-too-long
+            or 'self' in frame[0].f_locals and frame[0].f_locals['self'].__class__.__name__ in classes_filter  # pylint: disable=line-too-long
         ]
-    except Exception:  #pylint: disable=broad-except
+    except Exception:  # pylint: disable=broad-except
         return []

splitio/engine/evaluator.py

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

splitio/storage/inmemmory.py

@@ -46,11 +46,7 @@ def fetch_many(self, split_names):
         :return: A dict with split objects parsed from queue.
         :rtype: dict(split_name, splitio.models.splits.Split)
         """
-        to_return = dict()
-        with self._lock:
-            for split_name in split_names:
-                to_return[split_name] = self.get(split_name)
-        return to_return
+        return {split_name: self.get(split_name) for split_name in split_names}
 
     def put(self, split):
         """

splitio/storage/redis.py

@@ -30,14 +30,8 @@ def __init__(self, redis_client, enable_caching=False, max_age=DEFAULT_MAX_AGE):
         self._redis = redis_client
         if enable_caching:
             self.get = add_cache(lambda *p, **_: p[0], max_age)(self.get)
-            self.is_valid_traffic_type = add_cache(
-                lambda *p, **_: p[0],
-                max_age
-                )(self.is_valid_traffic_type)  # pylint: disable=line-too-long
-            self.fetch_many = add_cache(
-                lambda *p, **_: frozenset(p[0]),
-                max_age
-            )(self.fetch_many)
+            self.is_valid_traffic_type = add_cache(lambda *p, **_: p[0], max_age)(self.is_valid_traffic_type)  # pylint: disable=line-too-long
+            self.fetch_many = add_cache(lambda *p, **_: frozenset(p[0]), max_age)(self.fetch_many)
 
     def _get_key(self, split_name):
         """

splitio/storage/uwsgi.py

@@ -63,10 +63,7 @@ def fetch_many(self, split_names):
         :return: A dict with split objects parsed from queue.
         :rtype: dict(split_name, splitio.models.splits.Split)
         """
-        to_return = dict()
-        for split_name in split_names:
-            to_return[split_name] = self.get(split_name)
-        return to_return
+        return {split_name: self.get(split_name) for split_name in split_names}
 
     def put(self, split):
         """