Merge pull request #1237 from RobinD42/test-circleci

trivial changes just for CI testing

CHANGES.rst

@@ -21,7 +21,7 @@ master branch for the wxWidgets source code, which wxPython is built upon, and
 which is included in the wxPython source archives. 
 
 
-New and improved stuff in this release:
+New and improved in this release:
 
 * Added wrappers for the OSXEnableAutomaticQuoteSubstitution,
   OSXEnableAutomaticDashSubstitution, and OSXDisableAllSmartSubstitutions
@@ -42,6 +42,7 @@ Other changes in this release:
 
 
 
+
 4.0.6 "Applesauce"
 ------------------
 * 21-May-2019

buildtools/config.py

@@ -968,3 +968,15 @@ def updateLicenseFiles(cfg):
             text += f.read() + '\n\n'
     with open('LICENSE.txt', 'w') as f:
         f.write(text)
+
+try:
+    from textwrap import indent
+except ImportError:
+    def indent(text, prefix, predicate=None):
+        if predicate is None:
+            def predicate(line):
+                return line.strip()
+        def prefixed_lines():
+            for line in text.splitlines(True):
+                yield (prefix + line if predicate(line) else line)
+        return ''.join(prefixed_lines())

wscript

@@ -9,9 +9,8 @@
 
 import sys
 import os
-import textwrap
 
-from buildtools.config import Config, runcmd, msg
+from buildtools.config import Config, runcmd, msg, indent
 cfg = Config(True)
 
 #-----------------------------------------------------------------------------
@@ -539,7 +538,7 @@ def build(bld):
     if not isWindows:
         cmd = ' '.join(bld.env.CC) + ' --version'
         copmpiler = runcmd(cmd, getOutput=True, echoCmd=False)
-        copmpiler = textwrap.indent(copmpiler, ' '*5)
+        copmpiler = indent(copmpiler, ' '*5)
         msg("**** Compiler: {}\n{}".format(cmd, copmpiler))
 
     # Copy the license files from wxWidgets