Skip to content

Commit 17fe119

Browse files
committed
switches to using usingversion instead of bespoke logic
1 parent 17e9303 commit 17fe119

File tree

5 files changed

+278
-340
lines changed

5 files changed

+278
-340
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
"Redacter",
2121
"somedirname",
2222
"somename",
23-
"userid"
23+
"userid",
24+
"usingversion"
2425
],
2526
"[python]": {
2627
"editor.defaultFormatter": "ms-python.black-formatter"

flickr_download/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
"""Init file for the flickr_download package."""
2+
3+
from usingversion import getattr_with_version
4+
5+
__getattr__ = getattr_with_version("flickr_download", __file__, __name__)

flickr_download/flick_download.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from flickr_api.flickrerrors import FlickrAPIError, FlickrError
1717
from flickr_api.objects import Person, Photo, Photoset, Walker
1818

19+
import flickr_download
1920
from flickr_download.filename_handlers import (
2021
FilenameHandler,
2122
get_filename_handler,
@@ -36,15 +37,6 @@
3637
CONFIG_FILE = "~/.flickr_download"
3738
OAUTH_TOKEN_FILE = "~/.flickr_token"
3839

39-
try:
40-
import importlib.metadata
41-
42-
__version__ = importlib.metadata.version("flickr_download")
43-
except ModuleNotFoundError:
44-
import importlib_metadata # pyright: ignore reportMissingImports
45-
46-
__version__ = importlib_metadata.version("flickr_download")
47-
4840

4941
def _init(key: str, secret: str, oauth: bool) -> bool:
5042
"""Initialize API.
@@ -481,7 +473,10 @@ def _get_arg_parser() -> argparse.ArgumentParser:
481473
)
482474
parser.add_argument("-v", "--verbose", action="store_true", help="Turns on verbose logging")
483475
parser.add_argument(
484-
"--version", action="version", version=__version__, help="Lists the version of the tool"
476+
"--version",
477+
action="version",
478+
version=flickr_download.version,
479+
help="Lists the version of the tool",
485480
)
486481
parser.set_defaults(**_load_defaults())
487482

0 commit comments

Comments
 (0)