fix tests

.github/workflows/test.yml

@@ -14,6 +14,7 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

test.py

@@ -68,10 +68,10 @@ def test_pop_server(self):
         try:
             sock.connect(("localhost", SpamCanPOPTest.server_port))
             received = sock.recv(1024)
-            sock.sendall("QUIT foobar" + "\n")
+            sock.sendall(b'QUIT foobar\n')
         finally:
             sock.close()
-        self.assert_(received == "+OK SpamCan test server ready" + "\r\n")
+        self.assert_(received == b'+OK SpamCan test server ready\r\n')
 
     def test_pop_client(self):
         account_config = {

testing/pop_server.py

@@ -1,6 +1,6 @@
 ## Based on http://code.activestate.com/recipes/534131/
 
-import SocketServer
+import socketserver
 
 
 class Message(object):
@@ -64,15 +64,15 @@ def handleQuit(data, msg):
 )
 
 
-class TCPHandler(SocketServer.BaseRequestHandler):
+class TCPHandler(socketserver.BaseRequestHandler):
     def handle(self):
-        self.request.sendall("+OK SpamCan test server ready\r\n")
+        self.request.sendall(b'+OK SpamCan test server ready\r\n')
         while True:
             self.data = self.request.recv(1024).strip()
             if self.data:
-                command = self.data.split(" ", 1)[0]
+                command = self.data.decode().split(" ", 1)[0]
                 cmd = dispatch[command]
-                self.request.sendall(cmd(self.data, Message()) + "\r\n")
+                self.request.sendall(bytes(cmd(self.data, Message()), 'utf-8') + b'\r\n')
                 if command == "QUIT":
                     break
             else:
@@ -83,7 +83,7 @@ def pop_server(port=0):
     """
     Returns a new instance of SocketServer.TCPServer. If port == 0 a ephemeral port will be assigned.
     """
-    return SocketServer.TCPServer(("localhost", port), TCPHandler)
+    return socketserver.TCPServer(("localhost", port), TCPHandler)
 
 
 if __name__ == "__main__":