Merge branch 'master' of https://tonyandrewmeyer@github.com/SpamExper…

…ts/pyzor.git
SpamExperts · Feb 19, 2016 · 5c88c38 · 5c88c38
2 parents fb6c34c + f16e1b6
commit 5c88c38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/tests/functional/test_pyzor.py b/tests/functional/test_pyzor.py
@@ -1,3 +1,4 @@
+import io
 import sys
 import redis
 import unittest
@@ -128,7 +129,7 @@ def test_mbox_style(self):
         self.assertEqual(r["WL-Count"], "1")
 
     def test_mbox_real(self):
-        with open(MBOX_FILE_PATH) as mbox_file:
+        with io.open(MBOX_FILE_PATH, 'rt', encoding='latin-1') as mbox_file:
             input = mbox_file.read()
             self.client_args["-s"] = "mbox"
             self.check_pyzor("pong", None, input=input, code=200, exit_code=0,

diff --git a/tests/util/__init__.py b/tests/util/__init__.py
@@ -173,7 +173,7 @@ def check_pyzor(self, cmd, user, input=None,
                                  stdout=subprocess.PIPE,
                                  stderr=subprocess.PIPE)
         if input:
-            stdout, stderr = pyzor.communicate(input)
+            stdout, stderr = pyzor.communicate(input.encode("utf8"))
         else:
             stdout, stderr = pyzor.communicate()