csvpath 0.0.475__tar.gz → 0.0.476__tar.gz

{csvpath-0.0.475 → csvpath-0.0.476}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: csvpath
-Version: 0.0.475
+Version: 0.0.476
 Summary: A declarative language for data extraction and validation of CSV files
 Author: David Kershaw
 Author-email: dk107dk@hotmail.com

{csvpath-0.0.475 → csvpath-0.0.476}/csvpath/csvpath.py

@@ -232,11 +232,12 @@ class CsvPath(CsvPathPublic, ErrorCollector):  # pylint: disable=R0902, R0904
         #
         # the config.ini file loaded as a ConfigParser instance
         #
-        # we're moving this to a property can set up there. we
         # definitely do not want this coming from CsvPaths because
         # we want to be able to override config.ini specifically for
-        # this instance, if needed.
-        self._config = None
+        # this instance, if needed; however, we do want to be able
+        # to pass in a config object that has been configured in some
+        # way.
+        self._config = config
         #
         # there are two logger components one for CsvPath and one for CsvPaths.
         # the default levels are set in config.ini. to change the levels pass LogUtility

{csvpath-0.0.475 → csvpath-0.0.476}/csvpath/csvpaths.py

@@ -122,7 +122,13 @@ class CsvPaths(CsvPathsPublic, CsvPathsCoordinator):
     # pylint: disable=too-many-instance-attributes
 
     def __init__(
-        self, *, delimiter=",", quotechar='"', skip_blank_lines=True, print_default=True
+        self,
+        *,
+        delimiter=",",
+        quotechar='"',
+        skip_blank_lines=True,
+        print_default=True,
+        config: Config = None,
     ):
         self.paths_manager = PathsManager(csvpaths=self)
         self.file_manager = FileManager(csvpaths=self)
@@ -132,7 +138,7 @@ class CsvPaths(CsvPathsPublic, CsvPathsCoordinator):
         self.quotechar = quotechar
         self.skip_blank_lines = skip_blank_lines
         self.current_matcher: CsvPath = None
-        self._config = Config()
+        self._config = Config() if config is None else config
         self.logger = LogUtility.logger(self)
         self.logger.info("initialized CsvPaths")
         self._errors = []
@@ -155,6 +161,11 @@ class CsvPaths(CsvPathsPublic, CsvPathsCoordinator):
             delimiter=self.delimiter,
             quotechar=self.quotechar,
             skip_blank_lines=self.skip_blank_lines,
+            #
+            # in the usual case we don't want csvpaths and its csvpath children
+            # to share the same config. sharing doesn't offer much. the flexibility
+            # of having separate configs is valuable.
+            #
             config=None,
             print_default=self.print_default,
         )

{csvpath-0.0.475 → csvpath-0.0.476}/csvpath/matching/functions/function_factory.py

@@ -80,7 +80,7 @@ from .misc.random import Random
 from .misc.nonef import Nonef
 from .misc.intf import Int
 from .misc.importf import Import
-from .testing.debug import Debug, BriefStackTrace, VoteStack, DoWhenStack
+from .testing.debug import Debug, BriefStackTrace, VoteStack, DoWhenStack, Log
 from .validity.failed import Failed
 from .validity.fail import Fail, FailAll
 
@@ -350,6 +350,8 @@ class FunctionFactory:
             f = Put(matcher, name, child)
         elif name == "debug":
             f = Debug(matcher, name, child)
+        elif name == "log":
+            f = Log(matcher, name, child)
         elif name == "brief_stack_trace":
             f = BriefStackTrace(matcher, name, child)
         elif name == "vote_stack":

{csvpath-0.0.475 → csvpath-0.0.476}/csvpath/matching/functions/testing/debug.py

@@ -6,6 +6,32 @@ from csvpath.matching.util.expression_utility import ExpressionUtility
 from csvpath.matching.productions import Equality
 
 
