Move vendored packages in core to libs

Remove `core` references from vendored packages in `core` and optimize imports

core/nzbToMediaUtil.py

@@ -1,30 +1,32 @@
 # coding=utf-8
 
 from __future__ import print_function, unicode_literals
-from six import text_type
+
+import datetime
 import os
+import platform
 import re
+import shutil
 import socket
 import stat
 import struct
-import shutil
 import time
-import datetime
-import platform
-import guessit
-import beets
-import requests
-import core
-from babelfish import Language
-import subliminal
 
-from core.extractor import extractor
+import beets
-from core.linktastic import linktastic
+import guessit
-from core.synchronousdeluge.client import DelugeClient
+import requests
-from core.utorrent.client import UTorrentClient
+import subliminal
-from core.transmissionrpc.client import Client as TransmissionClient
+from babelfish import Language
-from core.qbittorrent.client import Client as qBittorrentClient
+from linktastic import linktastic
+from qbittorrent import Client as qBittorrentClient
+from six import text_type
+from synchronousdeluge.client import DelugeClient
+from transmissionrpc.client import Client as TransmissionClient
+from utorrent import UTorrentClient
+
+import core
 from core import logger, nzbToMediaDB
+from core.extractor import extractor
 
 requests.packages.urllib3.disable_warnings()
 

core/transmissionrpc/__init__.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2008-2013 Erik Svensson <erik.public@gmail.com>
-# Licensed under the MIT license.
-
-from core.transmissionrpc.constants import DEFAULT_PORT, DEFAULT_TIMEOUT, PRIORITY, RATIO_LIMIT, LOGGER
-from core.transmissionrpc.error import TransmissionError, HTTPHandlerError
-from core.transmissionrpc.httphandler import HTTPHandler, DefaultHTTPHandler
-from core.transmissionrpc.torrent import Torrent
-from core.transmissionrpc.session import Session
-from core.transmissionrpc.client import Client
-from core.transmissionrpc.utils import add_stdout_logger, add_file_logger
-
-__author__ = 'Erik Svensson <erik.public@gmail.com>'
-__version_major__ = 0
-__version_minor__ = 11
-__version__ = '{0}.{1}'.format(__version_major__, __version_minor__)
-__copyright__ = 'Copyright (c) 2008-2013 Erik Svensson'
-__license__ = 'MIT'

libs/linktastic/linktastic.py

@@ -22,9 +22,9 @@
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+import os
 import subprocess
 from subprocess import CalledProcessError
-import os
 
 if os.name == 'nt':
     info = subprocess.STARTUPINFO()

libs/qbittorrent/client.py

@@ -1,6 +1,7 @@
-import requests
 import json
 
+import requests
+
 
 class LoginRequired(Exception):
     def __str__(self):

libs/synchronousdeluge/__init__.py

