Better typing.

cuthbertLab · Jun 14, 2024 · 2b60acf · 2b60acf
1 parent d1ae529
commit 2b60acf
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/music21/figuredBass/resolution.py b/music21/figuredBass/resolution.py
@@ -37,7 +37,7 @@
 def augmentedSixthToDominant(
     augSixthPossib,
     augSixthType: int | None = None,
-    augSixthChordInfo: list[pitch.Pitch, None] | None = None
+    augSixthChordInfo: list[pitch.Pitch | None] | None = None
 ) -> tuple[pitch.Pitch, ...]:
     '''
     Resolves French (augSixthType = 1), German (augSixthType = 2), and Swiss (augSixthType = 3)
@@ -108,6 +108,9 @@ def augmentedSixthToDominant(
     else:
         raise ResolutionException(f'Unknown augSixthType: {augSixthType!r}')
 
+    if any(x is None for x in [bass, root, fifth, other]):
+        raise ResolutionException(f'Chord must have bass, root, fifth, and sixth or seventh')
+
     howToResolve = [(lambda p: p.name == bass.name, '-m2'),
                     (lambda p: p.name == root.name, 'm2'),
                     (lambda p: p.name == fifth.name, '-m2'),
@@ -187,6 +190,9 @@ def augmentedSixthToMajorTonic(
     else:
         raise ResolutionException(f'Unknown augSixthType: {augSixthType!r}')
 
+    if any(x is None for x in [bass, root, fifth, other]):
+        raise ResolutionException(f'Chord must have bass, root, fifth, and sixth or seventh')
+
     howToResolve = [(lambda p: p.name == bass.name, '-m2'),
                     (lambda p: p.name == root.name, 'm2'),
                     (lambda p: p.name == fifth.name, 'P1'),
@@ -266,6 +272,9 @@ def augmentedSixthToMinorTonic(
     else:
         raise ResolutionException(f'Unknown augSixthType: {augSixthType!r}')
 
+    if any(x is None for x in [bass, root, fifth, other]):
+        raise ResolutionException(f'Chord must have bass, root, fifth, and sixth or seventh')
+
     howToResolve = [(lambda p: p.name == bass.name, '-m2'),
                     (lambda p: p.name == root.name, 'm2'),
                     (lambda p: p.name == fifth.name, 'P1'),