From 83f872fa123994a15c8996dc25934b3055a51715 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 1 Sep 2012 10:06:50 -0400 Subject: [PATCH] Bump minimum Python version to 2.6 for multiprocessing support Signed-off-by: James McCoy --- INSTALL | 2 +- RELNOTES | 2 +- docs/PLUGIN_TUTORIAL.rst | 2 +- scripts/supybot | 4 ++-- scripts/supybot-plugin-create | 4 ++-- scripts/supybot-wizard | 4 ++-- setup.py | 6 ++++-- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/INSTALL b/INSTALL index 1b90d1941..5017e4c68 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ Common - First things first: Supybot *requires* at least Python 2.4. There + First things first: Supybot *requires* at least Python 2.6. There ain't no getting around it. You can get it from http://www.python.org/. Recommended Software diff --git a/RELNOTES b/RELNOTES index faa63730a..1e030d6f9 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,6 +1,6 @@ Version 0.83.5 -The minimum supported Python version has been bumped to 2.4. +The minimum supported Python version has been bumped to 2.6. utils.str.perlVariableSubstitute is deprecated in favor of using Python's string.Template directly. perlVariableSubstitute will be removed in a future diff --git a/docs/PLUGIN_TUTORIAL.rst b/docs/PLUGIN_TUTORIAL.rst index 3e8959786..1911ae7e2 100644 --- a/docs/PLUGIN_TUTORIAL.rst +++ b/docs/PLUGIN_TUTORIAL.rst @@ -325,7 +325,7 @@ information on using wrap check out the wrap tutorial (The astute Python programmer may note that this is very much like a decorator, and that's precisely what it is. However, we developed this before decorators existed and haven't changed the syntax due to our earlier requirement to stay compatible -with Python 2.3. As we now require Python 2.4 or greater, this may eventually +with Python 2.3. As we now require Python 2.6 or greater, this may eventually change to support work via decorators.) Now let's create a command with some arguments and see how we use those in our diff --git a/scripts/supybot b/scripts/supybot index 7b32d2858..c704077f4 100644 --- a/scripts/supybot +++ b/scripts/supybot @@ -44,8 +44,8 @@ import shutil import signal import cStringIO as StringIO -if sys.version_info < (2, 4, 0): - sys.stderr.write('This program requires Python >= 2.4.0') +if sys.version_info < (2, 6, 0): + sys.stderr.write('This program requires Python >= 2.6.0') sys.stderr.write(os.linesep) sys.exit(-1) diff --git a/scripts/supybot-plugin-create b/scripts/supybot-plugin-create index 92aa431ae..78f822fb8 100644 --- a/scripts/supybot-plugin-create +++ b/scripts/supybot-plugin-create @@ -43,8 +43,8 @@ def error(s): sys.stderr.write(os.linesep) sys.exit(-1) -if sys.version_info < (2, 4, 0): - error('This script requires Python 2.4 or newer.') +if sys.version_info < (2, 6, 0): + error('This script requires Python 2.6 or newer.') import supybot.conf as conf from supybot.questions import * diff --git a/scripts/supybot-wizard b/scripts/supybot-wizard index f19af729e..7d8c0ae4b 100644 --- a/scripts/supybot-wizard +++ b/scripts/supybot-wizard @@ -39,8 +39,8 @@ def error(s): sys.stderr.write(os.linesep) sys.exit(-1) -if sys.version_info < (2, 4, 0): - error('This program requires Python >= 2.4.0') +if sys.version_info < (2, 6, 0): + error('This program requires Python >= 2.6.0') import supybot diff --git a/setup.py b/setup.py index 973edf94d..513c0a166 100644 --- a/setup.py +++ b/setup.py @@ -30,10 +30,12 @@ # POSSIBILITY OF SUCH DAMAGE. ### +import os import sys -if sys.version_info < (2, 4, 0): - sys.stderr.write("Supybot requires Python 2.4 or newer.\n") +if sys.version_info < (2, 6, 0): + sys.stderr.write("Supybot requires Python 2.6 or newer.") + sys.stderr.write(os.linesep) sys.exit(-1) import textwrap