Merge remote-tracking branch 'origin/libs/transmission' into fix/unvendor

# Conflicts:
#	libs/transmissionrpc/__init__.py
This commit is contained in:
Labrys of Knossos 2018-12-15 12:23:48 -05:00
commit f26f017cc8

View file

@ -2,13 +2,13 @@
# Copyright (c) 2008-2013 Erik Svensson <erik.public@gmail.com> # Copyright (c) 2008-2013 Erik Svensson <erik.public@gmail.com>
# Licensed under the MIT license. # Licensed under the MIT license.
from .client import Client from transmissionrpc.constants import DEFAULT_PORT, DEFAULT_TIMEOUT, PRIORITY, RATIO_LIMIT, LOGGER
from .constants import DEFAULT_PORT, DEFAULT_TIMEOUT, LOGGER, PRIORITY, RATIO_LIMIT from transmissionrpc.error import TransmissionError, HTTPHandlerError
from .error import HTTPHandlerError, TransmissionError from transmissionrpc.httphandler import HTTPHandler, DefaultHTTPHandler
from .httphandler import DefaultHTTPHandler, HTTPHandler from transmissionrpc.torrent import Torrent
from .session import Session from transmissionrpc.session import Session
from .torrent import Torrent from transmissionrpc.client import Client
from .utils import add_file_logger, add_stdout_logger from transmissionrpc.utils import add_stdout_logger, add_file_logger
__author__ = 'Erik Svensson <erik.public@gmail.com>' __author__ = 'Erik Svensson <erik.public@gmail.com>'
__version_major__ = 0 __version_major__ = 0