Commit 278b4f00 authored by echel0n's avatar echel0n

Merge branch 'release/9.2.98'

parents ed016edb 016ec816
# Changelog
- * b43fee1 - 2018-01-18: Release v9.2.97
- * 0ff270e - 2018-01-20: Release v9.2.98
- * b8fabca - 2018-01-20: Fixed missing requests security requirement
- * 0ebcc19 - 2018-01-19: misc range to xrange changes
- * 927c3c0 - 2018-01-19: Fixed missing token error
- * 7cf97c1 - 2018-01-18: Release v9.2.97
- * f9983e3 - 2018-01-18: Fixed issue with SR API and expired tokens
- * b8ae4e8 - 2018-01-15: Release v9.2.95
- * 0817995 - 2018-01-15: Fixed issue #169 - Missing parameter: "refresh_token" is required
......
......@@ -33,7 +33,7 @@ pyxdg == 0.25
urllib3 == 1.22
py-unrar2 == 0.99.6
lockfile == 0.12.2
requests == 2.18.4
requests[security] == 2.18.4
codernitydb == 0.5.0
fake-useragent == 0.1.8
html5lib == 1.0.1
......
......@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from urlparse import urljoin
from oauthlib.oauth2 import BackendApplicationClient, TokenExpiredError
from oauthlib.oauth2 import BackendApplicationClient, TokenExpiredError, MissingTokenError
from requests_oauthlib import OAuth2Session
import sickrage
......@@ -27,7 +27,7 @@ class RefreshOAuth2Session(OAuth2Session):
if resp.status_code == 401:
self.renew_token()
resp = super(RefreshOAuth2Session, self).request(*args, **kwargs)
except TokenExpiredError:
except (TokenExpiredError, MissingTokenError):
self.renew_token()
resp = super(RefreshOAuth2Session, self).request(*args, **kwargs)
......
......@@ -1493,7 +1493,7 @@ def convert_size(size, default=0, units=None):
def randomString(size=8, chars=string.ascii_uppercase + string.digits):
return ''.join(random.choice(chars) for x in range(size))
return ''.join(random.choice(chars) for x in xrange(size))
def clean_url(url):
......
......@@ -103,7 +103,7 @@
</div>
<select id="failed_snatch_age" name="failed_snatch_age" class="form-control"
title="minimum allowed time ${sickrage.app.config.min_failed_snatch_age} hours">
% for hour in range(1,25):
% for hour in xrange(1,25):
<option value="${hour}" ${('', 'selected')[sickrage.app.config.failed_snatch_age == hour]}>${hour}</option>
% endfor
</select>
......
......@@ -420,7 +420,7 @@
</div>
% elif 'calendar' == layout:
<div class="col-md-12">
<% dates = [today.date() + datetime.timedelta(days = i) for i in range(7)] %>
<% dates = [today.date() + datetime.timedelta(days = i) for i in xrange(7)] %>
<% tbl_day = 0 %>
<br/>
<br/>
......
......@@ -34,7 +34,7 @@ class ConfigurationManager(object):
return Configuration(self).http(retry, max_retries, retry_sleep, timeout)
def get(self, key, default=None):
for x in range(len(self.stack) - 1, -1, -1):
for x in xrange(len(self.stack) - 1, -1, -1):
value = self.stack[x].get(key)
if value is not None:
......
......@@ -9,6 +9,7 @@ from threading import RLock
import requests
from requests.adapters import DEFAULT_POOLBLOCK, HTTPAdapter
from trakt.core.configuration import DEFAULT_HTTP_RETRY, DEFAULT_HTTP_MAX_RETRIES, DEFAULT_HTTP_TIMEOUT, \
DEFAULT_HTTP_RETRY_SLEEP
from trakt.core.context_stack import ContextStack
......@@ -118,7 +119,7 @@ class HttpClient(object):
# Send request
response = None
for i in range(max_retries + 1):
for i in xrange(max_retries + 1):
if i > 0:
log.warn('Retry # %s', i)
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Arabic\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Catalan\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Czech\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Danish\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Greek\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: English\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:10-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Spanish\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Finnish\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: French\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Hebrew\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Hungarian\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Italian\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Japanese\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Korean\n"
"MIME-Version: 1.0\n"
......
......@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: sickrage 9.2.97\n"
"Project-Id-Version: sickrage 9.2.98\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Dutch\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:10-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Norwegian\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:10-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Polish\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:10-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Portuguese\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:10-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Romanian\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:10-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Russian\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:10-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Swedish\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:10-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Turkish\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:10-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Ukrainian\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:21-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:10-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Vietnamese\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Chinese Simplified\n"
"MIME-Version: 1.0\n"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-01-18 01:19-0500\n"
"PO-Revision-Date: 2018-01-18 01:20-0500\n"
"POT-Creation-Date: 2018-01-20 05:09-0500\n"
"PO-Revision-Date: 2018-01-20 05:09-0500\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Chinese Traditional\n"
"MIME-Version: 1.0\n"
......
......@@ -94,7 +94,7 @@ class BTNProvider(TorrentProvider):
pages_needed = max_pages
# +1 because range(1,4) = 1, 2, 3
for page in range(1, pages_needed + 1):
for page in xrange(1, pages_needed + 1):
parsedJSON = self._api_call(apikey, params, results_per_page, page * results_per_page)
# Note that this these are individual requests and might time out individually. This would result in 'gaps'
# in the results. There is no way to fix this though.
......
9.2.97
\ No newline at end of file
9.2.98
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment