Merge pull request #110 from ncmiller/master

Handle None inputs same as empty string (Issue #94)

fuzzywuzzy/utils.py

@@ -18,10 +18,8 @@ def validate_string(s):
 def check_for_none(func):
     @functools.wraps(func)
     def decorator(*args, **kwargs):
-        if args[0] is None:
-            raise TypeError("s1 is None")
-        if args[1] is None:
-            raise TypeError("s2 is None")
+        if args[0] is None or args[1] is None:
+            return 0
         return func(*args, **kwargs)
     return decorator
 

test_fuzzywuzzy.py

@@ -277,13 +277,11 @@ def testCheckForNone(self):
         ]
         decorated_func = utils.check_for_none(self.testFunc)
         for i in invalid_input:
-            self.assertRaises(TypeError, decorated_func, *i)
+            self.assertEqual(decorated_func(*i), 0)
 
-        try:
-            valid_input = ['Some', 'Some']
-            decorated_func(*valid_input)
-        except ValueError as e:
-            self.fail('check_for_none matched non-None input', valid_input, e)
+        valid_input = ('Some', 'Some')
+        actual = decorated_func(*valid_input)
+        self.assertNotEqual(actual, 0)
 
     def testCheckEmptyString(self):
         invalid_input = [