ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-13 07:47:14 +03:00
Code Issues Projects Releases Wiki Activity

[Nit] Clarify Shorthash Type

Browse Source 
It can be None. Declare it can be None.
This commit is contained in:
David Sangrey 2023-12-30 12:21:35 -05:00
parent 2e7c9ef38b
commit d333450bef
No known key found for this signature in database
GPG Key ID: 6A95067A0EF46336
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/__init__.py
View File

@ -81,15 +81,15 @@ else:
_T = TypeVar('_T')
def git_shorthash_from_head() -> str:
def git_shorthash_from_head() -> str | None:
"""
Determine short hash for current git HEAD.
Includes `.DIRTY` if any changes have been made from HEAD
:return: str - None if we couldn't determine the short hash.
:return: str | None: None if we couldn't determine the short hash.
"""
shorthash: str = None # type: ignore
shorthash: str | None = None
try:
git_cmd = subprocess.Popen(
@ -106,7 +106,7 @@ def git_shorthash_from_head() -> str:
shorthash = out.decode().rstrip('\n')
if re.match(r'^[0-9a-f]{7,}$', shorthash) is None:
logger.error(f"'{shorthash}' doesn't look like a valid git short hash, forcing to None")
shorthash = None # type: ignore
shorthash = None
if shorthash is not None:
with contextlib.suppress(Exception):
@ -134,7 +134,7 @@ def appversion() -> semantic_version.Version:
# Running frozen, so we should have a .gitversion file
# Yes, .parent because if frozen we're inside library.zip
with open(pathlib.Path(sys.path[0]).parent / GITVERSION_FILE, encoding='utf-8') as gitv:
shorthash = gitv.read()
shorthash: str | None = gitv.read()
else:
# Running from source. Use git rev-parse --short HEAD