Backport to Python 2

Author: rayluo

oauth2cli/authcode.py

@@ -104,7 +104,7 @@ def log_message(self, format, *args):
         logger.debug(format, *args)  # To override the default log-to-stderr behavior
 
 
-class _AuthCodeHttpServer(HTTPServer):
+class _AuthCodeHttpServer(HTTPServer, object):
     def __init__(self, server_address, *args, **kwargs):
         _, port = server_address
         if port and (sys.platform == "win32" or is_wsl()):

tests/test_authcode.py

@@ -1,4 +1,6 @@
 import unittest
+import socket
+import sys
 
 from oauth2cli.authcode import AuthCodeReceiver
 
@@ -17,7 +19,8 @@ def test_setup_at_a_ephemeral_port_and_teardown(self):
     def test_no_two_concurrent_receivers_can_listen_on_same_port(self):
         port = 12345  # Assuming this port is available
         with AuthCodeReceiver(port=port) as receiver:
-            with self.assertRaises(OSError):
+            expected_error = OSError if sys.version_info[0] > 2 else socket.error
+            with self.assertRaises(expected_error):
                 with AuthCodeReceiver(port=port) as receiver2:
                     pass