Improved type hints.

pyVersioning/AppVeyor.py

@@ -29,7 +29,8 @@
 # ==================================================================================================================== #
 #
 """AppVeyor specific code to collect the build environment."""
-from os import environ
+from os     import environ
+from typing import Optional as Nullable
 
 from pyTooling.Decorators import export
 
@@ -54,21 +55,17 @@ def getGitHash(self) -> str:
 		except KeyError as ex:
 			raise ServiceException from ex
 
-	def getGitBranch(self) -> str:
+	def getGitBranch(self) -> Nullable[str]:
 		try:
 			return environ['APPVEYOR_REPO_BRANCH']
 		except KeyError:
-			pass
+			return None
 
-		return None
-
-	def getGitTag(self) -> str:
+	def getGitTag(self) -> Nullable[str]:
 		try:
 			return environ['APPVEYOR_REPO_TAG_NAME']
 		except KeyError:
-			pass
-
-		return None
+			return None
 
 	def getGitRepository(self) -> str:
 		try:

pyVersioning/CIService.py

@@ -29,14 +29,13 @@
 # ==================================================================================================================== #
 #
 """Module for CI service base classes."""
-from dataclasses  import make_dataclass, dataclass
+from dataclasses  import make_dataclass
 from datetime     import datetime
 from os           import environ
-
-from pyTooling.MetaClasses import ExtendedType, abstractmethod
-from typing       import Dict
+from typing       import Dict, Optional as Nullable
 
 from pyTooling.Decorators import export
+from pyTooling.MetaClasses import ExtendedType, abstractmethod
 
 from pyVersioning import SelfDescriptive, GitHelper, GitShowCommand
 
@@ -75,10 +74,10 @@ def getPlatform(self) -> Platform:
 class CIService(BaseService, GitHelper):
 	"""Base-class to collect Git and other platform and environment information from CI service environment variables."""
 
-	ENV_INCLUDE_FILTER =  ()
-	ENV_EXCLUDE_FILTER =  ()
-	ENV_INCLUDES =        []
-	ENV_EXCLUDES =        []
+	ENV_INCLUDE_FILTER = ()
+	ENV_EXCLUDE_FILTER = ()
+	ENV_INCLUDES =       []
+	ENV_EXCLUDES =       []
 
 	def getEnvironment(self) -> Dict[str, str]:
 		""".. todo:: getEnvironment needs documentation"""
@@ -108,9 +107,9 @@ def func(s):
 			[(name, str) for name in filteredEnv.keys()],
 			bases=(SelfDescriptive,),
 			namespace={
-				'as_dict':        lambda self: filteredEnv,
-				'Keys':           lambda self: filteredEnv.keys(),
-				'KeyValuePairs':  lambda self: func(self)
+				'as_dict':       lambda self: filteredEnv,
+				'Keys':          lambda self: filteredEnv.keys(),
+				'KeyValuePairs': lambda self: func(self)
 			},
 			repr=True
 		)
@@ -129,11 +128,11 @@ def getCommitDate(self) -> datetime:
 		return datetime.fromtimestamp(int(datetimeString))
 
 	@abstractmethod
-	def getGitBranch(self) -> str:
+	def getGitBranch(self) -> Nullable[str]:
 		""".. todo:: getGitBranch needs documentation"""
 
 	@abstractmethod
-	def getGitTag(self) -> str:
+	def getGitTag(self) -> Nullable[str]:
 		""".. todo:: getGitTag needs documentation"""
 
 	@abstractmethod

pyVersioning/GitHub.py

@@ -64,9 +64,7 @@ def getGitBranch(self) -> Nullable[str]:
 			if ref.startswith(branchPrefix):
 				return ref[len(branchPrefix):]
 		except KeyError:
-			pass
-
-		return None
+			return None
 
 	def getGitTag(self) -> Nullable[str]:
 		tagPrefix    = "refs/tags/"
@@ -76,9 +74,7 @@ def getGitTag(self) -> Nullable[str]:
 			if ref.startswith(tagPrefix):
 				return ref[len(tagPrefix):]
 		except KeyError:
-			pass
-
-		return None
+			return None
 
 	def getGitRepository(self) -> str:
 		try:

pyVersioning/GitLab.py

@@ -67,17 +67,13 @@ def getGitBranch(self) -> Nullable[str]:
 		try:
 			return environ['CI_COMMIT_BRANCH']
 		except KeyError:
-			pass
-
-		return None
+			return None
 
 	def getGitTag(self) -> Nullable[str]:
 		try:
 			return environ['CI_COMMIT_TAG']
 		except KeyError:
-			pass
-
-		return None
+			return None
 
 	def getGitRepository(self) -> str:
 		try:

pyVersioning/Travis.py

@@ -29,7 +29,6 @@
 # ==================================================================================================================== #
 #
 """Travis  specific code to collect the build environment."""
-from datetime import datetime
 from os     import environ
 from typing import Optional as Nullable, Dict
 
@@ -63,17 +62,13 @@ def getGitBranch(self) -> Nullable[str]:
 		try:
 			return environ['TRAVIS_BRANCH']
 		except KeyError:
-			pass
-
-		return None
+			return None
 
 	def getGitTag(self) -> Nullable[str]:
 		try:
 			return environ['TRAVIS_TAG']
 		except KeyError:
-			pass
-
-		return None
+			return None
 
 	def getGitRepository(self) -> str:
 		try: