Cleanups from review

Author: timj

python/lsst/sconsUtils/builders.py

@@ -649,7 +649,7 @@ def PackageInfo(self, pythonDir, versionString=None):
     versionString = _get_version_string(versionString)
 
     if not os.path.exists(pythonDir):
-        return
+        return []
 
     # Some information can come from the pyproject file.
     toml_metadata = {}
@@ -659,18 +659,19 @@ def PackageInfo(self, pythonDir, versionString=None):
         with open("pyproject.toml", "rb") as fd:
             toml_metadata = tomllib.load(fd)
 
+    toml_project = toml_metadata.get("project", {})
     pythonPackageName = ""
-    if "project" in toml_metadata and "name" in toml_metadata["project"]:
-        pythonPackageName = toml_metadata["project"]["name"]
+    if "name" in toml_project:
+        pythonPackageName = toml_project["name"]
     else:
         if os.path.exists(os.path.join(pythonDir, "lsst")):
             pythonPackageName = "lsst_" + state.env["packageName"]
         else:
             pythonPackageName = state.env["packageName"]
         pythonPackageName = pythonPackageName.replace("_", "-")
     # The directory name is required to use "_" instead of "-"
-    eggDir = os.path.join(pythonDir, f"{pythonPackageName.replace('-', '_')}.dist-info")
-    filename = os.path.join(eggDir, "METADATA")
+    distDir = os.path.join(pythonDir, f"{pythonPackageName.replace('-', '_')}.dist-info")
+    filename = os.path.join(distDir, "METADATA")
     oldMd5 = _calcMd5(filename)
 
     def makePackageMetadata(target, source, env):
@@ -695,12 +696,9 @@ def makePackageMetadata(target, source, env):
     )
 
     # Create the entry points file if defined in the pyproject.toml file.
-    entryPoints = {}
-    if "project" in toml_metadata and "entry-points" in toml_metadata["project"]:
-        entryPoints = toml_metadata["project"]["entry-points"]
-
+    entryPoints = toml_project.get("entry-points", {})
     if entryPoints:
-        filename = os.path.join(eggDir, "entry_points.txt")
+        filename = os.path.join(distDir, "entry_points.txt")
         oldMd5 = _calcMd5(filename)
 
     def makeEntryPoints(target, source, env):