Removed usage of log facility.

Author: jimdeekepler

scrolltext/config.py

@@ -3,7 +3,6 @@
 """
 from pathlib import Path
 import configparser
-import logging
 import sys
 
 
@@ -14,9 +13,6 @@
 SCROLL_SPEEDS = [.25, .20, .18, .15, .125, .1, .09, .08, .075, .07, .0675]
 
 
-log = logging.getLogger(__name__)
-
-
 initial_config = {
     "main": {"action": "linescroller", "endless": "0"},
     "cursestext": {"box": "1"},
@@ -55,7 +51,6 @@ def init_config(write_config):
 
     cfg, really_write = _read_config(config_path)
     if write_config and really_write:
-        log.info("Writing a new config '%s' using defaults", config_path)
         _write_config(cfg, config_path)
     return cfg
 
@@ -66,15 +61,11 @@ def _read_config(config_path):
     """
     really_write = False
     cfg = configparser.ConfigParser(default_section="main")
-    log.debug("try read config path: '%s'", config_path)
     read_config_files = cfg.read(config_path)
 
     if not read_config_files:
         really_write = True
-        log.info("No config file found")
         cfg.update(initial_config)
-    else:
-        log.debug("config read: '%s'", read_config_files)
     _validate(cfg)
     return cfg, really_write
 
@@ -95,19 +86,15 @@ def _validate(cfg):
             raise NameError("Section '" + section + "' is missing in config")
         _validate_section_entries(cfg, section, entries)
 
-    log.debug(cfg["main"]["action"])
-
     # NOTE: allow for several "scrolltext.text %d" sections
     # for index in range(2, 9):
     #     scrolltext_section = "scrolltext.text " + str(index)
     #     if not scrolltext_section in cfg:
     #         cfg["main"]["max_index"] = str(index - 1)
-    #         log.debug("max scrolltext.text %d", cfg["main"]["max_index"])
     #         break
     _fix_scrolltext_section(cfg, "scrolltext.text 1")
     if "cursestext" not in cfg:
         cfg["cursestext"] = {"box": "1"}
-    log.debug("cursestext draw box: %s", cfg["cursestext"].getboolean("box"))
 
 
 def _validate_section_entries(cfg, section, entries):
@@ -124,4 +111,3 @@ def _fix_scrolltext_section(cfg, section_name):
     text_lines = cfg[section_name]["text"]
     text = "".join(text_lines.split("\n"))
     cfg[section_name]["text"] = text
-    log.debug(text)

scrolltext/cursestext.py

@@ -3,16 +3,12 @@
 """
 from curses import wrapper, error
 import curses
-import logging
 from .utils import CharacterScroller, IS_WINDOWS, TermSize
 
 
 QUIT_CHARACTERS = ["\x1B", "Q", "q"]
 
 
-log = logging.getLogger(__name__)
-
-
 def curses_scroller(win, cfg):
     """
     Curses-main: render a text in a side-scrolling manner, using curses.
@@ -47,7 +43,6 @@ def do_textloop(win, cfg, term_size, scroller, min_scroll_line):
     This method loops over the scrolled text
     """
     box = cfg["cursestext"].getboolean("box")
-    term_too_small_printed = False
     for text in scroller:
         win_text = text
         # hack: When writing to the last line we prevent adding an immediate newline and thus
@@ -56,13 +51,7 @@ def do_textloop(win, cfg, term_size, scroller, min_scroll_line):
             win_text = text[:-1]
         if scroller.line >= min_scroll_line:
             _addstr_wrapper(win, scroller.line, (1 if box else 0), win_text)
-            term_too_small_printed = False
             win.redrawwin()
-        else:
-            if not term_too_small_printed:
-                log.debug("Terminal is too small  cols: %d  rows: %d",
-                          term_size.get_cols(), term_size.get_rows())
-            term_too_small_printed = True
         character = get_char(win)
         if character == curses.KEY_EXIT:
             return
@@ -89,11 +78,8 @@ def get_char(win):
     :returns: curses.KEY_EXIT, if a quit character is entered, the current character, otherwise.
     :rtype: int
     """
-    log.debug("getch")
     character = None
     character = win.getch(0, 0)
-    if character != -1:
-        log.debug("got key (%d)  type %s", character, type(character))
     if character != -1 and (chr(character) in QUIT_CHARACTERS):
         return curses.KEY_EXIT
     return character
@@ -104,7 +90,6 @@ def update_term_size(win, box, term_size):
     Updates TermSize object.
     """
     winsize = win.getmaxyx()
-    log.debug("win dimensions: (columns, rows) (%d, %d)", winsize[1], winsize[0])
     available_rows = winsize[0] - (2 if box else 1)
     available_columns = winsize[1] - (2 if box else 0)
     term_size.set_size(available_columns, available_rows)
@@ -125,19 +110,16 @@ def draw_items(win, box, min_scroll_line, scroller, term_size):
 
 
 def _addstr_wrapper(win, row, column, text):
-    log.debug("addstr to line %d", row)
     try:
         win.addstr(row, column, text)
     except:  # pylint: disable=W0702 (bare-except)
-        log.exception("Error in addstr")
+        pass
 
 
 def work(cfg):
     """Main usese curses.wrapper. See curses doc for details.
     """
     try:  # noqa: C901 ignoring 'TryExcept 42' is too complex - fix later
         wrapper(curses_scroller, cfg)
-    except error as ex:
-        log.exception(ex)
-    finally:
-        log.debug("end")
+    except error:
+        pass

scrolltext/linescroller.py

@@ -1,7 +1,6 @@
 """
 A simple side scrolling text application.
 """
-import logging
 import shutil
 from time import sleep
 from .utils import CLEAR, HOME, IS_WINDOWS, UP_ONE_ROW, CharacterScroller, TermSize
@@ -11,7 +10,6 @@
 
 
 last_term_rows = -1  # pylint: disable=C0103 (invalid-name)
-log = logging.getLogger(__name__)
 
 
 def linescroller(cfg):
@@ -70,8 +68,6 @@ def _check_input(getch):
     Use getchtimeout to get a character. If "Q" or "q" is given, then it raises SystemExit
     """
     character = getch.getch(timeout=.1)
