diff --git a/modules/attilasub/pages.py b/modules/attilasub/pages.py
index 72d0d304..d7b9b2dc 100644
--- a/modules/attilasub/pages.py
+++ b/modules/attilasub/pages.py
@@ -18,17 +18,9 @@
# along with weboob. If not, see .
-try:
- from urlparse import parse_qs
-except ImportError:
- from cgi import parse_qs # NOQA
-
-from urlparse import urlsplit
-
from weboob.capabilities.subtitle import Subtitle
from weboob.capabilities.base import NotAvailable
from weboob.tools.browser import BasePage
-from weboob.tools.misc import get_bytes_size
__all__ = ['SubtitlesPage','SearchPage']
diff --git a/modules/attilasub/test.py b/modules/attilasub/test.py
index 702ffc31..aecb4b3c 100644
--- a/modules/attilasub/test.py
+++ b/modules/attilasub/test.py
@@ -18,7 +18,6 @@
# along with weboob. If not, see .
from weboob.tools.test import BackendTest
-from weboob.capabilities.base import NotLoaded
import urllib
from random import choice
diff --git a/modules/btmon/backend.py b/modules/btmon/backend.py
index 4641fce2..8e583034 100644
--- a/modules/btmon/backend.py
+++ b/modules/btmon/backend.py
@@ -24,7 +24,7 @@ from .browser import BtmonBrowser
from urllib import quote_plus
-__all__ = ['KickassBackend']
+__all__ = ['BtmonBackend']
class BtmonBackend(BaseBackend, ICapTorrent):
diff --git a/modules/btmon/pages.py b/modules/btmon/pages.py
index 9c83b5d2..072874ea 100644
--- a/modules/btmon/pages.py
+++ b/modules/btmon/pages.py
@@ -18,12 +18,6 @@
# along with weboob. If not, see .
-try:
- from urlparse import parse_qs
-except ImportError:
- from cgi import parse_qs # NOQA
-
-from urlparse import urlsplit
import string
from weboob.capabilities.torrent import Torrent
diff --git a/modules/opensubtitles/pages.py b/modules/opensubtitles/pages.py
index 4e1a878f..e3a41de2 100644
--- a/modules/opensubtitles/pages.py
+++ b/modules/opensubtitles/pages.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright(C) 2010-2012 Julien Veyssier
+# Copyright(C) 2013 Julien Veyssier
#
# This file is part of weboob.
#
@@ -18,17 +18,9 @@
# along with weboob. If not, see .
-try:
- from urlparse import parse_qs
-except ImportError:
- from cgi import parse_qs # NOQA
-
-from urlparse import urlsplit
-
from weboob.capabilities.subtitle import Subtitle
from weboob.capabilities.base import NotAvailable
from weboob.tools.browser import BasePage
-from weboob.tools.misc import get_bytes_size
__all__ = ['SubtitlesPage','SubtitlePage','SearchPage']
@@ -84,14 +76,13 @@ class SubtitlesPage(BasePage):
# why following line doesn't work all the time (for example 'search fr sopranos guy walks' ?
#for line in self.parser.select(table,'tr'):
for line in table.getiterator('tr'):
- # some lines are useless, specially ads
+ # some tr are useless, specially ads
if line.attrib.get('id','').startswith('name'):
yield self.get_subtitle_from_line(line)
def get_subtitle_from_line(self,line):
cells = self.parser.select(line,'td')
if len(cells) > 0:
- first_cell = cells[0]
links = self.parser.select(line,'a')
a = links[0]
urldetail = a.attrib.get('href','')
@@ -136,6 +127,7 @@ class SubtitlePage(BasePage):
""" Page which contains a single subtitle for a movie
"""
def get_subtitle(self):
+ desc = NotAvailable
father = self.parser.select(self.document.getroot(),'a#app_link',1).getparent()
a = self.parser.select(father,'a')[1]
id = a.attrib.get('href','').split('/')[-1]
diff --git a/modules/opensubtitles/test.py b/modules/opensubtitles/test.py
index 6edb0026..b472bd51 100644
--- a/modules/opensubtitles/test.py
+++ b/modules/opensubtitles/test.py
@@ -18,7 +18,6 @@
# along with weboob. If not, see .
from weboob.tools.test import BackendTest
-from weboob.capabilities.base import NotLoaded
import urllib
from random import choice
diff --git a/modules/tvsubtitles/browser.py b/modules/tvsubtitles/browser.py
index fb7eefde..e28476ea 100644
--- a/modules/tvsubtitles/browser.py
+++ b/modules/tvsubtitles/browser.py
@@ -23,7 +23,7 @@ from weboob.tools.browser import BaseBrowser
from .pages import SeriePage, SearchPage, SeasonPage,HomePage
-__all__ = ['OpensubtitlesBrowser']
+__all__ = ['TvsubtitlesBrowser']
LANGUAGE_LIST = ['en','es','fr','de','br','ru','ua','it','gr',
'ar','hu','pl','tr','nl','pt','sv','da','fi',
diff --git a/modules/tvsubtitles/pages.py b/modules/tvsubtitles/pages.py
index 7d2bb138..0e680692 100644
--- a/modules/tvsubtitles/pages.py
+++ b/modules/tvsubtitles/pages.py
@@ -18,17 +18,8 @@
# along with weboob. If not, see .
-try:
- from urlparse import parse_qs
-except ImportError:
- from cgi import parse_qs # NOQA
-
-from urlparse import urlsplit
-
from weboob.capabilities.subtitle import Subtitle
-from weboob.capabilities.base import NotAvailable
from weboob.tools.browser import BasePage
-from weboob.tools.misc import get_bytes_size
__all__ = ['HomePage','SearchPage','SeriePage','SeasonPage']
diff --git a/modules/tvsubtitles/test.py b/modules/tvsubtitles/test.py
index ef14f2ba..37d19dda 100644
--- a/modules/tvsubtitles/test.py
+++ b/modules/tvsubtitles/test.py
@@ -18,7 +18,6 @@
# along with weboob. If not, see .
from weboob.tools.test import BackendTest
-from weboob.capabilities.base import NotLoaded
import urllib
from random import choice
diff --git a/weboob/capabilities/subtitle.py b/weboob/capabilities/subtitle.py
index 1697b966..3e270e6d 100644
--- a/weboob/capabilities/subtitle.py
+++ b/weboob/capabilities/subtitle.py
@@ -18,8 +18,7 @@
# along with weboob. If not, see .
-from .base import IBaseCap, CapBaseObject, Field, StringField, FloatField, \
- DateField, IntField, UserError
+from .base import IBaseCap, CapBaseObject, StringField, IntField, UserError
__all__ = ['Subtitle', 'ICapSubtitle']