From 7d9f22484191fb8a22f17fd551fc61d39c540a5f Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Mon, 6 Feb 2012 01:39:25 +0100 Subject: [PATCH] we require python >= 2.4 now --- ChangeLog | 2 ++ wscript | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee6f20da..a314b6e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ NEW IN WAF 1.7.0 ---------------- * Do not load the compat15 tool by default +* Minor API cleanup +* Require Python >= 2.4 NEW IN WAF 1.6.11 ----------------- diff --git a/wscript b/wscript index 2ffe33ff..992ec95f 100644 --- a/wscript +++ b/wscript @@ -210,10 +210,11 @@ def sfilter(path): f.close() if path.endswith('.py') : - cnt = process_decorators(cnt) - - if cnt.find('set(') > -1: - cnt = 'import sys\nif sys.hexversion < 0x020400f0: from sets import Set as set\n' + cnt + # WARNING: since we now require python 2.4, we do not process the decorators anymore + # if you need such a thing, uncomment the code below: + #cnt = process_decorators(cnt) + #if cnt.find('set(') > -1: + # cnt = 'import sys\nif sys.hexversion < 0x020400f0: from sets import Set as set\n' + cnt cnt = '#! /usr/bin/env python\n# encoding: utf-8\n# WARNING! Do not edit! http://waf.googlecode.com/git/docs/wafbook/single.html#_obtaining_the_waf_file\n\n' + cnt return (io.BytesIO(cnt.encode('utf-8')), len(cnt), cnt)