argparse-from-file 1.2__tar.gz → 1.4__tar.gz

{argparse_from_file-1.2 → argparse_from_file-1.4}/Makefile

@@ -1,5 +1,6 @@
 NAME = $(shell basename $(CURDIR))
-PYFILES = $(subst -,_,$(NAME)).py
+PYNAME =  $(subst -,_,$(NAME))
+PYFILES = $(wildcard $(PYNAME)/[^_]*.py)
 
 check:
 	ruff check $(PYFILES)
@@ -19,4 +20,4 @@ format::
 	ruff check --select I --fix $(PYFILES) && ruff format $(PYFILES)
 
 clean::
-	@rm -vrf *.egg-info build/ dist/ __pycache__/
+	@rm -vrf *.egg-info build/ dist/ __pycache__/ */__pycache__

{argparse_from_file-1.2/argparse_from_file.egg-info → argparse_from_file-1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argparse-from-file
-Version: 1.2
+Version: 1.4
 Summary: Wrapper for Python's argparse to also read arguments from a file
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License-Expression: GPL-3.0-or-later
@@ -57,11 +57,11 @@ which is the only addition to the standard
 [`ArgumentParser()`][argparser] API:
 
 ```python
-# Use a specific file path
-parser = argparse.ArgumentParser(from_file='/path/to/my/config', ..)
+# Use a specific () file path
+parser = argparse.ArgumentParser(from_file='/path/to/myprog.conf', ..)
 
 # Use a file relative to the user's config directory
-parser = argparse.ArgumentParser(from_file='my-app.conf', ..)
+parser = argparse.ArgumentParser(from_file='myprog.conf', ..)
 ```
 
 The `from_file` argument accepts a string or a [`pathlib.Path`][pathlib].
@@ -76,10 +76,11 @@ clarity.
 
 Example `~/.config/myprog-flags.conf`:
 ```
---verbose
-
 # Always run with foo set to 123
 --foo 123
+
+# Default to verbose output
+--verbose
 ```
 
 ## Customizing the Help Message

{argparse_from_file-1.2 → argparse_from_file-1.4}/README.md

@@ -44,11 +44,11 @@ which is the only addition to the standard
 [`ArgumentParser()`][argparser] API:
 
 ```python
-# Use a specific file path
-parser = argparse.ArgumentParser(from_file='/path/to/my/config', ..)
+# Use a specific () file path
+parser = argparse.ArgumentParser(from_file='/path/to/myprog.conf', ..)
 
 # Use a file relative to the user's config directory
-parser = argparse.ArgumentParser(from_file='my-app.conf', ..)
+parser = argparse.ArgumentParser(from_file='myprog.conf', ..)
 ```
 
 The `from_file` argument accepts a string or a [`pathlib.Path`][pathlib].
@@ -63,10 +63,11 @@ clarity.
 
 Example `~/.config/myprog-flags.conf`:
 ```
---verbose
-
 # Always run with foo set to 123
 --foo 123
+
+# Default to verbose output
+--verbose
 ```
 
 ## Customizing the Help Message

argparse_from_file-1.4/argparse_from_file/__init__.py

@@ -0,0 +1,2 @@
+from argparse import *  # type: ignore
+from .argparse import ArgumentParser  # type: ignore

argparse_from_file-1.2/argparse_from_file.py → argparse_from_file-1.4/argparse_from_file/argparse.py

@@ -15,7 +15,7 @@ PLACEHOLDER = '#FROM_FILE_PATH#'
 
 
 # Get program name. This function is copied (but very modified) from argparse 3.14.0
-def _prog_name():
+def _prog_name() -> str:
     try:
         modspec = sys.modules['__main__'].__spec__
     except (KeyError, AttributeError):
@@ -23,10 +23,10 @@ def _prog_name():
         # no good answer here, so fall back to the default
         modspec = None
 
-    if not modspec or modspec.name == '__main__':
+    if not modspec or (name := modspec.name) == '__main__':
         return os.path.basename(sys.argv[0])
 
-    return modspec.name.removesuffix('.__main__')
+    return name[:-9] if name.endswith('.__main__') else name
 
 
 class ArgumentParser(argparse.ArgumentParser):
@@ -35,9 +35,9 @@ class ArgumentParser(argparse.ArgumentParser):
     def __init__(self, *args, **kwargs):
         self._argv = []
 
-        # Only set up "from file" stuff once, for the top-level
-        if ArgumentParser._top:
-            ArgumentParser._top = False
+        # Only set up "from file" stuff once, for the top-level/main ArgumentParser()
+        if __class__._top:
+            __class__._top = False
 
             # from_file = 'path-to/file': Use this as "from file" name/path. If
             #   relative then wrt platform specific user config dir.
@@ -79,7 +79,7 @@ class ArgumentParser(argparse.ArgumentParser):
 
             self.from_file_path = from_file_path
 
-        return super().__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def parse_args(self, args=None, namespace=None):  # type: ignore[override]
         if args is None and self._argv:
@@ -89,8 +89,3 @@ class ArgumentParser(argparse.ArgumentParser):
             self._argv.clear()
 
         return super().parse_args(args, namespace)
-
-
-def __getattr__(name: str):
-    "Proxy all other attributes from argparse module."
-    return getattr(argparse, name)

{argparse_from_file-1.2 → argparse_from_file-1.4/argparse_from_file.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argparse-from-file
-Version: 1.2
+Version: 1.4
 Summary: Wrapper for Python's argparse to also read arguments from a file
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License-Expression: GPL-3.0-or-later
@@ -57,11 +57,11 @@ which is the only addition to the standard
 [`ArgumentParser()`][argparser] API:
 
 ```python
-# Use a specific file path
-parser = argparse.ArgumentParser(from_file='/path/to/my/config', ..)
+# Use a specific () file path
+parser = argparse.ArgumentParser(from_file='/path/to/myprog.conf', ..)
 
 # Use a file relative to the user's config directory
-parser = argparse.ArgumentParser(from_file='my-app.conf', ..)
+parser = argparse.ArgumentParser(from_file='myprog.conf', ..)
 ```
 
 The `from_file` argument accepts a string or a [`pathlib.Path`][pathlib].
@@ -76,10 +76,11 @@ clarity.
 
 Example `~/.config/myprog-flags.conf`:
 ```
---verbose
-
 # Always run with foo set to 123
 --foo 123
+
+# Default to verbose output
+--verbose
 ```
 
 ## Customizing the Help Message

{argparse_from_file-1.2 → argparse_from_file-1.4}/argparse_from_file.egg-info/SOURCES.txt

@@ -1,8 +1,11 @@
 .gitignore
 Makefile
 README.md
-argparse_from_file.py
 pyproject.toml
+test.py
+argparse_from_file/__init__.py
+argparse_from_file/argparse.py
+argparse_from_file/py.typed
 argparse_from_file.egg-info/PKG-INFO
 argparse_from_file.egg-info/SOURCES.txt
 argparse_from_file.egg-info/dependency_links.txt

argparse_from_file-1.4/test.py

@@ -0,0 +1,10 @@
+#!/usr/bin/python
+import argparse_from_file as argparse
+
+opt = argparse.ArgumentParser()
+opt.add_argument('-b', '--bool', action='store_true', help='sample bool option')
+opt.add_argument('-s', '--str', help='sample str option')
+print(opt.parse_args())
+
+# Ensure external argparse constants are accessible
+print(argparse.SUPPRESS)