diff --git a/data/interfaces/default/config_providers.tmpl b/data/interfaces/default/config_providers.tmpl
index 572e99c62270014dfd5117869a3a27e762f2a0b2..86445278473089974c447b66a8b11b7c9d9a08e5 100644
--- a/data/interfaces/default/config_providers.tmpl
+++ b/data/interfaces/default/config_providers.tmpl
@@ -99,7 +99,7 @@ var show_nzb_providers = #if $sickbeard.USE_NZBS then "true" else "false"#;
<span class="component-title jumbo">Configure Provider:</span>
<span class="component-desc">
#set $provider_config_list = []
- #for $cur_provider in ("omgwtfnzbs", "tvtorrents", "torrentleech", "btn", "binnewz", "t411", "ftdb", "addict", "fnt", "libertalia", "tpi", "piratebay", "gks", "ethor", "thinkgeek", "xthor"):
+ #for $cur_provider in ("omgwtfnzbs", "tvtorrents", "torrentleech", "btn", "binnewz", "t411", "ftdb", "addict", "fnt", "libertalia", "piratebay", "ethor", "thinkgeek", "xthor"):
#set $cur_provider_obj = $sickbeard.providers.getProviderClass($cur_provider)
#if $cur_provider_obj.providerType == $GenericProvider.NZB and not $sickbeard.USE_NZBS:
#continue
@@ -239,22 +239,7 @@ Nothing to set up for this provider
</label>
</div>
</div><!-- /ftdbDiv //-->
-
- <div class="providerDiv" id="tpiDiv">
- <div class="field-pair">
- <label class="clearfix">
- <span class="component-title">TPI User name:</span>
- <input class="component-desc" type="text" name="tpi_username" value="$sickbeard.TPI_USERNAME" size="40" />
- </label>
- </div>
- <div class="field-pair">
- <label class="clearfix">
- <span class="component-title">TPI Password:</span>
- <input class="component-desc" type="text" name="tpi_password" value="$sickbeard.TPI_PASSWORD" size="40" />
- </label>
- </div>
- </div><!-- /tpiDiv //-->
-
+
<div class="providerDiv" id="addictDiv">
<div class="field-pair">
<label class="clearfix">
@@ -339,14 +324,6 @@ Nothing to set up for this provider
</div>
</div><!-- /btnDiv //-->
-<div class="providerDiv" id="gksDiv">
- <div class="field-pair">
- <label class="clearfix">
- <span class="component-title">GKS RSS Key:</span>
- <input class="component-desc" type="text" name="gks_key" value="$sickbeard.GKS_KEY" size="40" />
- </label>
- </div>
- </div><!-- /gksDiv //-->
<!-- end div for editing providers -->
diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py
index cf03f07ec6b7cd9b2d1e3a334fd4da9883bf1dba..b769ebd06dca967972eb032357708accb876ea76 100644
--- a/sickbeard/providers/__init__.py
+++ b/sickbeard/providers/__init__.py
@@ -25,13 +25,11 @@ __all__ = ['ezrss',
'binnewz',
't411',
'ftdb',
- 'tpi',
'addict',
'fnt',
'libertalia',
'cpasbien',
'piratebay',
- 'gks',
'kat',
'ethor',
'xthor',
diff --git a/sickbeard/providers/ftdb.py b/sickbeard/providers/ftdb.py
index 8f59e0e5c7e5fd697479616800aec1bc6085be5e..a7a95e35184b9c50968c7d9fb2ea5cf7c0177483 100644
--- a/sickbeard/providers/ftdb.py
+++ b/sickbeard/providers/ftdb.py
@@ -146,6 +146,7 @@ class FTDBProvider(generic.TorrentProvider):
})
self.opener.open(self.url + '/?section=LOGIN&ajax=1', data).read()
+ self.login_done = self.opener
def _doSearch(self, searchString, show=None, season=None, french=None):
@@ -157,7 +158,7 @@ class FTDBProvider(generic.TorrentProvider):
logger.log(u"Search string: " + searchUrl, logger.DEBUG)
r = self.opener.open( searchUrl )
- soup = BeautifulSoup( r, "html.parser" )
+ soup = BeautifulSoup( r )
resultsTable = soup.find("div", { "class" : "DataGrid" })
if resultsTable:
rows = resultsTable.findAll("ul")
@@ -167,8 +168,8 @@ class FTDBProvider(generic.TorrentProvider):
title = link['title']
autogetURL = self.url + (row.find("li", { "class" : "torrents_name"}).find('a')['href'][1:]).replace('#FTD_MENU','&menu=4')
- r = self.opener.open( autogetURL , 'wb').read()
- soup = BeautifulSoup( r, "html.parser" )
+ r = self.opener.open(autogetURL,'wb').read()
+ soup = BeautifulSoup( r)
downloadURL = soup.find("div", { "class" : "autoget"}).find('a')['href']
quality = Quality.nameQuality( title )
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index f35a23a2795d7ee8e7f8c0d433d8398093e1d601..37da2e229d615aa1523024b8e3b9b9bd389cda12 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -1361,8 +1361,7 @@ class ConfigProviders:
tvtorrents_digest=None, tvtorrents_hash=None,
torrentleech_key=None,
btn_api_key=None,
- newzbin_username=None, newzbin_password=None,t411_username=None,t411_password=None,ftdb_username=None,ftdb_password=None,tpi_username=None,tpi_password=None,addict_username=None,addict_password=None,fnt_username=None,fnt_password=None,libertalia_username=None,libertalia_password=None,xthor_username=None,xthor_password=None,thinkgeek_username=None,thinkgeek_password=None,
- gks_key=None,
+ newzbin_username=None, newzbin_password=None,t411_username=None,t411_password=None,ftdb_username=None,ftdb_password=None,addict_username=None,addict_password=None,fnt_username=None,fnt_password=None,libertalia_username=None,libertalia_password=None,xthor_username=None,xthor_password=None,thinkgeek_username=None,thinkgeek_password=None,
ethor_key=None,
provider_order=None):
@@ -1439,8 +1438,6 @@ class ConfigProviders:
sickbeard.T411 = curEnabled
elif curProvider == 'ftdb':
sickbeard.FTDB = curEnabled
- elif curProvider == 'tpi':
- sickbeard.TPI = curEnabled
elif curProvider == 'addict':
sickbeard.ADDICT = curEnabled
elif curProvider == 'fnt':
@@ -1457,8 +1454,6 @@ class ConfigProviders:
sickbeard.kat = curEnabled
elif curProvider == 'piratebay':
sickbeard.THEPIRATEBAY = curEnabled
- elif curProvider == 'gks':
- sickbeard.GKS = curEnabled
elif curProvider == 'ethor':
sickbeard.ETHOR = curEnabled
elif curProvider in newznabProviderDict:
@@ -1481,9 +1476,6 @@ class ConfigProviders:
sickbeard.FTDB_USERNAME = ftdb_username
sickbeard.FTDB_PASSWORD = ftdb_password
- sickbeard.TPI_USERNAME = tpi_username
- sickbeard.TPI_PASSWORD = tpi_password
-
sickbeard.ADDICT_USERNAME = addict_username
sickbeard.ADDICT_PASSWORD = addict_password
@@ -1505,8 +1497,6 @@ class ConfigProviders:
sickbeard.OMGWTFNZBS_UID = omgwtfnzbs_uid.strip()
sickbeard.OMGWTFNZBS_KEY = omgwtfnzbs_key.strip()
- sickbeard.GKS_KEY = gks_key.strip()
-
sickbeard.PROVIDER_ORDER = provider_list
sickbeard.save_config()