Music Cleanups

Saw some cleanups while reviewing PR cuthbertLab#1905 but I decided to make this separate.

"Let Python be Python" -- move string concat in tests to use implicit.

Fix a bug in ABC Parsing of ABCNote vs subclass ABCChord (order of attributes in parse were reversed -- was okay because they were called by keyword).

Standardize ElementTree.fromstring as `EL` not `ET.fromstring` or `El`

Author: mscuthbert

music21/abcFormat/__init__.py

@@ -1768,7 +1768,11 @@ def __init__(self, src: str = ''):
         # store a list of component objects
         self.subTokens: list[ABCToken] = []
 
-    def parse(self, forceKeySignature=None, forceDefaultQuarterLength=None):
+    def parse(
+        self,
+        forceDefaultQuarterLength: float|None = None,
+        forceKeySignature: key.KeySignature|None = None
+    ):
         '''
         Handles the following types of chords:
 
@@ -1803,6 +1807,7 @@ def parse(self, forceKeySignature=None, forceDefaultQuarterLength=None):
         outer_lengthModifier = self.getQuarterLength(outerLengthModifierStr,
                                                      forceDefaultQuarterLength=1.0)
 
+        activeKeySignature: key.KeySignature|None
         if forceKeySignature is not None:
             activeKeySignature = forceKeySignature
         else:  # may be None
@@ -1815,7 +1820,7 @@ def parse(self, forceKeySignature=None, forceDefaultQuarterLength=None):
         # may need to supply key?
         ah.tokenize(tokenStr)
 
-        inner_quarterLength = 0
+        inner_quarterLength: OffsetQL = 0.0
         # tokens contained here are each ABCNote instances
         for token in ah.tokens:
             # environLocal.printDebug(['ABCChord: subTokens', t])
@@ -2631,10 +2636,10 @@ def tokenProcess(self) -> None:
             # notes within slur marks need to be added to the spanner
             if isinstance(token, ABCSlurStart):
                 token.fillSlur()
+                slurObj = token.slurObj
                 if t.TYPE_CHECKING:
-                    assert token.slurObj is not None
-
-                self.activeSpanners.append(token.slurObj)
+                    assert slurObj is not None
+                self.activeSpanners.append(slurObj)
                 self.activeParens.append('Slur')
             elif isinstance(token, ABCParenStop):
                 if self.activeParens:
@@ -2951,10 +2956,10 @@ def definesMeasures(self):
         Returns True if this token structure defines Measures in a normal Measure form.
         Otherwise False
 
-        >>> abcStr = ('M:6/8\\nL:1/8\\nK:G\\nV:1 name="Whistle" ' +
-        ...     'snm="wh"\\nB3 A3 | G6 | B3 A3 | G6 ||\\nV:2 name="violin" ' +
-        ...     'snm="v"\\nBdB AcA | GAG D3 | BdB AcA | GAG D6 ||\\nV:3 name="Bass" ' +
-        ...     'snm="b" clef=bass\\nD3 D3 | D6 | D3 D3 | D6 ||')
+        >>> abcStr = ('M:6/8\\nL:1/8\\nK:G\\nV:1 name="Whistle" '
+        ...           'snm="wh"\\nB3 A3 | G6 | B3 A3 | G6 ||\\nV:2 name="violin" '
+        ...           'snm="v"\\nBdB AcA | GAG D3 | BdB AcA | GAG D6 ||\\nV:3 name="Bass" '
+        ...           'snm="b" clef=bass\\nD3 D3 | D6 | D3 D3 | D6 ||')
         >>> ah = abcFormat.ABCHandler()
         >>> junk = ah.process(abcStr)
         >>> ah.definesMeasures()
@@ -2989,10 +2994,10 @@ def splitByVoice(self) -> list[ABCHandler]:
 
         Each part is returned as a ABCHandler instance.
 
-        >>> abcStr = ('M:6/8\\nL:1/8\\nK:G\\nV:1 name="Whistle" ' +
-        ...     'snm="wh"\\nB3 A3 | G6 | B3 A3 | G6 ||\\nV:2 name="violin" ' +
-        ...     'snm="v"\\nBdB AcA | GAG D3 | BdB AcA | GAG D6 ||\\nV:3 name="Bass" ' +
-        ...     'snm="b" clef=bass\\nD3 D3 | D6 | D3 D3 | D6 ||')
+        >>> abcStr = ('M:6/8\\nL:1/8\\nK:G\\nV:1 name="Whistle" '
+        ...           'snm="wh"\\nB3 A3 | G6 | B3 A3 | G6 ||\\nV:2 name="violin" '
+        ...           'snm="v"\\nBdB AcA | GAG D3 | BdB AcA | GAG D6 ||\\nV:3 name="Bass" '
+        ...           'snm="b" clef=bass\\nD3 D3 | D6 | D3 D3 | D6 ||')
         >>> ah = abcFormat.ABCHandler()
         >>> ah.process(abcStr)
         >>> tokenColls = ah.splitByVoice()

music21/alpha/analysis/search.py

@@ -187,8 +187,8 @@ def findConsecutiveScale(source, targetScale, degreesRequired=5,
                                   stepSize=1,
                                   comparisonAttribute=comparisonAttribute):
                 pass
-                # environLocal.printDebug(['matched degree count but next pitch is ' +
-                #        'in scale and direction', 'collDegrees', collDegrees])
+                # environLocal.printDebug(['matched degree count but next pitch is '
+                #        + 'in scale and direction', 'collDegrees', collDegrees])
             else:
                 # environLocal.printDebug(['matched degree count', 'collDegrees', collDegrees,
                 #    'pNext', pNext])

music21/analysis/reduction.py

@@ -615,11 +615,10 @@ def _createEventSpans(self):
                     #         eLast = partMeasures[0][i]
                     #     # use duration, not barDuration.quarterLength
                     #     # as want filled duration?
-                    #     eEnd = (eLast.getOffsetBySite(
-                    #             partMeasures[0]) +
-                    #             eLast.barDuration.quarterLength)
-                    #     ds = {'eStart':eStart, 'span':eEnd-eStart,
-                    #           'weight':None, 'color':pColor}
+                    #     eEnd = (eLast.getOffsetBySite(partMeasures[0])
+                    #             + eLast.barDuration.quarterLength)
+                    #     ds = {'eStart': eStart, 'span': eEnd - eStart,
+                    #           'weight': None, 'color': pColor}
                     #     dataEvents.append(ds)
                     #     eStart = None
 #                    eLast = partMeasures[0][i]

music21/base.py

@@ -2447,8 +2447,8 @@ def _setActiveSite(self, site: stream.Stream|None):
             self._activeSiteStoredOffset = storedOffset
             # siteId = id(site)
             # if not self.sites.hasSiteId(siteId):  # This should raise a warning, should not happen
-            #    # environLocal.warn('Adding a siteDict entry for a ' +
-            #    #                        'site that should already be there!')
+            #    # environLocal.warn('Adding a siteDict entry for a '
+            #    #                   'site that should already be there!')
             #    self.sites.add(site, idKey=siteId)
         else:
             self._activeSiteStoredOffset = None

music21/capella/fromCapellaXML.py

@@ -148,7 +148,7 @@ def domElementFromText(self, xmlText=None):
 
         >>> ci = capella.fromCapellaXML.CapellaImporter()
         >>> funnyTag = ci.domElementFromText(
-        ...    '<funny yes="definitely"><greg/>hi<greg><ha>ha</ha>' +
+        ...    '<funny yes="definitely"><greg/>hi<greg><ha>ha</ha>'
         ...    '<greg type="embedded"/></greg></funny>')
         >>> funnyTag
         <Element 'funny' at 0x...>
@@ -441,7 +441,7 @@ def chordOrNoteFromChord(self, chordElement):
         This one is an actual chord
 
         >>> chordElement = ci.domElementFromText(
-        ...        '<chord><duration base="1/8"/>' +
+        ...        '<chord><duration base="1/8"/>'
         ...        '<heads><head pitch="G4"/><head pitch="A5"/></heads></chord>')
         >>> c = ci.chordOrNoteFromChord(chordElement)
         >>> c
@@ -615,7 +615,7 @@ def lyricListFromLyric(self, lyricElement):
 
         >>> ci = capella.fromCapellaXML.CapellaImporter()
         >>> lyricEl = ci.domElementFromText(
-        ...      '<lyric><verse i="0" hyphen="true">di</verse>' +
+        ...      '<lyric><verse i="0" hyphen="true">di</verse>'
         ...      '<verse i="1">man,</verse><verse i="2">frau,</verse></lyric>')
         >>> ci.lyricListFromLyric(lyricEl)
         [<music21.note.Lyric number=1 syllabic=begin text='di'>,

music21/converter/__init__.py

@@ -749,7 +749,7 @@ def parseURL(
         re-reading from a cached file.
 
         >>> joplinURL = ('https://github.com/cuthbertLab/music21/raw/master'
-        ...              + '/music21/corpus/joplin/maple_leaf_rag.mxl')
+        ...              '/music21/corpus/joplin/maple_leaf_rag.mxl')
         >>> c = converter.Converter()
         >>> #_DOCS_SHOW c.parseURL(joplinURL)
         >>> #_DOCS_SHOW joplinStream = c.stream
@@ -2130,8 +2130,8 @@ def testMEIvsMX(self):
         # These strings aren't valid documents, but they are enough to pass the detection we're
         # testing in parseData(). But it does mean we'll be testing in a strange way.
         meiString = '<?xml version="1.0" encoding="UTF-8"?><mei><note/></mei>'
-        # mxlString = ('<?xml version="1.0" encoding="UTF-8"?>' +
-        #                '<score-partwise><note/></score-partwise>')
+        # mxlString = ('<?xml version="1.0" encoding="UTF-8"?>'
+        #              '<score-partwise><note/></score-partwise>')
 
         # The "mei" module raises an MeiElementError with "meiString," so as long as that's raised,
         # we know that parseData() chose correctly.

music21/converter/subConverters.py

@@ -631,8 +631,8 @@ def parseData(self, humdrumString, number=None):
         Open Humdrum data from a string -- calls
         :meth:`~music21.humdrum.spineParser.HumdrumDataCollection.parse()`.
 
-        >>> humData = ('**kern\\n*M2/4\\n=1\\n24r\\n24g#\\n24f#\\n24e\\n24c#\\n' +
-        ...     '24f\\n24r\\n24dn\\n24e-\\n24gn\\n24e-\\n24dn\\n*-')
+        >>> humData = ('**kern\\n*M2/4\\n=1\\n24r\\n24g#\\n24f#\\n24e\\n24c#\\n'
+        ...            '24f\\n24r\\n24dn\\n24e-\\n24gn\\n24e-\\n24dn\\n*-')
         >>> c = converter.subConverters.ConverterHumdrum()
         >>> s = c.parseData(humData)
         >>> c.stream.show('text')
@@ -762,8 +762,8 @@ def parseData(self, nwcData):
         r'''
         Open Noteworthy data from a string or list
 
