[taler-taler-util] branch master updated: Drop ‘TALER_DATADIR’ from talerconfig.py

[gnunet]

This is an automated email from the git hooks/post-receive script.

ttn pushed a commit to branch master
in repository taler-util.

The following commit(s) were added to refs/heads/master by this push:
     new 2369b6d  Drop ‘TALER_DATADIR’ from talerconfig.py
2369b6d is described below

commit 2369b6d65baaf5698b29cd6909b62959593f4911
Author: Thien-Thi Nguyen <ttn@gnu.org>
AuthorDate: Tue Feb 22 07:26:01 2022 -0500

    Drop ‘TALER_DATADIR’ from talerconfig.py
    
    * doc/doc.org (class =TalerConfig=, reading):
      Delete documentation re ‘TALER_DATADIR’.
    
    * taler/util/talerconfig.py (TALER_DATADIR): Delete var
      and ‘try’..‘except’ block that tries to ‘import’ it.
      (TalerConfig.load_defaults): Remove support for ‘TALER_DATADIR’.
---
 doc/doc.org               | 10 ----------
 taler/util/talerconfig.py | 13 -------------
 2 files changed, 23 deletions(-)

diff --git a/doc/doc.org b/doc/doc.org
index cfe53a3..8522ead 100644
--- a/doc/doc.org
+++ b/doc/doc.org
@@ -375,16 +375,6 @@ The canonical locations are:
   The same would result if =TALER_PREFIX= were =/usr/local=
   (the suffixing is unconditional).
 
-- if module =talerpaths= exists and exports =TALER_DATADIR=, then the
-  directory named by suffixing its value with =share/taler/config.d=
-
-  FIXME: Comment in code: "not clear if this is a good idea" --
-  Maybe we should remove this functionality or leave it undocumented?
-  -> yes, I suggest not to advertise this feature, and equally to
-     remove it from the code.  It is nowhere used, and there is no
-     need to pass through a _module_ just to obtain a value that
-     could be read from a env variable.
-
 If =load_defaults= cannot find something to load it logs a warning
 "no base directory found".
 
diff --git a/taler/util/talerconfig.py b/taler/util/talerconfig.py
index fa8d155..985979a 100644
--- a/taler/util/talerconfig.py
+++ b/taler/util/talerconfig.py
@@ -32,16 +32,6 @@ LOGGER = logging.getLogger(__name__)
 
 __all__ = ["TalerConfig"]
 
-TALER_DATADIR = None
-
-try:
-    # not clear if this is a good idea ...
-    from talerpaths import TALER_DATADIR as t
-
-    TALER_DATADIR = t
-except ImportError:
-    pass
-
 ##
 # Exception class for a any configuration error.
 class ConfigurationError(Exception):
@@ -438,9 +428,6 @@ class TalerConfig:
                 prefix = tmp[0]
             self.load_dir(os.path.join(prefix, "share/taler/config.d"))
             return
-        if TALER_DATADIR:
-            self.load_dir(os.path.join(TALER_DATADIR, "share/taler/config.d"))
-            return
         LOGGER.warning("no base directory found")
 
     ##

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.