Removed compat.py and constants.py

back-to · Dec 23, 2020 · a5afb9a · a5afb9a
1 parent b7ed21f
commit a5afb9a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 119 deletions.
diff --git a/liveproxy/argparser.py b/liveproxy/argparser.py
@@ -9,7 +9,6 @@
 )
 
 from liveproxy import __version__ as liveproxy_version
-from liveproxy.constants import FILE_OUTPUT_LIST
 
 _ip_address_re = re.compile(r'^((\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])\.){3}(\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])$')
 
@@ -20,6 +19,7 @@ def ip_address(value):
         raise ValueError
 
     return match.group(0)
+FILE_OUTPUT_LIST = ['.m3u', '.m3u8', '.new', '.txt']
 
 
 def file_output_list(value):

diff --git a/liveproxy/compat.py b/liveproxy/compat.py
diff --git a/liveproxy/constants.py b/liveproxy/constants.py
diff --git a/liveproxy/main.py b/liveproxy/main.py
@@ -14,7 +14,6 @@
 
 from liveproxy import __version__ as liveproxy_version
 from liveproxy.argparser import parser
-from liveproxy.constants import FILE_OUTPUT_LIST
 from liveproxy.server import (
     HTTPRequest,
     ThreadedHTTPServer,

diff --git a/liveproxy/server.py b/liveproxy/server.py
@@ -24,11 +24,9 @@
 from streamlink.stream.ffmpegmux import MuxedStream
 from streamlink_cli.argparser import build_parser
 
-from liveproxy.compat import (
-    BaseHTTPRequestHandler, HTTPServer, ThreadingMixIn,
-    is_py2, parse_qsl, unquote, urlparse
-)
-from liveproxy.constants import CONFIG_FILES, PLUGINS_DIR, STREAM_SYNONYMS
+from http.server import BaseHTTPRequestHandler, HTTPServer
+from socketserver import ThreadingMixIn
+from urllib.parse import parse_qsl, unquote, urlparse
 
 ACCEPTABLE_ERRNO = (
     errno.ECONNABORTED,
@@ -576,7 +574,4 @@ class ThreadedHTTPServer(ThreadingMixIn, Server):
     daemon_threads = True
 
 
-__all__ = [
-    'HTTPRequest',
-    'ThreadedHTTPServer',
-]
+__all__ = ('HTTPRequest', 'ThreadedHTTPServer')