Fix pylint recommendations (#1694)

Pylint now recommends using `yield from` and the use of `min/max` to simplify if statements.

Author: TimFelixBeyer

music21/analysis/reduceChords.py

@@ -384,8 +384,7 @@ def procedure(timespan):
                             )
                             print(msg)
                             # raise ChordReducerException(msg)
-                        if offset < previousTimespan.endTime:
-                            offset = previousTimespan.endTime
+                        offset = max(offset, previousTimespan.endTime)
                     scoreTree.removeTimespan(group[0])
                     subtree.removeTimespan(group[0])
                     newTimespan = group[0].new(offset=offset)
@@ -542,8 +541,7 @@ def reduceMeasureToNChords(
             measureObject.flatten().notes,
             weightAlgorithm,
         )
-        if maximumNumberOfChords > len(chordWeights):
-            maximumNumberOfChords = len(chordWeights)
+        maximumNumberOfChords = min(maximumNumberOfChords, len(chordWeights))
         sortedChordWeights = sorted(
             chordWeights,
             key=chordWeights.get,

music21/analysis/reduceChordsOld.py

@@ -86,8 +86,7 @@ def reduceMeasureToNChords(self,
 
         chordWeights = self.computeMeasureChordWeights(mObj, weightAlgorithm)
 
-        if numChords > len(chordWeights):
-            numChords = len(chordWeights)
+        numChords = min(numChords, len(chordWeights))
 
         maxNChords = sorted(chordWeights, key=chordWeights.get, reverse=True)[:numChords]
         if not maxNChords:

music21/analysis/windowed.py

@@ -193,10 +193,8 @@ def analyze(self, windowSize, windowType='overlap'):
         elif windowType == 'noOverlap':
             start = 0
             end = start + windowSize
-            i = 0
-            while True:
-                if end >= len(self._windowedStream):
-                    end = len(self._windowedStream)
+            for i in range(windowCount):
+                end = min(end, len(self._windowedStream))
 
                 current = stream.Stream()
                 for j in range(start, end):
@@ -210,9 +208,6 @@ def analyze(self, windowSize, windowType='overlap'):
 
                 start = end
                 end = start + windowSize
-                i += 1
-                if i >= windowCount:
-                    break
 
         elif windowType == 'adjacentAverage':
             # first get overlapping windows

music21/braille/text.py

@@ -336,8 +336,7 @@ def recenterHeadings(self):
                 if self.allLines[i].isHeading:
                     break
                 lineLength = self.allLines[i].textLocation
-                if lineLength > maxLineLength:
-                    maxLineLength = lineLength
+                maxLineLength = max(maxLineLength, lineLength)
             for j in range(indexStart, indexFinal):
                 brailleTextLine = self.allLines[j]
                 lineStrToCenter = str(brailleTextLine)
@@ -565,12 +564,10 @@ def insert(self, textLocation, text):
         '''
         if not self.canInsert(textLocation, text):
             raise BrailleTextException('Text cannot be inserted at specified location.')
-        self.textLocation = textLocation
-        for char in list(text):
-            self.allChars[self.textLocation] = char
-            self.textLocation += 1
-        if self.textLocation > self.highestUsedLocation:
-            self.highestUsedLocation = self.textLocation
+        for i, char in enumerate(text, start=textLocation):
+            self.allChars[i] = char
+        self.textLocation = textLocation + len(text)
+        self.highestUsedLocation = max(self.highestUsedLocation, self.textLocation)
 
     def canAppend(self, text, addSpace=True):
         '''
@@ -600,10 +597,7 @@ def canAppend(self, text, addSpace=True):
         >>> btl.canAppend('1234', addSpace=False)
         False
         '''
-        if self.highestUsedLocation > self.textLocation:
-            searchLocation = self.highestUsedLocation
-        else:
-            searchLocation = self.textLocation
+        searchLocation = max(self.highestUsedLocation, self.textLocation)
         addSpaceAmount = 1 if addSpace else 0
         if (searchLocation + len(text) + addSpaceAmount) > self.lineLength:
             return False

music21/common/objects.py

@@ -67,8 +67,7 @@ class RelativeCounter(collections.Counter):
 
     def __iter__(self):
         sortedKeys = sorted(super().__iter__(), key=lambda x: self[x], reverse=True)
-        for k in sortedKeys:
-            yield k
+        yield from sortedKeys
 
     def items(self):
         for k in self:

music21/features/jSymbolic.py

@@ -3016,8 +3016,7 @@ def process(self):
             for p in c.pitches:
                 for gSub in p.groups:
                     g.append(gSub)  # add to temporary group; will act as a set
-            if len(g) > found:
-                found = len(g)
+            found = max(found, len(g))
         self.feature.vector[0] = found
 
 

music21/figuredBass/realizer.py

@@ -186,10 +186,7 @@ def addLyricsToBassNote(bassNote, notationString=None):
     n = notation.Notation(notationString)
     if not n.figureStrings:
         return
-    maxLength = 0
-    for fs in n.figureStrings:
-        if len(fs) > maxLength:
-            maxLength = len(fs)
+    maxLength = max([len(fs) for fs in n.figureStrings])
     for fs in n.figureStrings:
         spacesInFront = ''
         for i in range(maxLength - len(fs)):

music21/humdrum/spineParser.py

@@ -401,8 +401,7 @@ def parseEventListFromDataStream(self, dataStream=None):
                 self.eventList.append(GlobalCommentLine(self.parsePositionInStream, line))
             else:
                 thisLine = SpineLine(self.parsePositionInStream, line)
-                if thisLine.numSpines > self.maxSpines:
-                    self.maxSpines = thisLine.numSpines
+                self.maxSpines = max(self.maxSpines, thisLine.numSpines)
                 self.eventList.append(thisLine)
             self.parsePositionInStream += 1
         self.fileLength = self.parsePositionInStream

music21/musicxml/m21ToXml.py

@@ -1551,8 +1551,7 @@ def setPartsAndRefStream(self) -> None:
             else:
                 innerStream.transferOffsetToElements()
                 ht = innerStream.highestTime
-            if ht > self.highestTime:
-                self.highestTime = ht
+            self.highestTime = max(self.highestTime, ht)
         self.refStreamOrTimeRange = [0.0, self.highestTime]
         self.parts = list(s.parts)
 

music21/musicxml/xmlToM21.py

@@ -1967,8 +1967,7 @@ def xmlMeasureToMeasure(self, mxMeasure: ET.Element) -> stream.Measure:
 
         self.lastMeasureParser = measureParser
 
-        if measureParser.staves > self.maxStaves:
-            self.maxStaves = measureParser.staves
+        self.maxStaves = max(self.maxStaves, measureParser.staves)
 
         if measureParser.transposition is not None:
             self.updateTransposition(measureParser.transposition)