-    if isinstance(character, int) == int:
-        log.debug("Got key '%d'", character)
     if character is not None and character in ["\033", "\x1b", "", "\r", "", " ", "Q", "q"]:
         raise RuntimeError()
 

scrolltext/utils.py

@@ -1,7 +1,6 @@
 """
 Utilities for line-based text scrollers.
 """
-import logging
 from os import getenv
 from time import time
 from scrolltext.config import get_speedsec_float, init_config
@@ -13,9 +12,6 @@
 UP_ONE_ROW = "\033[1A"
 
 
-log = logging.getLogger(__name__)
-
-
 def parse_int(var):
     """
     Calls int on var, ignores TypeError and ValueError.
@@ -40,7 +36,6 @@ def init_utils(write_config):
     """
     cfg = init_config(write_config)
     _override_from_env(cfg)
-    _init_logging(cfg)
     return cfg
 
 
@@ -63,18 +58,9 @@ def get_linenum(scroll_line_str, min_row, max_row):
         line = max_row + line + 1
     line = max(line, min_row)
     line = min(line, max_row)
-    log.debug("scroll_line_str: %s  min: %d  max: %d  line:%d",
-              scroll_line_str, min_row, max_row, line)
     return line
 
 
-def _init_logging(cfg):
-    verbose = cfg["main"].getboolean("verbose")
-    if verbose:
-        # logging.basicConfig(filename="cursesscroller.log", filemode="w", level=logging.DEBUG)
-        logging.basicConfig(filename="scrolltext.log", filemode="w", level=logging.DEBUG)
-
-
 def _override_from_env(cfg):
     _override_verbose(cfg)  # x x x  todo: recap (all of those ...)
     _override_scroll_box(cfg)
@@ -87,43 +73,37 @@ def _override_from_env(cfg):
 def _override_verbose(cfg):
     verbose = getenv("VERBOSE") == "1"
     if verbose:
-        log.debug("Using env-var 'VERBOSE'")
         cfg["main"]["verbose"] = "1"
 
 
 def _override_scroll_box(cfg):
     scroll_direction = getenv("SCROLL_BOX") == "1"
     if scroll_direction:
-        log.debug("Using env-var 'SCROLL_BOX'")
         cfg["cursestext"]["box"] = "1"
 
 
 def _override_scroll_direction(cfg):
     scroll_direction = getenv("SCROLL_DIRECTION") == "1"
     if scroll_direction:
-        log.debug("Using env-var 'SCROLL_DIRECTION'")
         cfg["scrolltext.text 1"]["direction"] = "1"
 
 
 def _override_scroll_text(cfg):
     scroll_text = getenv("SCROLL_TEXT")
     if scroll_text:
-        log.debug("Using env-var 'SCROLL_TEXT'")
         cfg["scrolltext.text 1"]["text"] = scroll_text
 
 
 def _override_scroll_line(cfg):
     scroll_line_str = getenv("SCROLL_LINE")
     if scroll_line_str:
-        log.debug("Using env-var 'SCROLL_LINE_STR'")
         cfg["scrolltext.text 1"]["line"] = scroll_line_str
 
 
 def _override_scroll_speed(cfg):
     scroll_speed = getenv("SCROLL_SPEED")
     if scroll_speed:
         scroll_speed_index = parse_int(getenv("SCROLL_SPEED"))
-        log.debug("Using env-var 'SCROLL_SPEED' with '%s'", scroll_speed)
         cfg["scrolltext.text 1"]["speed"] = str(scroll_speed_index)
 
 
@@ -154,17 +134,13 @@ def set_size(self, cols, rows):
         if self.term_rows != rows:
             self.term_rows = rows
             self.resized = True
-        if self.resized:
-            log.debug("TermSize  columns: %d  rows: %d", self.term_columns, self.term_rows)
 
     def is_resized(self):
         """
         Returns true, when the terminal window changed its size.
         """
         resized = self.resized
         self.resized = False
-        if resized:
-            log.debug("TermSize resized")
         return resized
 
     def get_cols(self):
@@ -225,12 +201,8 @@ def _resized(self, **argv):
                                 self.min_scroll_line, self.term_size.get_rows())
         if self.term_size.get_cols() != self.visible_text_length:
             self.visible_text_length = self.term_size.get_cols()
-            log.debug("visibile_text_length: %d", self.visible_text_length)
             self.num_blanks = argv["blanks"] if "blanks" in argv else self.visible_text_length
             self._update_complete_text()
-        log.debug("_resized  line: %d  columnns: %d  rows: %d  text-length %d",
-                  self.line, self.term_size.get_cols(),
-                  self.term_size.get_rows(), self.visible_text_length)
 
     def _update_complete_text(self):
         blanks = self.num_blanks * " "