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) #-----------------------------------------------------------------------------