@@ -15,7 +15,7 @@ Example usage:
     download_location = client.core.get_config_value("download_location").get()
 """
 
-from core.synchronousdeluge.exceptions import DelugeRPCError
+from .exceptions import DelugeRPCError
 
 
 __title__ = "synchronous-deluge"

libs/synchronousdeluge/client.py

@@ -1,9 +1,9 @@
 # coding=utf-8
 import os
 import platform
-
 from collections import defaultdict
 from itertools import imap
+
 from .exceptions import DelugeRPCError
 from .protocol import DelugeRPCRequest, DelugeRPCResponse
 from .transfer import DelugeTransfer

libs/synchronousdeluge/rencode.py

@@ -21,6 +21,7 @@ same rencode version throughout your project.
 
 import struct
 from threading import Lock
+
 from six import PY3
 
 if PY3:

libs/synchronousdeluge/transfer.py

@@ -1,10 +1,10 @@
 # coding=utf-8
-import zlib
-import struct
 import socket
 import ssl
+import struct
+import zlib
 
-from core.synchronousdeluge import rencode
+from . import rencode
 
 __all__ = ["DelugeTransfer"]
 

libs/transmissionrpc/__init__.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2008-2013 Erik Svensson <erik.public@gmail.com>
+# Licensed under the MIT license.
+
+from .client import Client
+from .constants import DEFAULT_PORT, DEFAULT_TIMEOUT, LOGGER, PRIORITY, RATIO_LIMIT
+from .error import HTTPHandlerError, TransmissionError
+from .httphandler import DefaultHTTPHandler, HTTPHandler
+from .session import Session
+from .torrent import Torrent
+from .utils import add_file_logger, add_stdout_logger
+
+__author__ = 'Erik Svensson <erik.public@gmail.com>'
+__version_major__ = 0
+__version_minor__ = 11
+__version__ = '{0}.{1}'.format(__version_major__, __version_minor__)
+__copyright__ = 'Copyright (c) 2008-2013 Erik Svensson'
+__license__ = 'MIT'

libs/transmissionrpc/client.py

@@ -2,24 +2,24 @@
 # Copyright (c) 2008-2013 Erik Svensson <erik.public@gmail.com>
 # Licensed under the MIT license.
 
-import re
-import time
-import operator
-import warnings
-import os
 import base64
 import json
+import operator
+import os
+import re
+import time
+import warnings
 
-from six import PY3, integer_types, string_types, iteritems
+from six import PY3, integer_types, iteritems, string_types
 from six.moves.urllib_parse import urlparse
 from six.moves.urllib_request import urlopen
 
-from core.transmissionrpc.constants import DEFAULT_PORT, DEFAULT_TIMEOUT
+from .constants import DEFAULT_PORT, DEFAULT_TIMEOUT
-from core.transmissionrpc.error import TransmissionError, HTTPHandlerError
+from .error import HTTPHandlerError, TransmissionError
-from core.transmissionrpc.utils import LOGGER, get_arguments, make_rpc_name, argument_value_convert, rpc_bool
+from .httphandler import DefaultHTTPHandler
-from core.transmissionrpc.httphandler import DefaultHTTPHandler
+from .session import Session
-from core.transmissionrpc.torrent import Torrent
+from .torrent import Torrent
-from core.transmissionrpc.session import Session
+from .utils import LOGGER, argument_value_convert, get_arguments, make_rpc_name, rpc_bool
 
 
 def debug_httperror(error):

libs/transmissionrpc/error.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2008-2013 Erik Svensson <erik.public@gmail.com>
 # Licensed under the MIT license.
 
-from six import string_types, integer_types
+from six import integer_types, string_types
 
 
 class TransmissionError(Exception):

libs/transmissionrpc/httphandler.py

@@ -4,15 +4,17 @@
 
 import sys
 
-from six.moves.urllib_request import (
-    build_opener, install_opener,
-    HTTPBasicAuthHandler, HTTPDigestAuthHandler, HTTPPasswordMgrWithDefaultRealm,
-    Request,
-)
-from six.moves.urllib_error import HTTPError, URLError
 from six.moves.http_client import BadStatusLine
+from six.moves.urllib_error import HTTPError, URLError
+from six.moves.urllib_request import (
+    HTTPBasicAuthHandler,
+    HTTPDigestAuthHandler,
+    HTTPPasswordMgrWithDefaultRealm,
+    Request,
+    build_opener,
+)
 
-from core.transmissionrpc.error import HTTPHandlerError
+from .error import HTTPHandlerError
 
 
 class HTTPHandler(object):

libs/transmissionrpc/session.py

@@ -2,9 +2,9 @@
 # Copyright (c) 2008-2013 Erik Svensson <erik.public@gmail.com>
 # Licensed under the MIT license.
 
-from six import iteritems, integer_types
+from six import integer_types, iteritems
 
-from core.transmissionrpc.utils import Field
+from .utils import Field
 
 
 class Session(object):

libs/transmissionrpc/torrent.py

@@ -2,13 +2,13 @@
 # Copyright (c) 2008-2013 Erik Svensson <erik.public@gmail.com>
 # Licensed under the MIT license.
 
-import sys
 import datetime
+import sys
 
-from six import integer_types, string_types, text_type, iteritems
+from six import integer_types, iteritems, string_types, text_type
 
-from core.transmissionrpc.constants import PRIORITY, RATIO_LIMIT, IDLE_LIMIT
+from .constants import IDLE_LIMIT, PRIORITY, RATIO_LIMIT
-from core.transmissionrpc.utils import Field, format_timedelta
+from .utils import Field, format_timedelta
 
 
 def get_status_old(code):

libs/transmissionrpc/utils.py

@@ -2,7 +2,6 @@
 # Copyright (c) 2008-2013 Erik Svensson <erik.public@gmail.com>
 # Licensed under the MIT license.
 
-import constants
 import datetime
 import logging
 import socket
@@ -10,7 +9,8 @@ from collections import namedtuple
 
 from six import iteritems, string_types
 
-from constants import LOGGER
+from . import constants
+from .constants import LOGGER
 
 UNITS = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB']
 

libs/utorrent/client.py

@@ -1,10 +1,11 @@
 # coding=utf8
+import StringIO
+import cookielib
+import re
 import urllib
 import urllib2
 import urlparse
-import cookielib
+
-import re
-import StringIO
 try:
     import json
 except ImportError: