Unittest passed on Python 3.5

.gitignore

@@ -6,3 +6,7 @@
 *.pyc
 .coverage
 _build
+.project
+.pydevproject
+python/
+.settings/

spamc/backend_eventlet.py

@@ -4,8 +4,8 @@
 # pylint: disable=unused-import,invalid-name,no-member
 # from eventlet.green import select
 from eventlet import sleep
-from eventlet.green import socket
+from eventlet.green.socket import socket
 
-Socket = socket.socket
+Socket = socket
 # Select = select.select
 assert sleep

spamc/client.py

@@ -21,7 +21,6 @@
 """
 import os
 import errno
-import types
 import socket
 
 from zlib import compress
@@ -36,10 +35,12 @@
 
 PROTOCOL_VERSION = 'SPAMC/1.5'
 
+from io import UnsupportedOperation
+
 
 def _check_action(action):
     """check for invalid actions"""
-    if isinstance(action, types.StringTypes):
+    if isinstance(action, str):
         action = action.lower()
 
     if action not in ['learn', 'forget', 'report', 'revoke']:
@@ -67,6 +68,8 @@ def get_response(cmd, conn):
         resp_dict['didremove'] = False
 
     data = resp.read()
+    if isinstance(data, bytes):
+        data = data.decode()
     lines = data.split('\r\n')
     for index, line in enumerate(lines):
         if index == 0:
@@ -192,7 +195,11 @@ def perform(self, cmd, msg='', extra_headers=None):
             try:
                 conn = self.get_connection()
                 if hasattr(msg, 'read') and hasattr(msg, 'fileno'):
-                    msg_length = str(os.fstat(msg.fileno()).st_size)
+                    try:
+                        msg_length = str(os.fstat(msg.fileno()).st_size)
+                    except UnsupportedOperation:
+                        msg.seek(0, 2)
+                        msg_length = str(msg.tell() + 2)
                 elif hasattr(msg, 'read'):
                     msg.seek(0, 2)
                     msg_length = str(msg.tell() + 2)
@@ -209,7 +216,7 @@ def perform(self, cmd, msg='', extra_headers=None):
 
                 headers = self.get_headers(cmd, msg_length, extra_headers)
 
-                if isinstance(msg, types.StringTypes):
+                if isinstance(msg, str):
                     if self.gzip and msg:
                         msg = compress(msg + '\r\n', self.compress_level)
                     else:
@@ -224,7 +231,7 @@ def perform(self, cmd, msg='', extra_headers=None):
                 conn.send('\r\n')
                 try:
                     conn.socket().shutdown(socket.SHUT_WR)
-                except socket.error:
+                except socket.error as er:
                     pass
                 return get_response(cmd, conn)
             except socket.gaierror as err:
@@ -240,7 +247,7 @@ def perform(self, cmd, msg='', extra_headers=None):
                     conn.close()
                 errors = (errno.EAGAIN, errno.EPIPE, errno.EBADF,
                           errno.ECONNRESET)
-                if err[0] not in errors or tries >= self.max_tries:
+                if err not in errors or tries >= self.max_tries:
                     raise SpamCError("socket.error: %s" % str(err))
             except BaseException:
                 if conn is not None:
@@ -313,7 +320,7 @@ def tell(self, msg, action, learnas=''):
 
     def learn(self, msg, learnas):
         """Learn message as spam/ham or forget"""
-        if not isinstance(learnas, types.StringTypes):
+        if not isinstance(learnas, str):
             raise SpamCError('The learnas option is invalid')
         if learnas.lower() == 'forget':
             resp = self.tell(msg, 'forget')

spamc/conn.py

@@ -71,6 +71,8 @@ def invalidate(self):
         self._connected = False
 
     def send(self, data):
+        if isinstance(data, str):
+            return self._s.sendall(data.encode())
         "send data"
         return self._s.sendall(data)
 

tests/_s.py

@@ -20,14 +20,17 @@
 
 Copyright 2015, Andrew Colin Kissa
 Licensed under AGPLv3+
+
+Python3.5 update by Łukasz A. Grabowski
 """
 import os
 import socket
 
-from mimetools import Message
-from cStringIO import StringIO
-from SocketServer import StreamRequestHandler, ThreadingTCPServer, \
-    ThreadingUnixStreamServer
+from email.message import Message
+from email import message_from_binary_file, message_from_file
+from io import StringIO #old from cStringIO
+from socketserver import StreamRequestHandler, ThreadingTCPServer, \
+    ThreadingUnixStreamServer #old from SocketServer
 
 
 ThreadingTCPServer.allow_reuse_address = True
@@ -63,45 +66,49 @@ class TestSpamdHandler(StreamRequestHandler):
 
     def do_PING(self):
         """Emulate PING"""
-        self.wfile.write("SPAMD/1.5 0 PONG\r\n")
+        self.wfile.write("SPAMD/1.5 0 PONG\r\n".encode())
 
     def do_TELL(self):
         """Emulate TELL"""
