polishing

Author: chillaq

splitio/client/config.py

@@ -180,26 +180,28 @@ def sanitize(sdk_key, config):
     return processed
 
 def _sanitize_fallback_config(config, processed):
-    if config.get('fallbackTreatments') is not None:
-        if not isinstance(config['fallbackTreatments'], FallbackTreatmentsConfiguration):
-            _LOGGER.warning('Config: fallbackTreatments parameter should be of `FallbackTreatmentsConfiguration` class.')
-            processed['fallbackTreatments'] = None
-            return processed        
-        
-        sanitized_global_fallback_treatment = config['fallbackTreatments'].global_fallback_treatment
-        if config['fallbackTreatments'].global_fallback_treatment is not None and not validate_fallback_treatment(config['fallbackTreatments'].global_fallback_treatment):
-            _LOGGER.warning('Config: global fallbacktreatment parameter is discarded.')
-            sanitized_global_fallback_treatment = None
-        
-        sanitized_flag_fallback_treatments = {}
-        if config['fallbackTreatments'].by_flag_fallback_treatment is not None:
-            for feature_name in config['fallbackTreatments'].by_flag_fallback_treatment.keys():
-                if not validate_regex_name(feature_name) or not validate_fallback_treatment(config['fallbackTreatments'].by_flag_fallback_treatment[feature_name]):
-                    _LOGGER.warning('Config: fallback treatment parameter for feature flag %s is discarded.', feature_name)
-                    continue
-                                
-                sanitized_flag_fallback_treatments[feature_name] = config['fallbackTreatments'].by_flag_fallback_treatment[feature_name]
-
-        processed['fallbackTreatments'] = FallbackTreatmentsConfiguration(sanitized_global_fallback_treatment, sanitized_flag_fallback_treatments)
+    if config.get('fallbackTreatments') is None:
+        return processed
+    
+    if not isinstance(config['fallbackTreatments'], FallbackTreatmentsConfiguration):
+        _LOGGER.warning('Config: fallbackTreatments parameter should be of `FallbackTreatmentsConfiguration` class.')
+        processed['fallbackTreatments'] = None
+        return processed        
+    
+    sanitized_global_fallback_treatment = config['fallbackTreatments'].global_fallback_treatment
+    if config['fallbackTreatments'].global_fallback_treatment is not None and not validate_fallback_treatment(config['fallbackTreatments'].global_fallback_treatment):
+        _LOGGER.warning('Config: global fallbacktreatment parameter is discarded.')
+        sanitized_global_fallback_treatment = None
+    
+    sanitized_flag_fallback_treatments = {}
+    if config['fallbackTreatments'].by_flag_fallback_treatment is not None:
+        for feature_name in config['fallbackTreatments'].by_flag_fallback_treatment.keys():
+            if not validate_regex_name(feature_name) or not validate_fallback_treatment(config['fallbackTreatments'].by_flag_fallback_treatment[feature_name]):
+                _LOGGER.warning('Config: fallback treatment parameter for feature flag %s is discarded.', feature_name)
+                continue
+                            
+            sanitized_flag_fallback_treatments[feature_name] = config['fallbackTreatments'].by_flag_fallback_treatment[feature_name]
+
+    processed['fallbackTreatments'] = FallbackTreatmentsConfiguration(sanitized_global_fallback_treatment, sanitized_flag_fallback_treatments)
 
     return processed

splitio/engine/evaluator.py

@@ -64,7 +64,7 @@ def eval_with_context(self, key, bucketing, feature_name, attrs, ctx):
             else:
                 label, _treatment = self._check_prerequisites(feature, bucketing, key, attrs, ctx, label, _treatment)
                 label, _treatment = self._get_treatment(feature, bucketing, key, attrs, ctx, label, _treatment)
-            config = feature.get_configurations_for(_treatment) if feature else None
+            config = feature.get_configurations_for(_treatment)
 
         return {
             'treatment': _treatment,