refactor: Remove six.moves.https_cookies import.

zerver/tests/test_auth_backends.py

@@ -61,7 +61,7 @@ from social_core.backends.github import GithubOrganizationOAuth2, GithubTeamOAut
     GithubOAuth2
 
 import urllib
-from six.moves.http_cookies import SimpleCookie
+from http.cookies import SimpleCookie
 import ujson
 from zerver.lib.test_helpers import MockLDAP, load_subdomain_token
 

zerver/tests/test_tornado.py

@@ -34,7 +34,7 @@ from zerver.tornado.event_queue import fetch_events, \
     allocate_client_descriptor, process_event
 from zerver.tornado.views import get_events_backend
 
-from six.moves.http_cookies import SimpleCookie
+from http.cookies import SimpleCookie
 import urllib.parse
 
 from typing import Any, Callable, Dict, Generator, Optional, Text, List, cast
@@ -197,7 +197,7 @@ class TornadoTestCase(WebSocketBaseTestCase):
 
     @staticmethod
     def get_cookie_header(cookies):
-        # type: (Dict[Any, Any]) -> str
+        # type: (SimpleCookie) -> str
         return ';'.join(
             ["{}={}".format(name, value.value) for name, value in cookies.items()])
 

zerver/tornado/websocket_client.py

@@ -14,7 +14,7 @@ from tornado import gen
 from tornado.httpclient import HTTPRequest
 from tornado.websocket import websocket_connect, WebSocketClientConnection
 from urllib.parse import urlparse, urlunparse, urljoin
-from six.moves.http_cookies import SimpleCookie
+from http.cookies import SimpleCookie
 
 from zerver.models import get_system_bot