diff --git a/SABnzbd.py b/SABnzbd.py index 72e6c3a..a62ac8a 100755 --- a/SABnzbd.py +++ b/SABnzbd.py @@ -94,7 +94,6 @@ from sabnzbd.filesystem import get_ext, real_path, long_path, globber_full, remo from sabnzbd.panic import panic_tmpl, panic_port, panic_host, panic, launch_a_browser import sabnzbd.config as config import sabnzbd.cfg -import sabnzbd.downloader import sabnzbd.notifier as notifier import sabnzbd.zconfig from sabnzbd.getipaddress import localipv4, publicipv4, ipv6 @@ -108,11 +107,10 @@ try: import win32event import win32service import win32ts - import pywintypes import servicemanager from win32com.shell import shell, shellcon - from sabnzbd.utils.apireg import get_connection_info, set_connection_info, del_connection_info + from sabnzbd.utils.apireg import get_connection_info, set_connection_info import sabnzbd.sabtray win32api.SetConsoleCtrlHandler(sabnzbd.sig_handler, True) diff --git a/sabnzbd/__init__.py b/sabnzbd/__init__.py index 2cfa565..eecd1f4 100644 --- a/sabnzbd/__init__.py +++ b/sabnzbd/__init__.py @@ -121,10 +121,6 @@ from sabnzbd.constants import ( DEFAULT_PRIORITY, VALID_ARCHIVES, REPAIR_REQUEST, - QUEUE_FILE_NAME, - QUEUE_VERSION, - QUEUE_FILE_TMPL, - Status, ) import sabnzbd.utils.ssdp diff --git a/sabnzbd/api.py b/sabnzbd/api.py index 1abb1d7..70fd09a 100644 --- a/sabnzbd/api.py +++ b/sabnzbd/api.py @@ -67,7 +67,6 @@ from sabnzbd.getipaddress import localipv4, publicipv4, ipv6, addresslookup from sabnzbd.database import build_history_info, unpack_history_info, HistoryDB from sabnzbd.lang import is_rtl import sabnzbd.notifier -import sabnzbd.rss import sabnzbd.emailer import sabnzbd.sorting diff --git a/sabnzbd/assembler.py b/sabnzbd/assembler.py index 2299b10..64b1190 100644 --- a/sabnzbd/assembler.py +++ b/sabnzbd/assembler.py @@ -40,7 +40,6 @@ from sabnzbd.filesystem import ( from sabnzbd.constants import Status, GIGI, MAX_ASSEMBLER_QUEUE import sabnzbd.cfg as cfg from sabnzbd.nzbstuff import NzbObject, NzbFile -import sabnzbd.downloader import sabnzbd.par2file as par2file import sabnzbd.utils.rarfile as rarfile diff --git a/sabnzbd/interface.py b/sabnzbd/interface.py index 4630a63..3a12183 100644 --- a/sabnzbd/interface.py +++ b/sabnzbd/interface.py @@ -24,7 +24,6 @@ import time from datetime import datetime import cherrypy import logging -import urllib.request, urllib.parse, urllib.error import re import hashlib import socket diff --git a/sabnzbd/notifier.py b/sabnzbd/notifier.py index cf25b7d..8c070d6 100644 --- a/sabnzbd/notifier.py +++ b/sabnzbd/notifier.py @@ -23,7 +23,8 @@ sabnzbd.notifier - Send notifications to any notification services import os.path import logging -import urllib.request, urllib.error, urllib.parse +import urllib.request +import urllib.parse import http.client import json from threading import Thread diff --git a/sabnzbd/osxmenu.py b/sabnzbd/osxmenu.py index 20d8165..0360587 100644 --- a/sabnzbd/osxmenu.py +++ b/sabnzbd/osxmenu.py @@ -38,7 +38,6 @@ from sabnzbd.panic import launch_a_browser from sabnzbd.api import fast_queue import sabnzbd.config as config -import sabnzbd.downloader status_icons = { "idle": "icons/sabnzbd_osx_idle.tiff", diff --git a/sabnzbd/postproc.py b/sabnzbd/postproc.py index d8d8ff5..aa17b95 100644 --- a/sabnzbd/postproc.py +++ b/sabnzbd/postproc.py @@ -78,10 +78,8 @@ from sabnzbd.constants import ( ) from sabnzbd.nzbparser import process_single_nzb import sabnzbd.emailer as emailer -import sabnzbd.downloader import sabnzbd.config as config import sabnzbd.cfg as cfg -import sabnzbd.nzbqueue import sabnzbd.database as database import sabnzbd.notifier as notifier import sabnzbd.utils.rarfile as rarfile diff --git a/sabnzbd/scheduler.py b/sabnzbd/scheduler.py index 055ed7a..c5a19a2 100644 --- a/sabnzbd/scheduler.py +++ b/sabnzbd/scheduler.py @@ -25,9 +25,7 @@ import time from typing import Optional import sabnzbd.utils.kronos as kronos -import sabnzbd.rss import sabnzbd.downloader -import sabnzbd.dirscanner import sabnzbd.misc import sabnzbd.config as config import sabnzbd.cfg as cfg diff --git a/sabnzbd/urlgrabber.py b/sabnzbd/urlgrabber.py index 344db3e..cf4fef6 100644 --- a/sabnzbd/urlgrabber.py +++ b/sabnzbd/urlgrabber.py @@ -25,7 +25,6 @@ import time import logging import queue import urllib.request -import urllib.error import urllib.parse from http.client import IncompleteRead, HTTPResponse from mailbox import Message diff --git a/tests/test_urlgrabber.py b/tests/test_urlgrabber.py index 909e832..540c55d 100644 --- a/tests/test_urlgrabber.py +++ b/tests/test_urlgrabber.py @@ -25,7 +25,6 @@ import urllib.parse import pytest_httpbin import sabnzbd.urlgrabber as urlgrabber -import sabnzbd.version from sabnzbd.cfg import selftest_host from tests.testhelper import *