+class Log(SideEffect):
+    """logs a msg at a log level, defaulting to info"""
+
+    def check_valid(self) -> None:
+        self.validate_one_or_two_args()
+        super().check_valid()
+
+    def _produce_value(self, skip=None) -> None:
+        self.value = self.matches(skip=skip)
+
+    def _decide_match(self, skip=None) -> None:
+        msg = self._value_one(skip=skip)
+        level = self._value_two(skip=skip)
+        if level in [None, "info"]:
+            self.matcher.csvpath.logger.info(msg)
+        elif level == "debug":
+            self.matcher.csvpath.logger.debug(msg)
+        elif level in ["warn", "warning"]:
+            self.matcher.csvpath.logger.warning(msg)
+        elif level == "error":
+            self.matcher.csvpath.logger.error(msg)
+        else:
+            self.matcher.csvpath.logger.info(msg)
+        self.match = self.default_match()
+
+
 class Debug(SideEffect):
     """sets the logging level"""
 

{csvpath-0.0.475 → csvpath-0.0.476}/csvpath/util/config.py

@@ -85,8 +85,8 @@ class Config:
         return self._load
 
     @load.setter
-    def load(self, l:bool) -> None:
-        self._load = l
+    def load(self, lo: bool) -> None:
+        self._load = lo
 
     def reload(self):
         self._config = RawConfigParser()
@@ -114,19 +114,23 @@ class Config:
                 ret = s
             return ret
         except KeyError:
-            raise ConfigurationException(
-                f"Check config at {self.config_path} for [{section}][{name}]"
+            print(
+                f"WARNING: Check config at {self.config_path} for [{section}][{name}]"
             )
 
+    def save_config(self) -> None:
+        with open(self.configpath, "w") as f:
+            self._config.write(f)
+
     def _create_default_config(self) -> None:
         directory = ""
-        file = ""
+        name = ""
         if self._configpath is None or self._configpath.strip() == "":
-            raise ConfiguationException("Config path cannot be None")
+            raise ConfigurationException("Config path cannot be None")
         if self._configpath.find(os.sep) > 0:
             s = self._configpath.rfind(os.sep)
             directory = self._configpath[0:s]
-            name = self._configpath[s+1:]
+            name = self._configpath[s + 1 :]
         if directory != "":
             if not path.exists(directory):
                 os.makedirs(directory)
@@ -189,7 +193,9 @@ path =
 
     def _load_config(self, norecurse=False):
         if self._load is False:
-            print("WARNING: _load_config called on a config instance that is set to not load")
+            print(
+                "WARNING: _load_config called on a config instance that is set to not load"
+            )
             return
         self._assure_config_file_path()
         #
@@ -218,9 +224,10 @@ path =
         # not blowing up when absent seems reasonable.
         try:
             self.function_imports = self._get(Sections.FUNCTIONS.value, "imports")
-            print(f"config fuc im: {self.function_imports}")
         except Exception:
-            print("WARNING: config cannot load [functions][imports] from {self.configpath}")
+            print(
+                "WARNING: config cannot load [functions][imports] from {self.configpath}"
+            )
             pass
         # likewise caching.
         try:

{csvpath-0.0.475 → csvpath-0.0.476}/csvpath/util/printer.py

@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
 import sys
+from .config_exception import ConfigurationException
 
 
 class Printer(ABC):
@@ -75,3 +76,28 @@ class TestPrinter(Printer):
 
     def print_to(self, name: str, string: str) -> None:
         self.lines.append(string)
+
+
+class LogPrinter(StdOutPrinter):
+    """logs to info by default"""
+
+    def __init__(self, logger):
+        self._logger = logger
+        if logger is None:
+            raise ConfigurationException("Logger cannot be None")
+        super().__init__()
+
+    def print_to(self, name: str, msg: str) -> None:
+        self._count += 1
+        if name in ["info", None]:
+            self._logger.info(msg)
+        elif name == "debug":
+            self._logger.debug(msg)
+        elif name in ["warn", "warning"]:
+            self._logger.warning(msg)
+        elif name == "error":
+            self._logger.error(msg)
+        else:
+            self._logger.info(msg)
+
+        self._last_line = msg

{csvpath-0.0.475 → csvpath-0.0.476}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "csvpath"
-version = "0.0.475"
+version = "0.0.476"
 description = "A declarative language for data extraction and validation of CSV files"
 authors = ["David Kershaw <dk107dk@hotmail.com>"]
 readme = "README.md"