Refs #40 - Moved "replace null" up to normalize function. Also fixed …

…unit test.
SpamExperts · Jan 14, 2016 · 4006638 · 4006638
1 parent 4cba2a9
commit 4006638
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pyzor/digest.py b/pyzor/digest.py
@@ -118,6 +118,7 @@ def handle_line(self, line):
 
     @classmethod
     def normalize(cls, s):
+        s = s.replace("\x00", "")
         repl = cls.unwanted_txt_repl
         s = cls.longstr_ptrn.sub(repl, s)
         s = cls.email_ptrn.sub(repl, s)
@@ -157,8 +158,6 @@ def digest_payloads(cls, msg):
                     errors = "strict"
 
                 try:
-                    if "\00" in payload:
-                        payload = payload.replace("\x00", "")
                     payload = payload.decode(charset, errors)
                 except (LookupError, UnicodeError, AssertionError):
                     try:

diff --git a/tests/unit/test_digest.py b/tests/unit/test_digest.py
@@ -190,7 +190,7 @@ def test_digest(self):
         self.assertEqual(result, expected)
 
     def test_digest_w_null(self):
-        message = b"That's some good ham rig ht there"
+        message = b"That's some good ham rig\x00ht there"
         predigested = b"That'ssomegoodhamrightthere"
 
         digest = hashlib.sha1()