-        >>> nwcData = ('!NoteWorthyComposer(2.0)\n|AddStaff\n|Clef|' +
-        ...     'Type:Treble\n|Note|Dur:Whole|Pos:1^')
+        >>> nwcData = ('!NoteWorthyComposer(2.0)\n|AddStaff\n|Clef|'
+        ...            'Type:Treble\n|Note|Dur:Whole|Pos:1^')
         >>> c = converter.subConverters.ConverterNoteworthy()
         >>> c.parseData(nwcData)
         >>> c.stream.show('text')

music21/corpus/testCorpus.py

@@ -155,8 +155,8 @@ def testSearch10(self):
     #     self.assertGreater(len(searchResults), 0)
     #     # returns items in pairs: url and work number
     #     self.assertEqual(searchResults[0].sourcePath,
-    #         'http://impromastering.com/uploads/transcription_file/' +
-    #         'file/196/Giant_Steps__John_Coltrane_C.xml')
+    #         'http://impromastering.com/uploads/transcription_file/'
+    #         + 'file/196/Giant_Steps__John_Coltrane_C.xml')
 
     # def testGetWorkList(self):
     #     self.assertGreaterEqual(len(corpus.corpora.CoreCorpus().getPaths('.md')), 38)

music21/harmony.py

@@ -297,8 +297,8 @@ def _updateFromParameters(
         but we want the objects to retain their initial root, bass, and inversion.
         '''
         if root and isinstance(root, str):
-            root = common.cleanedFlatNotation(root)
-            self.root(pitch.Pitch(root, octave=3))
+            root_str = common.cleanedFlatNotation(root)
+            self.root(pitch.Pitch(root_str, octave=3))
         elif root is not None:
             self.root(root)
 
@@ -308,8 +308,8 @@ def _updateFromParameters(
 
         # and then bass.
         if bass and isinstance(bass, str):
-            bass = common.cleanedFlatNotation(bass)
-            self.bass(pitch.Pitch(bass, octave=3), allow_add=True)
+            bass_str = common.cleanedFlatNotation(bass)
+            self.bass(pitch.Pitch(bass_str, octave=3), allow_add=True)
         elif bass is not None:
             self.bass(bass, allow_add=True)
 
@@ -2267,9 +2267,9 @@ def findFigure(self):
         >>> from xml.etree.ElementTree import fromstring as EL
         >>> MP = musicxml.xmlToM21.MeasureParser()
 
-        >>> elStr = (r'<harmony><root><root-step>C</root-step></root><kind>dominant</kind>' +
-        ...           '<degree><degree-value>9</degree-value><degree-alter>-1</degree-alter>' +
-        ...           '        <degree-type>add</degree-type></degree></harmony>')
+        >>> elStr = ('<harmony><root><root-step>C</root-step></root><kind>dominant</kind>'
+        ...          '<degree><degree-value>9</degree-value><degree-alter>-1</degree-alter>'
+        ...          '        <degree-type>add</degree-type></degree></harmony>')
         >>> mxHarmony = EL(elStr)
 
         >>> cs = MP.xmlToChordSymbol(mxHarmony)
@@ -2283,10 +2283,10 @@ def findFigure(self):
          <music21.pitch.Pitch B-3>,
          <music21.pitch.Pitch D-4>)
 
-        >>> elStr = (r'<harmony><root><root-step>C</root-step></root><kind>major</kind>' +
-        ...           '<bass><bass-step>B</bass-step><bass-alter>-1</bass-alter></bass>' +
-        ...           '<degree><degree-value>2</degree-value><degree-alter>0</degree-alter>' +
-        ...           '        <degree-type>add</degree-type></degree></harmony>')
+        >>> elStr = ('<harmony><root><root-step>C</root-step></root><kind>major</kind>'
+        ...          '<bass><bass-step>B</bass-step><bass-alter>-1</bass-alter></bass>'
+        ...          '<degree><degree-value>2</degree-value><degree-alter>0</degree-alter>'
+        ...          '        <degree-type>add</degree-type></degree></harmony>')
         >>> mxHarmony = EL(elStr)
 
         >>> cs = MP.xmlToChordSymbol(mxHarmony)
@@ -2682,8 +2682,13 @@ def testHarmonyPreservesInversionAndBass(self):
         self.assertEqual(explicitFm6.inversion(), 1)
         self.assertEqual(explicitFm6.bass(find=False).name, 'A-')
         self.assertEqual(explicitFm6.root(find=False).name, 'F')
-        self.assertLess(explicitFm6.bass(find=False).octave,
-                        explicitFm6.root(find=False).octave)
+        fm6bassOctave = explicitFm6.bass(find=False).octave
+        fm6rootOctave = explicitFm6.root(find=False).octave
+        self.assertIsNotNone(fm6bassOctave)
+        self.assertIsNotNone(fm6rootOctave)
+        assert fm6bassOctave is not None
+        assert fm6rootOctave is not None
+        self.assertLess(fm6bassOctave, fm6rootOctave)
 
     def testClassSortOrderHarmony(self):
         '''
@@ -2836,7 +2841,6 @@ def runTestOnChord(self, xmlString, figure, pitches):
         self.assertEqual(cs1.bass(), cs3.bass())
 
     def testChordWithBass(self):
-
         xmlString = '''
           <harmony>
             <root>

music21/humdrum/spineParser.py

@@ -377,10 +377,10 @@ def parseEventListFromDataStream(
 
         Returns eventList in addition to setting it as `self.eventList`.
 
-        >>> eventString = ('!!! COM: Beethoven, Ludwig van\n' +
-        ...                '!! Not really a piece by Beethoven\n' +
-        ...                '**kern\t**dynam\n' +
-        ...                'C4\tpp\n' +
+        >>> eventString = ('!!! COM: Beethoven, Ludwig van\n'
+        ...                '!! Not really a piece by Beethoven\n'
+        ...                '**kern\t**dynam\n'
+        ...                'C4\tpp\n'
         ...                'D8\t.\n')
         >>> hdc = humdrum.spineParser.HumdrumDataCollection(eventString)
         >>> hdc.maxSpines = 2
@@ -459,10 +459,10 @@ def parseProtoSpinesAndEventCollections(
         Returns a tuple of protoSpines and eventCollections in addition to
         setting it in the calling object.
 
-        >>> eventString = ('!!!COM: Beethoven, Ludwig van\n' +
-        ...                '!! Not really a piece by Beethoven\n' +
-        ...                '**kern\t**dynam\n' +
-        ...                'C4\tpp\n' +
+        >>> eventString = ('!!!COM: Beethoven, Ludwig van\n'
+        ...                '!! Not really a piece by Beethoven\n'
+        ...                '**kern\t**dynam\n'
+        ...                'C4\tpp\n'
         ...                'D8\t.\n')
         >>> hdc = humdrum.spineParser.HumdrumDataCollection(eventString)
         >>> hdc.maxSpines = 2
@@ -784,11 +784,11 @@ def insertGlobalEvents(self) -> None:
     #     if self.spineCollection is None:
     #         raise HumdrumException('parsing got no spine collections!')
     #     elif self.spineCollection.spines is None:
-    #         raise HumdrumException('not a single spine in your data. Is this your problem? ' +
-    #                                '(File a bug report if you ' +
+    #         raise HumdrumException('not a single spine in your data. Is this your problem? '
+    #                                '(File a bug report if you '
     #                                'have doubled checked your data)')
     #     elif self.spineCollection.spines[0].stream is None:
-    #         raise HumdrumException('okay, you got at least one spine, but it does not have ' +
+    #         raise HumdrumException('okay, you got at least one spine, but it does not have '
     #                                'a stream in it; (check your data or file a bug report)')
     #     else:
     #         masterStream = stream.Score()
@@ -2400,7 +2400,7 @@ def hdStringToNote(contents: str) -> note.GeneralNote:
         elif '\\' in contents:
             thisObject.stemDirection = 'down'
 
-    # 3.2.7 Duration +
+    # 3.2.7 Duration and
     # 3.2.8 N-Tuplets
 
     # TODO: SPEEDUP -- only search for rational after foundNumber.