Fix configure.py for CPython 2.6

Based on GH #362 by emilymaier

2 files changed, 17 insertions, 3 deletions

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)
 
diff --git a/doc/news.rst b/doc/news.rst
index 18583dc7c..929036163 100644
--- a/doc/news.rst
+++ b/doc/news.rst
@@ -84,6 +84,13 @@ Version 1.11.26, Not Yet Released
 
 * Export MGF1 function mgf1_mask GH #380
 
+* Work around a problem with some antivirus programs which causes the
+  ``shutil.rmtree`` and ``os.makedirs`` Python calls to occasionally
+  fail. The could prevent ``configure.py`` from running sucessfully
+  on such systems. GH #353
+
+* Let ``configure.py`` run under CPython 2.6. GH #362
+
 Version 1.11.25, 2015-12-07
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^