Merge d06e3b0 into 085ee1f

cuthbertLab · Dec 6, 2019 · dce8826 · dce8826
2 parents 085ee1f + d06e3b0
commit dce8826
Showing 1 changed file with 17 additions and 30 deletions.
diff --git a/music21/roman.py b/music21/roman.py
@@ -2766,8 +2766,10 @@ def p(c):
 
         rn = roman.RomanNumeral('vii/o7', k)
         self.assertEqual(p(rn), 'B4 D5 F5 A5')
+        # noinspection SpellCheckingInspection
         rn = roman.RomanNumeral('viiø65', k)
         self.assertEqual(p(rn), 'D4 F4 A4 B4')
+        # noinspection SpellCheckingInspection
         rn = roman.RomanNumeral('viiø43', k)
         self.assertEqual(p(rn), 'F4 A4 B4 D5')
         rn = roman.RomanNumeral('vii/o42', k)
@@ -2890,36 +2892,21 @@ def testAugmented(self):
         def p(c):
             return ' '.join([x.nameWithOctave for x in c.pitches])
 
-        k = key.Key('a')
-
-        # noinspection DuplicatedCode
-        rn = roman.RomanNumeral('It6', k)
-        self.assertEqual(p(rn), 'F5 A5 D#6')
-        rn = roman.RomanNumeral('Ger65', k)
-        self.assertEqual(p(rn), 'F5 A5 C6 D#6')
-        rn = roman.RomanNumeral('Ger6/5', k)
-        self.assertEqual(p(rn), 'F5 A5 C6 D#6')
-        rn = roman.RomanNumeral('Fr43', k)
-        self.assertEqual(p(rn), 'F5 A5 B5 D#6')
-        rn = roman.RomanNumeral('Fr4/3', k)
-        self.assertEqual(p(rn), 'F5 A5 B5 D#6')
-        rn = roman.RomanNumeral('Sw43', k)
-        self.assertEqual(p(rn), 'F5 A5 B#5 D#6')
-
-        kMaj = key.Key('A')
-        # noinspection DuplicatedCode
-        rn = roman.RomanNumeral('It6', kMaj)
-        self.assertEqual(p(rn), 'F5 A5 D#6')
-        rn = roman.RomanNumeral('Ger65', kMaj)
-        self.assertEqual(p(rn), 'F5 A5 C6 D#6')
-        rn = roman.RomanNumeral('Ger6/5', kMaj)
-        self.assertEqual(p(rn), 'F5 A5 C6 D#6')
-        rn = roman.RomanNumeral('Fr43', kMaj)
-        self.assertEqual(p(rn), 'F5 A5 B5 D#6')
-        rn = roman.RomanNumeral('Fr4/3', kMaj)
-        self.assertEqual(p(rn), 'F5 A5 B5 D#6')
-        rn = roman.RomanNumeral('Sw43', kMaj)
-        self.assertEqual(p(rn), 'F5 A5 B#5 D#6')
+        for kStr in ('a', 'A'):
+            k = key.Key(kStr)
+
+            rn = roman.RomanNumeral('It6', k)
+            self.assertEqual(p(rn), 'F5 A5 D#6')
+            rn = roman.RomanNumeral('Ger65', k)
+            self.assertEqual(p(rn), 'F5 A5 C6 D#6')
+            rn = roman.RomanNumeral('Ger6/5', k)
+            self.assertEqual(p(rn), 'F5 A5 C6 D#6')
+            rn = roman.RomanNumeral('Fr43', k)
+            self.assertEqual(p(rn), 'F5 A5 B5 D#6')
+            rn = roman.RomanNumeral('Fr4/3', k)
+            self.assertEqual(p(rn), 'F5 A5 B5 D#6')
+            rn = roman.RomanNumeral('Sw43', k)
+            self.assertEqual(p(rn), 'F5 A5 B#5 D#6')
 
     def testIII7(self):
         c = chord.Chord(['E4', 'G4', 'B4', 'D5'])