From d333450bef6696f791b7fdbf47d321e4bf11b1ee Mon Sep 17 00:00:00 2001
From: David Sangrey <rixxan@hullseals.space>
Date: Sat, 30 Dec 2023 12:21:35 -0500
Subject: [PATCH] [Nit] Clarify Shorthash Type
It can be None. Declare it can be None.
---
config/__init__.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/config/__init__.py b/config/__init__.py
index d3ba3d3d..046e7599 100644
--- a/config/__init__.py
+++ b/config/__init__.py
@@ -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