technofab/bumpver
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/bumpver.git synced 2025-12-13 23:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix catchall exceptions.

Browse source 
Using ValueError for everything caused underlying issues to be
hidden. Now there are explicit classes for each error condition.
This commit is contained in:
Manuel Barkhau 2019-03-28 23:37:58 +01:00
parent 4c03738938
commit 69fadc2de9
5 changed files with 34 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/pycalver/version.py
View file

@ -183,6 +183,10 @@ PEP440_TAGS: typ.Dict[str, str] = {
VersionInfoKW = typ.Dict[str, typ.Union[str, int, None]]
class PatternError(Exception):
pass
def _parse_pattern_groups(pattern_groups: typ.Dict[str, str]) -> typ.Dict[str, str]:
for part_name in pattern_groups.keys():
is_valid_part_name = (
@ -190,7 +194,7 @@ def _parse_pattern_groups(pattern_groups: typ.Dict[str, str]) -> typ.Dict[str, s
)
if not is_valid_part_name:
err_msg = f"Invalid part '{part_name}'"
raise ValueError(err_msg)
raise PatternError(err_msg)
items = [
(field_name, pattern_groups[part_name])
@ -203,7 +207,7 @@ def _parse_pattern_groups(pattern_groups: typ.Dict[str, str]) -> typ.Dict[str, s
if any(duplicate_fields):
err_msg = f"Multiple parts for same field {duplicate_fields}."
raise ValueError(err_msg)
raise PatternError(err_msg)
return dict(items)
@ -302,7 +306,7 @@ def parse_version_info(version_str: str, pattern: str = "{pycalver}") -> Version
err_msg = (
f"Invalid version string '{version_str}' for pattern '{pattern}'/'{regex.pattern}'"
)
raise ValueError(err_msg)
raise PatternError(err_msg)
return _parse_version_info(match.groupdict())
@ -322,7 +326,7 @@ def is_valid(version_str: str, pattern: str = "{pycalver}") -> bool:
try:
parse_version_info(version_str, pattern)
return True
except ValueError:
except PatternError:
return False
@ -439,7 +443,7 @@ def incr(
"""
try:
old_ver_nfo = parse_version_info(old_version, pattern)
except ValueError as ex:
except PatternError as ex:
log.error(str(ex))
return None