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

@@ -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 = """

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
 
 

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