Private GIT

Skip to content
Snippets Groups Projects
Commit 0d148bd2 authored by Nic Wolfe's avatar Nic Wolfe
Browse files

Merge pull request #236 from lad1337/sab_test_button

use provided simplejson as fallback if we run python 2.5
parents 96dc1cd8 a82244b9
No related branches found
No related tags found
No related merge requests found
......@@ -85,7 +85,7 @@ replace with: <b><%=", ".join([Quality.qualityStrings[x] for x in bestQualities]
</td></tr>
<tr><td class="showLegend">Language:</td><td><img src="$sbRoot/images/flags/${show.lang}.png" width="16" height="11" alt="" /> $show.lang</td></tr>
<tr><td class="showLegend">Season Folders: </td><td><img src="$sbRoot/images/#if $show.seasonfolders == 1 then "yes16.png\" alt=\"Y" else "no16.png\" alt=\"N"#" width="16" height="16" /></td></tr>
<tr><td class="showLegend">Paused: </td><td><img src="$sbRoot/images/#if int($show.paused) == 0 then "yes16.png\" alt=\"Y" else "no16.png\" alt=\"N"#" width="16" height="16" /></td></tr>
<tr><td class="showLegend">Paused: </td><td><img src="$sbRoot/images/#if int($show.paused) == 1 then "yes16.png\" alt=\"Y" else "no16.png\" alt=\"N"#" width="16" height="16" /></td></tr>
<tr><td class="showLegend">Air-by-Date: </td><td><img src="$sbRoot/images/#if int($show.air_by_date) == 1 then "yes16.png\" alt=\"Y" else "no16.png\" alt=\"N"#" width="16" height="16" /></td></tr>
</table>
</div>
......
......@@ -24,7 +24,11 @@ import datetime
import sickbeard
from lib import MultipartPostHandler
import urllib2, cookielib, json
import urllib2, cookielib
try:
import json
except ImportError:
from lib import simplejson as json
from sickbeard.common import USER_AGENT
from sickbeard import logger
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment