diff options
Diffstat (limited to 'lib/spack/llnl/util')
-rw-r--r-- | lib/spack/llnl/util/argparsewriter.py | 2 | ||||
-rw-r--r-- | lib/spack/llnl/util/filesystem.py | 5 | ||||
-rw-r--r-- | lib/spack/llnl/util/lang.py | 7 | ||||
-rw-r--r-- | lib/spack/llnl/util/link_tree.py | 4 | ||||
-rw-r--r-- | lib/spack/llnl/util/lock.py | 8 | ||||
-rw-r--r-- | lib/spack/llnl/util/tty/__init__.py | 5 | ||||
-rw-r--r-- | lib/spack/llnl/util/tty/colify.py | 3 | ||||
-rw-r--r-- | lib/spack/llnl/util/tty/color.py | 2 | ||||
-rw-r--r-- | lib/spack/llnl/util/tty/log.py | 9 | ||||
-rw-r--r-- | lib/spack/llnl/util/tty/pty.py | 4 |
10 files changed, 26 insertions, 23 deletions
diff --git a/lib/spack/llnl/util/argparsewriter.py b/lib/spack/llnl/util/argparsewriter.py index 9b90096460..6d44713e39 100644 --- a/lib/spack/llnl/util/argparsewriter.py +++ b/lib/spack/llnl/util/argparsewriter.py @@ -5,9 +5,9 @@ from __future__ import print_function -import re import argparse import errno +import re import sys from six import StringIO diff --git a/lib/spack/llnl/util/filesystem.py b/lib/spack/llnl/util/filesystem.py index c7ecf09af2..0ebc35a040 100644 --- a/lib/spack/llnl/util/filesystem.py +++ b/lib/spack/llnl/util/filesystem.py @@ -4,9 +4,9 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import collections import errno -import hashlib import glob import grp +import hashlib import itertools import numbers import os @@ -19,10 +19,11 @@ import tempfile from contextlib import contextmanager import six + from llnl.util import tty from llnl.util.lang import dedupe, memoized -from spack.util.executable import Executable +from spack.util.executable import Executable if sys.version_info >= (3, 3): from collections.abc import Sequence # novm diff --git a/lib/spack/llnl/util/lang.py b/lib/spack/llnl/util/lang.py index b20cd91db4..00b0490600 100644 --- a/lib/spack/llnl/util/lang.py +++ b/lib/spack/llnl/util/lang.py @@ -5,14 +5,15 @@ from __future__ import division +import functools +import inspect import multiprocessing import os import re -import functools -import inspect +import sys from datetime import datetime, timedelta + from six import string_types -import sys if sys.version_info < (3, 0): from itertools import izip_longest # novm diff --git a/lib/spack/llnl/util/link_tree.py b/lib/spack/llnl/util/link_tree.py index c286671401..f5a9e49fbb 100644 --- a/lib/spack/llnl/util/link_tree.py +++ b/lib/spack/llnl/util/link_tree.py @@ -7,12 +7,12 @@ from __future__ import print_function +import filecmp import os import shutil -import filecmp -from llnl.util.filesystem import traverse_tree, mkdirp, touch import llnl.util.tty as tty +from llnl.util.filesystem import mkdirp, touch, traverse_tree __all__ = ['LinkTree'] diff --git a/lib/spack/llnl/util/lock.py b/lib/spack/llnl/util/lock.py index bd3308a57f..cd390693c4 100644 --- a/lib/spack/llnl/util/lock.py +++ b/lib/spack/llnl/util/lock.py @@ -3,16 +3,16 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import os -import fcntl import errno -import time +import fcntl +import os import socket +import time from datetime import datetime import llnl.util.tty as tty -import spack.util.string +import spack.util.string __all__ = ['Lock', 'LockTransaction', 'WriteTransaction', 'ReadTransaction', 'LockError', 'LockTimeoutError', diff --git a/lib/spack/llnl/util/tty/__init__.py b/lib/spack/llnl/util/tty/__init__.py index cf70834e8d..987e226d5d 100644 --- a/lib/spack/llnl/util/tty/__init__.py +++ b/lib/spack/llnl/util/tty/__init__.py @@ -12,12 +12,13 @@ import sys import termios import textwrap import traceback -import six from datetime import datetime + +import six from six import StringIO from six.moves import input -from llnl.util.tty.color import cprint, cwrite, cescape, clen +from llnl.util.tty.color import cescape, clen, cprint, cwrite # Globals _debug = 0 diff --git a/lib/spack/llnl/util/tty/colify.py b/lib/spack/llnl/util/tty/colify.py index 56baeb5bfb..ca157e3303 100644 --- a/lib/spack/llnl/util/tty/colify.py +++ b/lib/spack/llnl/util/tty/colify.py @@ -10,10 +10,11 @@ from __future__ import division, unicode_literals import os import sys + from six import StringIO, text_type from llnl.util.tty import terminal_size -from llnl.util.tty.color import clen, cextra +from llnl.util.tty.color import cextra, clen class ColumnConfig: diff --git a/lib/spack/llnl/util/tty/color.py b/lib/spack/llnl/util/tty/color.py index ffd1b8c497..78f0e75a97 100644 --- a/lib/spack/llnl/util/tty/color.py +++ b/lib/spack/llnl/util/tty/color.py @@ -60,9 +60,9 @@ The console can be reset later to plain text with '@.'. To output an @, use '@@'. To output a } inside braces, use '}}'. """ from __future__ import unicode_literals + import re import sys - from contextlib import contextmanager import six diff --git a/lib/spack/llnl/util/tty/log.py b/lib/spack/llnl/util/tty/log.py index 28f4f06edf..947e79b8c9 100644 --- a/lib/spack/llnl/util/tty/log.py +++ b/lib/spack/llnl/util/tty/log.py @@ -13,15 +13,14 @@ import multiprocessing import os import re import select +import signal import sys import traceback -import signal from contextlib import contextmanager -from six import string_types -from six import StringIO - -from typing import Optional # novm from types import ModuleType # novm +from typing import Optional # novm + +from six import StringIO, string_types import llnl.util.tty as tty diff --git a/lib/spack/llnl/util/tty/pty.py b/lib/spack/llnl/util/tty/pty.py index 2a5fb7afa4..a0076a8b71 100644 --- a/lib/spack/llnl/util/tty/pty.py +++ b/lib/spack/llnl/util/tty/pty.py @@ -14,10 +14,10 @@ get tests done quickly, not to avoid high CPU usage. """ from __future__ import print_function -import os -import signal import multiprocessing +import os import re +import signal import sys import termios import time |