github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 'globals' instead of overwriting the default (#3773)

Browse Source
This commit is contained in:
Mike Fährmann
2023-03-16 18:37:00 +01:00
parent dcb8af659a
commit a1ca2404f9
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/configuration.rst
View File

@@ -4740,15 +4740,13 @@ Type
Example Example
* ``"~/.local/share/gdl-globals.py"`` * ``"~/.local/share/gdl-globals.py"``
* ``"gdl-globals"`` * ``"gdl-globals"``
Default
The ``GLOBALS`` dict in
`util.py <../gallery_dl/util.py>`__
Description Description
Path to or name of an | Path to or name of an
`importable <https://docs.python.org/3/reference/import.html>`__ `importable <https://docs.python.org/3/reference/import.html>`__
Python module whose namespace gets used as an alternative Python module,
|globals parameter|__ | whose namespace,
for compiled Python expressions. in addition to the ``GLOBALS`` dict in `util.py <../gallery_dl/util.py>`__,
gets used as |globals parameter|__ for compiled Python expressions.
.. |globals parameter| replace:: ``globals`` parameter .. |globals parameter| replace:: ``globals`` parameter
.. __: https://docs.python.org/3/library/functions.html#eval .. __: https://docs.python.org/3/library/functions.html#eval

2
gallery_dl/__init__.py
View File

@@ -120,7 +120,7 @@ def main():
# eval globals # eval globals
path = config.get((), "globals") path = config.get((), "globals")
if path: if path:
util.GLOBALS = util.import_file(path).__dict__ util.GLOBALS.update(util.import_file(path).__dict__)
# loglevels # loglevels
output.configure_logging(args.loglevel) output.configure_logging(args.loglevel)