From 9a38c0ce17fa24a42838060a12f7d4e92e1254e3 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 12 Jun 2025 22:40:28 +0900
Subject: [PATCH] Fix flake8 caused by top level imports

---
 tests/echo.py                  | 13 ++++++++++---
 tests/echo_client.py           | 11 +++++++----
 tests/load.py                  | 14 ++++++++++++--
 websockify/sysloghandler.py    |  5 ++++-
 websockify/websocketproxy.py   | 19 +++++++++++++++----
 websockify/websockifyserver.py | 11 +++++++++--
 6 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/tests/echo.py b/tests/echo.py
index addce6a..710fbff 100755
--- a/tests/echo.py
+++ b/tests/echo.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-
+# flake8: noqa: E402
 '''
 A WebSocket server that echos back whatever it receives from the client.
 Copyright 2010 Joel Martin
@@ -10,9 +10,16 @@ openssl req -new -x509 -days 365 -nodes -out self.pem -keyout self.pem
 as taken from http://docs.python.org/dev/library/ssl.html#certificates
 '''
 
-import os, sys, select, optparse, logging
+import logging
+import optparse
+import os
+import select
+import sys
+
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
-from websockify.websockifyserver import WebSockifyServer, WebSockifyRequestHandler
+
+from websockify.websockifyserver import WebSockifyServer
+from websockify.websockifyserver import WebSockifyRequestHandler
 
 
 class WebSocketEcho(WebSockifyRequestHandler):
diff --git a/tests/echo_client.py b/tests/echo_client.py
index ce0c0d2..dbc799d 100755
--- a/tests/echo_client.py
+++ b/tests/echo_client.py
@@ -1,13 +1,16 @@
 #!/usr/bin/env python
+# flake8: noqa: E402
 
-import os
-import sys
 import optparse
+import os
 import select
+import sys
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
-from websockify.websocket import WebSocket, \
-    WebSocketWantReadError, WebSocketWantWriteError
+
+from websockify.websocket import WebSocket
+from websockify.websocket import WebSocketWantReadError
+from websockify.websocket import WebSocketWantWriteError
 
 parser = optparse.OptionParser(usage="%prog URL")
 (opts, args) = parser.parse_args()
diff --git a/tests/load.py b/tests/load.py
index 27d1000..8f0fc79 100755
--- a/tests/load.py
+++ b/tests/load.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# flake8: noqa: E402
 
 '''
 WebSocket server-side load test program. Sends and receives traffic
@@ -6,9 +7,18 @@ that has a random payload (length and content) that is checksummed and
 given a sequence number. Any errors are reported and counted.
 '''
 
-import sys, os, select, random, time, optparse, logging
+import logging
+import optparse
+import os
+import random
+import select
+import sys
+import time
+
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
-from websockify.websockifyserver import WebSockifyServer, WebSockifyRequestHandler
+
+from websockify.websockifyserver import WebSockifyRequestHandler
+from websockify.websockifyserver import WebSockifyServer
 
 
 class WebSocketLoadServer(WebSockifyServer):
diff --git a/websockify/sysloghandler.py b/websockify/sysloghandler.py
index eb8da6d..14e4f03 100644
--- a/websockify/sysloghandler.py
+++ b/websockify/sysloghandler.py
@@ -1,4 +1,7 @@
-import logging.handlers as handlers, socket, os, time
+import logging.handlers as handlers
+import os
+import socket
+import time
 
 
 class WebsockifySysLogHandler(handlers.SysLogHandler):
diff --git a/websockify/websocketproxy.py b/websockify/websocketproxy.py
index 1dc0481..40658b5 100644
--- a/websockify/websocketproxy.py
+++ b/websockify/websocketproxy.py
@@ -11,14 +11,25 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates
 
 '''
 
-import signal, socket, optparse, time, os, sys, subprocess, logging, errno, ssl, stat
-from socketserver import ThreadingMixIn
+import errno
 from http.server import HTTPServer
-
+import logging
+import optparse
+import os
 import select
+import signal
+import socket
+from socketserver import ThreadingMixIn
+import ssl
+import stat
+import subprocess
+import sys
+import time
+from urllib.parse import parse_qs
+from urllib.parse import urlparse
+
 from websockify import websockifyserver
 from websockify import auth_plugins as auth
-from urllib.parse import parse_qs, urlparse
 
 
 class ProxyRequestHandler(websockifyserver.WebSockifyRequestHandler):
diff --git a/websockify/websockifyserver.py b/websockify/websockifyserver.py
index fffc3be..975d011 100644
--- a/websockify/websockifyserver.py
+++ b/websockify/websockifyserver.py
@@ -12,9 +12,16 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates
 
 '''
 
-import os, sys, time, errno, signal, socket, select, logging
-import multiprocessing
+import errno
 from http.server import SimpleHTTPRequestHandler
+import logging
+import multiprocessing
+import os
+import select
+import signal
+import socket
+import sys
+import time
 
 # Degraded functionality if these imports are missing
 try: