From e234a65cd787261e001b27d5479212f210e09924 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 31 May 2019 08:57:15 -0700
Subject: [PATCH] Use textwrap3 on Python 2

---
 buildtools/config.py   | 11 -----------
 requirements/devel.txt |  1 +
 wscript                |  7 ++++++-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/buildtools/config.py b/buildtools/config.py
index 9209d7ee..0d99f1e7 100644
--- a/buildtools/config.py
+++ b/buildtools/config.py
@@ -969,14 +969,3 @@ def updateLicenseFiles(cfg):
     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())
diff --git a/requirements/devel.txt b/requirements/devel.txt
index 0fec2567..f0de0266 100644
--- a/requirements/devel.txt
+++ b/requirements/devel.txt
@@ -10,3 +10,4 @@ pytest
 pytest-xdist
 pytest-timeout
 pathlib2 ; python_version < "3"
+textwrap3 ; python_version < "3"
diff --git a/wscript b/wscript
index 67baae99..f518712c 100644
--- a/wscript
+++ b/wscript
@@ -10,7 +10,12 @@
 import sys
 import os
 
-from buildtools.config import Config, runcmd, msg, indent
+try:
+    from textwrap import indent
+except ImportError:
+    from textwrap3 import indent
+
+from buildtools.config import Config, runcmd, msg
 cfg = Config(True)
 
 #-----------------------------------------------------------------------------