From 79d6a6f85fd21ac50dfb32abc32f81269f18d081 Mon Sep 17 00:00:00 2001 From: Ruud Date: Wed, 12 Mar 2014 09:40:20 +0100 Subject: [PATCH] Import fixes --- couchpotato/core/downloaders/base.py | 2 +- couchpotato/core/downloaders/blackhole.py | 1 + couchpotato/core/downloaders/rtorrent.py | 2 +- couchpotato/core/media/movie/providers/nzb/binsearch.py | 2 +- couchpotato/core/media/movie/providers/nzb/newznab.py | 2 +- couchpotato/core/media/movie/providers/nzb/nzbclub.py | 2 +- couchpotato/core/media/movie/providers/nzb/nzbindex.py | 2 +- couchpotato/core/media/movie/providers/nzb/omgwtfnzbs.py | 2 +- couchpotato/core/media/movie/providers/torrent/awesomehd.py | 2 +- couchpotato/core/media/movie/providers/torrent/bithdtv.py | 2 +- couchpotato/core/media/movie/providers/torrent/bitsoup.py | 2 +- couchpotato/core/media/movie/providers/torrent/hdbits.py | 2 +- couchpotato/core/media/movie/providers/torrent/ilovetorrents.py | 2 +- couchpotato/core/media/movie/providers/torrent/iptorrents.py | 2 +- .../core/media/movie/providers/torrent/kickasstorrents.py | 2 +- .../core/media/movie/providers/torrent/passthepopcorn.py | 2 +- couchpotato/core/media/movie/providers/torrent/publichd.py | 2 +- couchpotato/core/media/movie/providers/torrent/sceneaccess.py | 2 +- couchpotato/core/media/movie/providers/torrent/thepiratebay.py | 2 +- couchpotato/core/media/movie/providers/torrent/torrentbytes.py | 2 +- couchpotato/core/media/movie/providers/torrent/torrentday.py | 2 +- couchpotato/core/media/movie/providers/torrent/torrentleech.py | 2 +- couchpotato/core/media/movie/providers/torrent/torrentpotato.py | 2 +- couchpotato/core/media/movie/providers/torrent/torrentshack.py | 2 +- couchpotato/core/media/movie/providers/torrent/yify.py | 2 +- 25 files changed, 25 insertions(+), 24 deletions(-) diff --git a/couchpotato/core/downloaders/base.py b/couchpotato/core/downloaders/base.py index 3bcf1f31..f2a0c1dc 100644 --- a/couchpotato/core/downloaders/base.py +++ b/couchpotato/core/downloaders/base.py @@ -3,9 +3,9 @@ from couchpotato.api import addApiView from couchpotato.core.event import addEvent from couchpotato.core.helpers.variable import mergeDicts from couchpotato.core.logger import CPLog -from couchpotato.core.providers.base import Provider import random import re +from couchpotato.core.media._base.providers.base import Provider log = CPLog(__name__) diff --git a/couchpotato/core/downloaders/blackhole.py b/couchpotato/core/downloaders/blackhole.py index e58db5af..dbacde0a 100644 --- a/couchpotato/core/downloaders/blackhole.py +++ b/couchpotato/core/downloaders/blackhole.py @@ -1,6 +1,7 @@ from __future__ import with_statement from couchpotato.core.downloaders.base import Downloader from couchpotato.core.helpers.encoding import sp +from couchpotato.core.helpers.variable import getDownloadDir from couchpotato.core.logger import CPLog from couchpotato.environment import Env import os diff --git a/couchpotato/core/downloaders/rtorrent.py b/couchpotato/core/downloaders/rtorrent.py index e2936ca5..5ca623ad 100644 --- a/couchpotato/core/downloaders/rtorrent.py +++ b/couchpotato/core/downloaders/rtorrent.py @@ -1,5 +1,5 @@ from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList -from couchpotato.core.event import fireEvent, addEvent +from couchpotato.core.event import addEvent from couchpotato.core.helpers.encoding import sp from couchpotato.core.helpers.variable import cleanHost, splitString from couchpotato.core.logger import CPLog diff --git a/couchpotato/core/media/movie/providers/nzb/binsearch.py b/couchpotato/core/media/movie/providers/nzb/binsearch.py index 9b4cf042..9bc2b8e8 100644 --- a/couchpotato/core/media/movie/providers/nzb/binsearch.py +++ b/couchpotato/core/media/movie/providers/nzb/binsearch.py @@ -1,6 +1,6 @@ from couchpotato.core.helpers.encoding import tryUrlencode from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.nzb.binsearch.main import Base +from couchpotato.core.media._base.providers.nzb.binsearch import Base from couchpotato.core.media.movie.providers.base import MovieProvider from couchpotato.environment import Env diff --git a/couchpotato/core/media/movie/providers/nzb/newznab.py b/couchpotato/core/media/movie/providers/nzb/newznab.py index b67e4a66..9682e74e 100644 --- a/couchpotato/core/media/movie/providers/nzb/newznab.py +++ b/couchpotato/core/media/movie/providers/nzb/newznab.py @@ -1,6 +1,6 @@ from couchpotato.core.helpers.encoding import tryUrlencode from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.nzb.newznab.main import Base +from couchpotato.core.media._base.providers.nzb.newznab import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/nzb/nzbclub.py b/couchpotato/core/media/movie/providers/nzb/nzbclub.py index d90f7457..f1b0d6bd 100644 --- a/couchpotato/core/media/movie/providers/nzb/nzbclub.py +++ b/couchpotato/core/media/movie/providers/nzb/nzbclub.py @@ -1,7 +1,7 @@ from couchpotato.core.helpers.encoding import tryUrlencode from couchpotato.core.logger import CPLog from couchpotato.core.event import fireEvent -from couchpotato.core.media._base.providers.nzb.nzbclub.main import Base +from couchpotato.core.media._base.providers.nzb.nzbclub import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/nzb/nzbindex.py b/couchpotato/core/media/movie/providers/nzb/nzbindex.py index 5f98d58d..411f924a 100644 --- a/couchpotato/core/media/movie/providers/nzb/nzbindex.py +++ b/couchpotato/core/media/movie/providers/nzb/nzbindex.py @@ -1,7 +1,7 @@ from couchpotato.core.helpers.encoding import tryUrlencode from couchpotato.core.logger import CPLog from couchpotato.core.event import fireEvent -from couchpotato.core.media._base.providers.nzb.nzbindex.main import Base +from couchpotato.core.media._base.providers.nzb.nzbindex import Base from couchpotato.core.media.movie.providers.base import MovieProvider from couchpotato.environment import Env diff --git a/couchpotato/core/media/movie/providers/nzb/omgwtfnzbs.py b/couchpotato/core/media/movie/providers/nzb/omgwtfnzbs.py index f0f96907..653adb6b 100644 --- a/couchpotato/core/media/movie/providers/nzb/omgwtfnzbs.py +++ b/couchpotato/core/media/movie/providers/nzb/omgwtfnzbs.py @@ -1,5 +1,5 @@ from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.nzb.omgwtfnzbs.main import Base +from couchpotato.core.media._base.providers.nzb.omgwtfnzbs import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/awesomehd.py b/couchpotato/core/media/movie/providers/torrent/awesomehd.py index d96b59ab..b1c81f18 100644 --- a/couchpotato/core/media/movie/providers/torrent/awesomehd.py +++ b/couchpotato/core/media/movie/providers/torrent/awesomehd.py @@ -1,5 +1,5 @@ from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.torrent.awesomehd.main import Base +from couchpotato.core.media._base.providers.torrent.awesomehd import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/bithdtv.py b/couchpotato/core/media/movie/providers/torrent/bithdtv.py index f1f9cff4..8b77199b 100644 --- a/couchpotato/core/media/movie/providers/torrent/bithdtv.py +++ b/couchpotato/core/media/movie/providers/torrent/bithdtv.py @@ -1,7 +1,7 @@ from couchpotato.core.helpers.encoding import tryUrlencode from couchpotato.core.logger import CPLog from couchpotato.core.event import fireEvent -from couchpotato.core.media._base.providers.torrent.bithdtv.main import Base +from couchpotato.core.media._base.providers.torrent.bithdtv import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/bitsoup.py b/couchpotato/core/media/movie/providers/torrent/bitsoup.py index 7170ebd0..578de69d 100644 --- a/couchpotato/core/media/movie/providers/torrent/bitsoup.py +++ b/couchpotato/core/media/movie/providers/torrent/bitsoup.py @@ -1,7 +1,7 @@ from couchpotato.core.helpers.encoding import tryUrlencode from couchpotato.core.logger import CPLog from couchpotato.core.event import fireEvent -from couchpotato.core.media._base.providers.torrent.bitsoup.main import Base +from couchpotato.core.media._base.providers.torrent.bitsoup import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/hdbits.py b/couchpotato/core/media/movie/providers/torrent/hdbits.py index e44e3b3f..016f1a12 100644 --- a/couchpotato/core/media/movie/providers/torrent/hdbits.py +++ b/couchpotato/core/media/movie/providers/torrent/hdbits.py @@ -1,5 +1,5 @@ from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.torrent.hdbits.main import Base +from couchpotato.core.media._base.providers.torrent.hdbits import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/ilovetorrents.py b/couchpotato/core/media/movie/providers/torrent/ilovetorrents.py index ad0bac32..cfd773ad 100644 --- a/couchpotato/core/media/movie/providers/torrent/ilovetorrents.py +++ b/couchpotato/core/media/movie/providers/torrent/ilovetorrents.py @@ -1,5 +1,5 @@ from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.torrent.ilovetorrents.main import Base +from couchpotato.core.media._base.providers.torrent.ilovetorrents import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/iptorrents.py b/couchpotato/core/media/movie/providers/torrent/iptorrents.py index 21a66422..ba2b738c 100644 --- a/couchpotato/core/media/movie/providers/torrent/iptorrents.py +++ b/couchpotato/core/media/movie/providers/torrent/iptorrents.py @@ -1,5 +1,5 @@ from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.torrent.iptorrents.main import Base +from couchpotato.core.media._base.providers.torrent.iptorrents import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/kickasstorrents.py b/couchpotato/core/media/movie/providers/torrent/kickasstorrents.py index d9adeccd..b7bb0253 100644 --- a/couchpotato/core/media/movie/providers/torrent/kickasstorrents.py +++ b/couchpotato/core/media/movie/providers/torrent/kickasstorrents.py @@ -1,5 +1,5 @@ from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.torrent.kickasstorrents.main import Base +from couchpotato.core.media._base.providers.torrent.kickasstorrents import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/passthepopcorn.py b/couchpotato/core/media/movie/providers/torrent/passthepopcorn.py index 6c90c14d..1e994135 100644 --- a/couchpotato/core/media/movie/providers/torrent/passthepopcorn.py +++ b/couchpotato/core/media/movie/providers/torrent/passthepopcorn.py @@ -1,5 +1,5 @@ from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.torrent.passthepopcorn.main import Base +from couchpotato.core.media._base.providers.torrent.passthepopcorn import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/publichd.py b/couchpotato/core/media/movie/providers/torrent/publichd.py index 4dd7efb6..ce54c468 100644 --- a/couchpotato/core/media/movie/providers/torrent/publichd.py +++ b/couchpotato/core/media/movie/providers/torrent/publichd.py @@ -1,6 +1,6 @@ from couchpotato.core.logger import CPLog from couchpotato.core.event import fireEvent -from couchpotato.core.media._base.providers.torrent.publichd.main import Base +from couchpotato.core.media._base.providers.torrent.publichd import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/sceneaccess.py b/couchpotato/core/media/movie/providers/torrent/sceneaccess.py index ead32e23..2a778391 100644 --- a/couchpotato/core/media/movie/providers/torrent/sceneaccess.py +++ b/couchpotato/core/media/movie/providers/torrent/sceneaccess.py @@ -1,7 +1,7 @@ from couchpotato.core.helpers.encoding import tryUrlencode from couchpotato.core.event import fireEvent from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.torrent.sceneaccess.main import Base +from couchpotato.core.media._base.providers.torrent.sceneaccess import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/thepiratebay.py b/couchpotato/core/media/movie/providers/torrent/thepiratebay.py index 4f6f3bb5..457e53d5 100644 --- a/couchpotato/core/media/movie/providers/torrent/thepiratebay.py +++ b/couchpotato/core/media/movie/providers/torrent/thepiratebay.py @@ -1,7 +1,7 @@ from couchpotato.core.helpers.encoding import tryUrlencode from couchpotato.core.logger import CPLog from couchpotato.core.event import fireEvent -from couchpotato.core.media._base.providers.torrent.thepiratebay.main import Base +from couchpotato.core.media._base.providers.torrent.thepiratebay import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/torrentbytes.py b/couchpotato/core/media/movie/providers/torrent/torrentbytes.py index cef52552..48fc68a4 100644 --- a/couchpotato/core/media/movie/providers/torrent/torrentbytes.py +++ b/couchpotato/core/media/movie/providers/torrent/torrentbytes.py @@ -1,5 +1,5 @@ from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.torrent.torrentbytes.main import Base +from couchpotato.core.media._base.providers.torrent.torrentbytes import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/torrentday.py b/couchpotato/core/media/movie/providers/torrent/torrentday.py index fa90306e..03fe3fe0 100644 --- a/couchpotato/core/media/movie/providers/torrent/torrentday.py +++ b/couchpotato/core/media/movie/providers/torrent/torrentday.py @@ -1,6 +1,6 @@ from couchpotato.core.logger import CPLog from couchpotato.core.event import fireEvent -from couchpotato.core.media._base.providers.torrent.torrentday.main import Base +from couchpotato.core.media._base.providers.torrent.torrentday import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/torrentleech.py b/couchpotato/core/media/movie/providers/torrent/torrentleech.py index 5483adc7..9de6451c 100644 --- a/couchpotato/core/media/movie/providers/torrent/torrentleech.py +++ b/couchpotato/core/media/movie/providers/torrent/torrentleech.py @@ -1,6 +1,6 @@ from couchpotato.core.helpers.encoding import tryUrlencode from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.torrent.torrentleech.main import Base +from couchpotato.core.media._base.providers.torrent.torrentleech import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/torrentpotato.py b/couchpotato/core/media/movie/providers/torrent/torrentpotato.py index 1e5903a5..9c992071 100644 --- a/couchpotato/core/media/movie/providers/torrent/torrentpotato.py +++ b/couchpotato/core/media/movie/providers/torrent/torrentpotato.py @@ -1,6 +1,6 @@ from couchpotato.core.helpers.encoding import tryUrlencode from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.torrent.torrentpotato.main import Base +from couchpotato.core.media._base.providers.torrent.torrentpotato import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/torrentshack.py b/couchpotato/core/media/movie/providers/torrent/torrentshack.py index 8bf7fb94..24ac863a 100644 --- a/couchpotato/core/media/movie/providers/torrent/torrentshack.py +++ b/couchpotato/core/media/movie/providers/torrent/torrentshack.py @@ -1,7 +1,7 @@ from couchpotato.core.event import fireEvent from couchpotato.core.helpers.encoding import tryUrlencode from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.torrent.torrentshack.main import Base +from couchpotato.core.media._base.providers.torrent.torrentshack import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__) diff --git a/couchpotato/core/media/movie/providers/torrent/yify.py b/couchpotato/core/media/movie/providers/torrent/yify.py index 16c76949..d30132d6 100644 --- a/couchpotato/core/media/movie/providers/torrent/yify.py +++ b/couchpotato/core/media/movie/providers/torrent/yify.py @@ -1,5 +1,5 @@ from couchpotato.core.logger import CPLog -from couchpotato.core.media._base.providers.torrent.yify.main import Base +from couchpotato.core.media._base.providers.torrent.yify import Base from couchpotato.core.media.movie.providers.base import MovieProvider log = CPLog(__name__)