From d82a58799c27000eeb3a1a87d3616efa6dc0e2eb Mon Sep 17 00:00:00 2001
From: ShyPike <shypike@sabnzbd.org>
Date: Mon, 20 Dec 2010 22:37:45 +0100
Subject: [PATCH] Drop support for Python 2.4, due to missing features in
 gettext modules.

---
 INSTALL.txt  | 10 +++-------
 SABHelper.py |  4 ++--
 SABnzbd.py   |  8 ++++----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/INSTALL.txt b/INSTALL.txt
index cde4a7d..4948699 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -47,12 +47,11 @@ Use the "Help" button in the web-interface to be directed to the Help Wiki.
 You need to have Python installed and some modules.
 
 Unix/Linux/OSX
-    Python-2.4.4            http://www.python.org
-OR
-    Python-2.5.4            http://www.python.org
+    Python-2.5 or 2.6       http://www.python.org
 
 Windows
     Python-2.5.latest       http://www.activestate.com
+    Python-2.6.latest
 
 Essential modules
     cheetah-2.0.1+          http://www.cheetahtemplate.org/
@@ -61,16 +60,13 @@ Essential modules
     par2cmdline >= 0.4      http://parchive.sourceforge.net/
                             http://chuchusoft.com/par2_tbb/index.html (multi-core)
 
-Essential modules for python 2.4 ONLY
-    pysqlite3 >= 2.3.4      http://pysqlite.org (python-pysqlite2)
-
 Optional modules
     unrar >= 3.90+          http://www.rarlab.com/rar_add.htm
     unzip >= 5.52           http://www.info-zip.org/
     gnu gettext             http://www.gnu.org/software/gettext/
 
 Optional modules Windows
-    pyopenssl >= 0.10       http://pypi.python.org/pypi/pyOpenSSL
+    pyopenssl >= 0.11       http://pypi.python.org/pypi/pyOpenSSL
                             (Binaries, including the OpenSSL libraries)
 
 Optional modules Unix/Linux/OSX
diff --git a/SABHelper.py b/SABHelper.py
index 2b1fc84..2b3a8c1 100644
--- a/SABHelper.py
+++ b/SABHelper.py
@@ -16,8 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import sys
-if sys.version_info < (2,4):
-    print "Sorry, requires Python 2.4 or higher."
+if sys.version_info < (2,5):
+    print "Sorry, requires Python 2.5 or higher."
     sys.exit(1)
 
 import os
diff --git a/SABnzbd.py b/SABnzbd.py
index 553f8a2..d605845 100755
--- a/SABnzbd.py
+++ b/SABnzbd.py
@@ -16,8 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import sys
-if sys.version_info < (2,4):
-    print "Sorry, requires Python 2.4 or higher."
+if sys.version_info < (2,5):
+    print "Sorry, requires Python 2.5 or higher."
     sys.exit(1)
 
 import logging
@@ -37,7 +37,7 @@ except ValueError:
     print "Sorry, requires Python module Cheetah 2.0rc7 or higher."
     sys.exit(1)
 except:
-    print "The following modules need to be installed: Cheetah, cherrypy(included, unpack the zip), sqlite(if python 2.4)"
+    print "The following modules need to be installed: Cheetah, cherrypy(included, unpack the zip)"
     sys.exit(1)
 
 import cherrypy
@@ -56,7 +56,7 @@ except:
         from pysqlite2.dbapi2 import version as sqlite3_version
     except:
         if os.name != 'nt':
-            print "Sorry, requires Python module sqlite3 (pysqlite2 in python2.4)"
+            print "Sorry, requires Python module sqlite3"
             print "Try: apt-get install python-pysqlite2"
             sys.exit(1)
         else: