From a74633e0878cc76f85d553da3a435f94ffafd037 Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Wed, 3 Nov 2021 14:26:07 +1000 Subject: [PATCH] Coding Style. - Move terminal.py from termstr package to fill3 package. - Terminal was no longer used by termstr. - Terminal could be in its own package in future. --- eris/__main__.py | 2 +- fill3/__init__.py | 2 +- {termstr => fill3}/terminal.py | 0 tests/termstr_test.py | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename {termstr => fill3}/terminal.py (100%) diff --git a/eris/__main__.py b/eris/__main__.py index 51439b9..c01b1cd 100755 --- a/eris/__main__.py +++ b/eris/__main__.py @@ -40,9 +40,9 @@ import eris.tools as tools import eris.worker as worker import eris.paged_list as paged_list import fill3 +import fill3.terminal as terminal import sorted_collection import termstr -import termstr.terminal as terminal USAGE = """ diff --git a/fill3/__init__.py b/fill3/__init__.py index c5250c6..d9e80c3 100755 --- a/fill3/__init__.py +++ b/fill3/__init__.py @@ -9,7 +9,7 @@ import os import signal import sys -import termstr.terminal as terminal +import fill3.terminal as terminal import termstr diff --git a/termstr/terminal.py b/fill3/terminal.py similarity index 100% rename from termstr/terminal.py rename to fill3/terminal.py diff --git a/tests/termstr_test.py b/tests/termstr_test.py index 9b309e1..5dffe68 100755 --- a/tests/termstr_test.py +++ b/tests/termstr_test.py @@ -7,7 +7,7 @@ import unittest os.environ["TERM"] = "xterm-256color" -import termstr.terminal as terminal +import fill3.terminal as terminal from termstr import TermStr, CharStyle import termstr