Review changes

optimizely · Aug 17, 2018 · 28b9a78 · 28b9a78
1 parent 487b66c
commit 28b9a78
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/optimizely/helpers/validator.py b/optimizely/helpers/validator.py
@@ -13,8 +13,8 @@
 
 import json
 import jsonschema
-
 from six import string_types
+
 from optimizely.user_profile import UserProfile
 from . import constants
 
@@ -163,7 +163,7 @@ def is_non_empty_string(input_id_key):
   Returns:
     Boolean depending upon whether input is valid or not.
   """
-  if isinstance(input_id_key, string_types) and input_id_key:
+  if input_id_key and isinstance(input_id_key, string_types):
     return True
 
   return False
diff --git a/tests/helpers_tests/test_validator.py b/tests/helpers_tests/test_validator.py
@@ -141,10 +141,10 @@ def test_is_non_empty_string(self):
     self.assertFalse(validator.is_non_empty_string(1.2))
     self.assertFalse(validator.is_non_empty_string(True))
     self.assertFalse(validator.is_non_empty_string(False))
-    self.assertFalse(validator.is_non_empty_string(""))
+    self.assertFalse(validator.is_non_empty_string(''))
 
-    self.assertTrue(validator.is_non_empty_string("0"))
-    self.assertTrue(validator.is_non_empty_string("test_user"))
+    self.assertTrue(validator.is_non_empty_string('0'))
+    self.assertTrue(validator.is_non_empty_string('test_user'))
 
 
 class DatafileValidationTests(base.BaseTest):