-        self.wfile.write("SPAMD/1.5 0 EX_OK\r\n")
+        self.wfile.write("SPAMD/1.5 0 EX_OK\r\n".encode())
         didset = self.headers.get('Set')
         if didset:
-            self.wfile.write("DidSet: True\r\n")
+            self.wfile.write("DidSet: True\r\n".encode())
         didremove = self.headers.get('Remove')
         if didremove:
-            self.wfile.write("DidRemove: True\r\n")
-        self.wfile.write("\r\n\r\n")
+            self.wfile.write("DidRemove: True\r\n".encode())
+        self.wfile.write("\r\n\r\n".encode())
         self.close_connection = 1
 
     def do_HEADERS(self):
         """Emulate HEADERS"""
         content_length = int(self.headers.get('Content-length', 0))
         body = self.rfile.read(content_length)
+        if isinstance(body, bytes):
+            body = body.decode()
         parts, = body.split('\r\n\r\n')
-        _headers = self.MessageClass(StringIO(parts))
-        self.wfile.write("SPAMD/1.5 0 EX_OK\r\n")
-        self.wfile.write("Spam: True ; 15 / 5\r\n")
+        _headers = message_from_file(StringIO(parts))
+        self.wfile.write("SPAMD/1.5 0 EX_OK\r\n".encode())
+        self.wfile.write("Spam: True ; 15 / 5\r\n".encode())
         if self.request_version >= (1, 3):
-            self.wfile.write("Content-length: %d\r\n" % len(_headers))
-        self.wfile.write("\r\n\r\n")
-        self.wfile.write(_headers)
+            self.wfile.write(("Content-length: %d\r\n" % len(_headers)).encode())
+        self.wfile.write("\r\n\r\n".encode())
+        self.wfile.write(str(_headers).encode())
         self.close_connection = 1
 
     def do_PROCESS(self):
         """Emulate PROCESS"""
         content_length = int(self.headers.get('Content-length', 0))
         body = self.rfile.read(content_length)
-        self.wfile.write("SPAMD/1.5 0 EX_OK\r\n")
-        self.wfile.write("Spam: True ; 15 / 5\r\n")
+        if isinstance(body, bytes):
+            body = body.decode()
+        self.wfile.write("SPAMD/1.5 0 EX_OK\r\n".encode())
+        self.wfile.write("Spam: True ; 15 / 5\r\n".encode())
         if self.request_version >= (1, 3):
-            self.wfile.write(
-                "Content-length: %d\r\n" % content_length)
-        self.wfile.write("\r\n\r\n")
-        self.wfile.write(body)
+            self.wfile.write((
+                "Content-length: %d\r\n" % content_length).encode())
+        self.wfile.write("\r\n\r\n".encode())
+        self.wfile.write(body.encode())
         self.close_connection = 1
 
     def do_REPORT_IFSPAM(self):
@@ -110,45 +117,45 @@ def do_REPORT_IFSPAM(self):
 
     def do_REPORT(self):
         """Emulate REPORT"""
-        self.wfile.write("SPAMD/1.5 0 EX_OK\r\n")
-        self.wfile.write("Spam: True ; 15 / 5\r\n")
+        self.wfile.write("SPAMD/1.5 0 EX_OK\r\n".encode())
+        self.wfile.write("Spam: True ; 15 / 5\r\n".encode())
         if self.request_version >= (1, 3):
-            self.wfile.write(
-                "Content-length: %d\r\n" % len(REPORT_TMPL))
-        self.wfile.write("\r\n\r\n")
-        self.wfile.write(REPORT_TMPL)
+            self.wfile.write((
+                "Content-length: %d\r\n" % len(REPORT_TMPL)).encode())
+        self.wfile.write("\r\n\r\n".encode())
+        self.wfile.write(REPORT_TMPL.encode())
         self.close_connection = 1
 
     def do_SYMBOLS(self):
         """Emulate SYMBOLS"""
         rules = "BAYES_00,RDNS_NONE,KAM_LAZY_DOMAIN_SECURITY"
-        self.wfile.write("SPAMD/1.5 0 EX_OK\r\n")
-        self.wfile.write("Spam: True ; 15 / 5\r\n")
+        self.wfile.write("SPAMD/1.5 0 EX_OK\r\n".encode())
+        self.wfile.write("Spam: True ; 15 / 5\r\n".encode())
         if self.request_version >= (1, 3):
-            self.wfile.write("Content-length: %d\r\n" % len(rules))
-        self.wfile.write("\r\n\r\n")
-        self.wfile.write(rules)
+            self.wfile.write(("Content-length: %d\r\n" % len(rules)).encode())
+        self.wfile.write("\r\n\r\n".encode())
+        self.wfile.write(rules.encode())
         if self.request_version < (1, 3):
-            self.wfile.write("\r\n")
+            self.wfile.write("\r\n".encode())
         self.close_connection = 1
 
     def do_CHECK(self):
         """Emulate CHECK"""
