ScriptCollection 3.5.122__py3-none-any.whl → 3.5.124__py3-none-any.whl

ScriptCollection/GeneralUtilities.py

@@ -22,7 +22,6 @@ from os.path import isfile, join, isdir
 from pathlib import Path
 from shutil import copyfile
 import typing
-from typing import TextIO
 import psutil
 from defusedxml.minidom import parse
 from OpenSSL import crypto
@@ -245,7 +244,8 @@ class GeneralUtilities:
     @staticmethod
     @check_arguments
     def print_text(text: str, print_to_stdout: bool = True):
-        GeneralUtilities.__print_text_to_console(text, print_to_stdout)
+        stream: object = sys.stdout if print_to_stdout else sys.stderr
+        GeneralUtilities.__print_text_to_console(text, stream)
 
     @staticmethod
     @check_arguments
@@ -270,14 +270,14 @@ class GeneralUtilities:
     @staticmethod
     @check_arguments
     def print_text_in_color(text: str, colorcode: int, print_to_stdout: bool = True, print_as_color: bool = True):
-        stream: TextIO = sys.stdout if print_to_stdout else sys.stderr
+        stream: object = sys.stdout if print_to_stdout else sys.stderr
         if print_as_color:
             text = f"\033[{colorcode}m{text}\033[0m"
-        GeneralUtilities.__print_text_to_console(text, stream, print_to_stdout)
+        GeneralUtilities.__print_text_to_console(text, stream)
 
     @staticmethod
     @check_arguments
-    def __print_text_to_console(text: str, stream: TextIO, print_to_stdout: bool = True):
+    def __print_text_to_console(text: str, stream: object):
         stream.write(text)
         stream.flush()
 

ScriptCollection/SCLog.py

@@ -24,7 +24,10 @@ class SCLog:
 
     def __init__(self, log_file: str = None, loglevel: LogLevel = None, add_overhead: bool = False, print_as_color: bool = True):
         self.log_file = log_file
-        self.loglevel = loglevel
+        if loglevel is None:
+            self.loglevel = loglevel
+        else:
+            self.loglevel = LogLevel.Information
         self.add_overhead = add_overhead
         self.print_as_color = print_as_color
 
@@ -45,6 +48,9 @@ class SCLog:
         if int(loglevel) > int(self.loglevel):
             return
 
+        if message.endswith("\n"):
+            GeneralUtilities.write_message_to_stderr(f"invalid line: '{message}'")  # TODO remove this
+
         part1: str = GeneralUtilities.empty_string
         part2: str = GeneralUtilities.empty_string
         part3: str = message

ScriptCollection/ScriptCollectionCore.py

@@ -33,7 +33,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "3.5.122"
+version = "3.5.124"
 __version__ = version
 
 
@@ -1543,7 +1543,7 @@ class ScriptCollectionCore:
                             reading_stdout_last_time_resulted_in_exception = False
                             if print_live_output:
                                 # print(out_line, end='\n', file=sys.stdout, flush=False)
-                                log.log(out_line+"\n", LogLevel.Information)
+                                log.log(out_line, LogLevel.Information)
                     # if print_live_output:
                     #    sys.stdout.flush()
                 except Empty:
@@ -1558,7 +1558,7 @@ class ScriptCollectionCore:
                             reading_stderr_last_time_resulted_in_exception = False
                             if print_live_output:
                                 # print(err_line, end='\n', file=sys.stdout if print_errors_as_information else sys.stderr, flush=False)
-                                log.log(err_line+"\n", LogLevel.Error if print_errors_as_information else LogLevel.Information)
+                                log.log(err_line, LogLevel.Error if print_errors_as_information else LogLevel.Information)
                     # if print_live_output:
                     #    if print_errors_as_information:
                     #        sys.stdout.flush()

{scriptcollection-3.5.122.dist-info → scriptcollection-3.5.124.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 3.5.122
+Version: 3.5.124
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke

{scriptcollection-3.5.122.dist-info → scriptcollection-3.5.124.dist-info}/RECORD

@@ -1,17 +1,17 @@
 ScriptCollection/CertificateUpdater.py,sha256=OAxrG21k_o3W3niOOGNSZzUPJlvolOWc1lRB2dMhc3g,9212
 ScriptCollection/Executables.py,sha256=ht-RZFu4g34Sr09b_L0c2QpKcjLWX-wFtKSMDMZYqsw,32266
-ScriptCollection/GeneralUtilities.py,sha256=j-8AgY-aK4MFgEg5vl2VcuahW-vCeHm3rcGbru117pM,47319
+ScriptCollection/GeneralUtilities.py,sha256=PKdzq382RYVSWeSG_6z6FiHu-SiTOi2BavJKvP-0slU,47308
 ScriptCollection/ImageUpdater.py,sha256=lel1nevTN7fgdoCDE6Xg8YY6XPsZaOQiCIyWXbmVnh0,20882
 ScriptCollection/ProcessesRunner.py,sha256=3mu4ZxzZleQo0Op6o9EYTCFiJfb6kx5ov2YfZfT89mU,1395
 ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4bQNM6RV6Y,2480
 ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
-ScriptCollection/SCLog.py,sha256=6AIeza7KJ-9q13cNnbNTXgVlJqW6EAexowyni0hKTnQ,3450
-ScriptCollection/ScriptCollectionCore.py,sha256=LKmQ3Yh6SKW_Z_BVFICbisdEkxaPCiTLOEhDEFxk0p0,127859
+ScriptCollection/SCLog.py,sha256=dfd5ulvRXVgytxUZgWOhmxPMUIUiyLknxBDaGaFJKr0,3685
+ScriptCollection/ScriptCollectionCore.py,sha256=DEyAfkveCH9lClhXeMfRqIvIwwz3IUtE980x33W4vmA,127849
 ScriptCollection/TasksForCommonProjectStructure.py,sha256=4aEuIf89jbgKE4uMYm4DlPDe9Iu1Zujo8wPOzDld09w,234867
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.122.dist-info/METADATA,sha256=k388tO8xs4bpHohNp39DFKsTYg45SaFzOzLtYrkdd6Q,7694
-scriptcollection-3.5.122.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-scriptcollection-3.5.122.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
-scriptcollection-3.5.122.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.122.dist-info/RECORD,,
+scriptcollection-3.5.124.dist-info/METADATA,sha256=kLzBhCaJrXsbJiWxY0uaxsAPjir1vQQA5oG7MVeBuJc,7694
+scriptcollection-3.5.124.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+scriptcollection-3.5.124.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
+scriptcollection-3.5.124.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.124.dist-info/RECORD,,