Upgrade to isort 5 (#4323)

This now also reformats imports not at the top of files.

stdlib/2and3/_dummy_threading.pyi

@@ -155,7 +155,7 @@ class Event:
     def wait(self, timeout: Optional[float] = ...) -> bool: ...
 
 if sys.version_info >= (3, 8):
-    from _thread import _ExceptHookArgs as ExceptHookArgs, ExceptHookArgs as _ExceptHookArgs  # don't ask
+    from _thread import ExceptHookArgs as _ExceptHookArgs, _ExceptHookArgs as ExceptHookArgs  # don't ask
 
     excepthook: Callable[[_ExceptHookArgs], Any]
 

stdlib/2and3/logging/handlers.pyi

@@ -7,7 +7,7 @@ from socket import SocketType
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union, overload
 
 if sys.version_info >= (3, 7):
-    from queue import SimpleQueue, Queue
+    from queue import Queue, SimpleQueue
 elif sys.version_info >= (3,):
     from queue import Queue
 else:

stdlib/2and3/threading.pyi

@@ -155,7 +155,7 @@ class Event:
     def wait(self, timeout: Optional[float] = ...) -> bool: ...
 
 if sys.version_info >= (3, 8):
-    from _thread import _ExceptHookArgs as ExceptHookArgs, ExceptHookArgs as _ExceptHookArgs  # don't ask
+    from _thread import ExceptHookArgs as _ExceptHookArgs, _ExceptHookArgs as ExceptHookArgs  # don't ask
 
     excepthook: Callable[[_ExceptHookArgs], Any]
 

stdlib/2and3/wsgiref/simple_server.pyi

@@ -7,7 +7,7 @@ from .types import ErrorStream, StartResponse, WSGIApplication, WSGIEnvironment
 if sys.version_info < (3,):
     from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
 else:
-    from http.server import HTTPServer, BaseHTTPRequestHandler
+    from http.server import BaseHTTPRequestHandler, HTTPServer
 
 server_version: str  # undocumented
 sys_version: str  # undocumented