Browse Source

Add strict Python version check (>= 2.7.9 and < 3.0), ** exit ** if incorrect version.

pull/761/head
Prinz23 9 years ago
committed by JackDandy
parent
commit
24afe020d8
  1. 4
      CHANGES.md
  2. 5
      SickBeard.py
  3. 2
      gui/slick/interfaces/default/home_browseShows.tmpl
  4. BIN
      lib/rarfile/UnRAR.exe

4
CHANGES.md

@ -1,5 +1,6 @@
### 0.12.0 (2016-xx-xx xx:xx:xx UTC) ### 0.12.0 (2016-xx-xx xx:xx:xx UTC)
* Add strict Python version check (equal or higher than 2.7.9 and less than 3.0), ** exit ** if incorrect version
* Update unidecode library 0.04.11 to 0.04.18 (fd57cbf) * Update unidecode library 0.04.11 to 0.04.18 (fd57cbf)
* Update xmltodict library 0.9.2 (579a005) to 0.9.2 (eac0031) * Update xmltodict library 0.9.2 (579a005) to 0.9.2 (eac0031)
* Update Tornado Web Server 4.3.dev1 (1b6157d) to 4.4.dev1 (c2b4d05) * Update Tornado Web Server 4.3.dev1 (1b6157d) to 4.4.dev1 (c2b4d05)
@ -117,7 +118,7 @@
* Add detection of password protected rars with config/Post Processing/'Unpack downloads' enabled * Add detection of password protected rars with config/Post Processing/'Unpack downloads' enabled
* Change post process to cleanup filenames with config/Post Processing/'Unpack downloads' enabled * Change post process to cleanup filenames with config/Post Processing/'Unpack downloads' enabled
* Change post process to join incrementally named (i.e. file.001 to file.nnn) split files * Change post process to join incrementally named (i.e. file.001 to file.nnn) split files
* Change replace unrar2 lib with rarfile 3.0 and UnRAR.exe 5.40 beta 4 freeware * Change replace unrar2 lib with rarfile 3.0 and UnRAR.exe 5.40 freeware
* Change post process "Copy" to delete redundant files after use * Change post process "Copy" to delete redundant files after use
[develop changelog] [develop changelog]
@ -125,6 +126,7 @@
* Change revert test_common.py include file placement so Travis builds don't fail * Change revert test_common.py include file placement so Travis builds don't fail
* Fix Nyaa and TT torrent providers * Fix Nyaa and TT torrent providers
* Change PrivateHD torrent provider * Change PrivateHD torrent provider
* Fix Add from Trakt
### 0.11.14 (2016-07-25 03:10:00 UTC) ### 0.11.14 (2016-07-25 03:10:00 UTC)

5
SickBeard.py

@ -33,8 +33,9 @@ import subprocess
import time import time
import threading import threading
if sys.version_info < (2, 6): if not (2, 7, 9) <= sys.version_info < (3, 0):
print('Sorry, requires Python 2.6 or 2.7.') print('Python %s.%s.%s detected.' % sys.version_info[:3])
print('Sorry, SickGear requires Python 2.7.9 or higher. Python 3 is not supported.')
sys.exit(1) sys.exit(1)
try: try:

2
gui/slick/interfaces/default/home_browseShows.tmpl

@ -244,7 +244,7 @@
title="<span style='color: rgb(66, 139, 202)'>$re.sub(r'(?m)\s+\((?:19|20)\d\d\)\s*$', '', $title_html)</span>#if $this_show['genres']#<br /><div style='font-weight:bold'>(<em>$this_show['genres']</em>)</div>#end if# title="<span style='color: rgb(66, 139, 202)'>$re.sub(r'(?m)\s+\((?:19|20)\d\d\)\s*$', '', $title_html)</span>#if $this_show['genres']#<br /><div style='font-weight:bold'>(<em>$this_show['genres']</em>)</div>#end if#
<p style='margin:0 0 2px'>#echo re.sub(r'([,\.!][^,\.!]*?)$', '...', re.sub(r'([!\?\.])(?=\w)', r'\1 ', $overview))#</p> <p style='margin:0 0 2px'>#echo re.sub(r'([,\.!][^,\.!]*?)$', '...', re.sub(r'([!\?\.])(?=\w)', r'\1 ', $overview))#</p>
<p><span style='font-weight:bold;font-size:0.9em;color:#888'><em>#if $kwargs and 'newseasons' == $mode#Air#else#First air#end if##echo ('s', 'ed')[$this_show['when_past']]#: $this_show['premiered_str']</em></span> <p><span style='font-weight:bold;font-size:0.9em;color:#888'><em>#if $kwargs and 'newseasons' == $mode#Air#else#First air#end if##echo ('s', 'ed')[$this_show['when_past']]#: $this_show['premiered_str']</em></span>
#if $this_show['ended_str']# - <span style='font-weight:bold;font-size:0.9em;color:#888'><em>Ended: $this_show['ended_str']</em></span>#end if#</p> #if $this_show.get('ended_str')# - <span style='font-weight:bold;font-size:0.9em;color:#888'><em>Ended: $this_show['ended_str']</em></span>#end if#</p>
<span style='float:right'>Click for more at <span class='boldest'>$browse_type</span></span>"> <span style='float:right'>Click for more at <span class='boldest'>$browse_type</span></span>">
#if 'poster' in $this_show['images']: #if 'poster' in $this_show['images']:
#set $image = $this_show['images']['poster']['thumb'] #set $image = $this_show['images']['poster']['thumb']

BIN
lib/rarfile/UnRAR.exe

Binary file not shown.
Loading…
Cancel
Save