From ec326f7e2afa7553c646e5ed841e924a43216850 Mon Sep 17 00:00:00 2001 From: Jack Lloyd Date: Mon, 4 Jan 2016 11:07:32 -0500 Subject: Fix configure.py for CPython 2.6 Based on GH #362 by emilymaier --- configure.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'configure.py') diff --git a/configure.py b/configure.py index c76cad0aa..28fe28b17 100755 --- a/configure.py +++ b/configure.py @@ -8,7 +8,14 @@ Configuration program for botan Botan is released under the Simplified BSD License (see license.txt) -Tested with CPython 2.7 and 3.4. CPython 2.6 and earlier are not supported. +This script is regularly tested with CPython 2.7 and 3.5, and +occasionally tested with CPython 2.6 and PyPy 4. + +Support for CPython 2.6 will be dropped eventually, but is kept up for as +long as reasonably convenient. + +CPython 2.5 and earlier are not supported. + On Jython target detection does not work (use --os and --cpu). """ @@ -1801,7 +1808,7 @@ def main(argv = None): if argv is None: argv = sys.argv - class BotanConfigureLogHandler(logging.StreamHandler): + class BotanConfigureLogHandler(logging.StreamHandler, object): def emit(self, record): # Do the default stuff first super(BotanConfigureLogHandler, self).emit(record) @@ -1809,7 +1816,7 @@ def main(argv = None): if record.levelno >= logging.ERROR: sys.exit(1) - lh = BotanConfigureLogHandler(stream = sys.stdout) + lh = BotanConfigureLogHandler(sys.stdout) lh.setFormatter(logging.Formatter('%(levelname) 7s: %(message)s')) logging.getLogger().addHandler(lh) -- cgit v1.2.3