-        self.wfile.write("SPAMD/1.5 0 EX_OK\r\n")
-        self.wfile.write("Spam: True ; 15 / 5\r\n")
-        self.wfile.write("\r\n\r\n")
+        self.wfile.write("SPAMD/1.5 0 EX_OK\r\n".encode())
+        self.wfile.write("Spam: True ; 15 / 5\r\n".encode())
+        self.wfile.write("\r\n\r\n".encode())
         self.close_connection = 1
 
     def send_error(self, msg):
         """Send Error response"""
-        self.wfile.write("SPAMD/1.0 EX_PROTOCOL Bad header line: %s\r\n" % msg)
+        self.wfile.write(("SPAMD/1.0 EX_PROTOCOL Bad header line: %s\r\n" % msg).encode())
 
     def parse_request(self):
         """Parse the request"""
         self.command = None
         self.request_version = version = self.default_request_version
         self.close_connection = 1
-        requestline = self.raw_requestline
+        requestline = self.raw_requestline.decode()
         requestline = requestline.rstrip('\r\n')
         self.requestline = requestline
         words = requestline.split()
@@ -177,8 +184,8 @@ def parse_request(self):
         else:
             self.send_error("Bad request syntax (%r)" % requestline)
             return False
-        self.command, self.request_version = command, version
-        self.headers = self.MessageClass(self.rfile, 0)
+        self.command, self.request_version = command, version_number
+        self.headers = message_from_binary_file(self.rfile)
         return True
 
     def handle_one_request(self):

tests/test_spamc_load_backend.py

@@ -1,15 +1,10 @@
 import os
 import sys
 import threading
-try:
-    import unittest2
-except ImportError:
-    if sys.version_info < (2, 7):
-        raise
-    import unittest as unittest2
+import unittest as unittest2
 
 from spamc import SpamC
-from spamc import backend_eventlet
+from spamc import backend_thread
 from spamc.exceptions import SpamCError
 
 from _s import return_tcp
@@ -35,14 +30,15 @@ def setUpClass(cls):
             port=int(os.environ.get('SPAMD_PORT', 10030)),
             gzip=gzip,
             compress_level=int(os.environ.get('SPAMD_COMPRESS_LEVEL', 6)),
-            backend=backend_eventlet)
+            backend=backend_thread)
         path = os.path.dirname(os.path.dirname(__file__))
         cls.filename = os.path.join(path, 'examples', 'sample-spam.txt')
 
     @classmethod
     def tearDownClass(cls):
         if hasattr(cls, 'tcp_server'):
             cls.tcp_server.shutdown()
+            cls.tcp_server.server_close()
 
     def test_spamc_tcp_no_conn(self):
         spamc_tcp = SpamC(host='127.0.0.1', port=10001)
@@ -53,5 +49,6 @@ def test_spamc_tcp_ping(self):
         self.assertIn('message', result)
         self.assertEqual('PONG', result['message'])
 
+
 if __name__ == '__main__':
     unittest2.main()

tests/test_spamc_mock.py

@@ -1,12 +1,7 @@
 import sys
 import socket
 import threading
-try:
-    import unittest2
-except ImportError:
-    if sys.version_info < (2, 7):
-        raise
-    import unittest as unittest2
+import unittest as unittest2
 
 import mock
 

tests/test_spamc_stringio.py

@@ -1,15 +1,10 @@
 import os
 import sys
 import threading
-try:
-    import unittest2
-except ImportError:
-    if sys.version_info < (2, 7):
-        raise
-    import unittest as unittest2
-
-from mimetools import Message
-from cStringIO import StringIO
+import unittest as unittest2
+
+from email.message import Message
+from io import StringIO
 
 from spamc import SpamC
 from spamc.exceptions import SpamCError

tests/test_spamc_tcp.py

@@ -1,15 +1,10 @@
 import os
 import sys
 import threading
-try:
-    import unittest2
-except ImportError:
-    if sys.version_info < (2, 7):
-        raise
-    import unittest as unittest2
-
-from mimetools import Message
-from cStringIO import StringIO
+import unittest as unittest2
+
+from email.message import Message
+from io import StringIO
 
 from spamc import SpamC
 from spamc.exceptions import SpamCError

tests/test_spamc_tcp_eventlet.py

@@ -1,15 +1,10 @@
 import os
 import sys
 import threading
-try:
-    import unittest2
-except ImportError:
-    if sys.version_info < (2, 7):
-        raise
-    import unittest as unittest2
+import unittest as unittest2
 
-from mimetools import Message
-from cStringIO import StringIO
+from email.message import Message
+from io import StringIO
 
 from spamc import SpamC
 from spamc.exceptions import SpamCError
@@ -45,6 +40,7 @@ def setUpClass(cls):
     def tearDownClass(cls):
         if hasattr(cls, 'tcp_server'):
             cls.tcp_server.shutdown()
+            cls.tcp_server.server_close()
 
     def test_spamc_tcp_no_conn(self):
         spamc_tcp = SpamC(host='127.0.0.1', port=10001)