summaryrefslogtreecommitdiff
path: root/lib/spack/llnl/util/tty
diff options
context:
space:
mode:
authorTodd Gamblin <gamblin2@llnl.gov>2021-07-08 15:12:30 -0700
committerGitHub <noreply@github.com>2021-07-08 22:12:30 +0000
commit24c01d57cfb99946eff3af7ec62b71ae6ec72ed8 (patch)
treea9cbe1b7ef49d14c55fada060476b22fa57ef95e /lib/spack/llnl/util/tty
parent620836a80960396487b5eeba41c2a57c0b4674d2 (diff)
downloadspack-24c01d57cfb99946eff3af7ec62b71ae6ec72ed8.tar.gz
spack-24c01d57cfb99946eff3af7ec62b71ae6ec72ed8.tar.bz2
spack-24c01d57cfb99946eff3af7ec62b71ae6ec72ed8.tar.xz
spack-24c01d57cfb99946eff3af7ec62b71ae6ec72ed8.zip
imports: sort imports everywhere in Spack (#24695)
* fix remaining flake8 errors * imports: sort imports everywhere in Spack We enabled import order checking in #23947, but fixing things manually drives people crazy. This used `spack style --fix --all` from #24071 to automatically sort everything in Spack so PR submitters won't have to deal with it. This should go in after #24071, as it assumes we're using `isort`, not `flake8-import-order` to order things. `isort` seems to be more flexible and allows `llnl` mports to be in their own group before `spack` ones, so this seems like a good switch.
Diffstat (limited to 'lib/spack/llnl/util/tty')
-rw-r--r--lib/spack/llnl/util/tty/__init__.py5
-rw-r--r--lib/spack/llnl/util/tty/colify.py3
-rw-r--r--lib/spack/llnl/util/tty/color.py2
-rw-r--r--lib/spack/llnl/util/tty/log.py9
-rw-r--r--lib/spack/llnl/util/tty/pty.py4
5 files changed, 12 insertions, 11 deletions
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