lint etc.

Author: mscuthbert

music21/musicxml/xmlToM21.py

@@ -1864,9 +1864,12 @@ def copy_into_partStaff(source: stream.Stream,
             removeClasses = STAFF_SPECIFIC_CLASSES[:]
             if staffIndex != 0:  # spanners only on the first staff.
                 removeClasses.append('Spanner')
-            newPartStaff = self.stream.template(removeClasses=removeClasses,
-                                                fillWithRests=False,
-                                                exemptFromRemove=EXEMPT_FROM_REMOVE)
+            newPartStaff = t.cast(
+                stream.PartStaff,
+                self.stream.template(removeClasses=removeClasses,
+                                     fillWithRests=False,
+                                     exemptFromRemove=EXEMPT_FROM_REMOVE)
+            )
             partStaffId = f'{self.partId}-Staff{staffKey}'
             newPartStaff.id = partStaffId
             # set group for components (recurse?)

music21/note.py

@@ -1935,9 +1935,7 @@ class Rest(GeneralNote):
     gets rests as well.
 
     >>> r = note.Rest()
-    >>> r.isRest
-    True
-    >>> r.isNote
+    >>> isinstance(r, note.Note)
     False
     >>> r.duration.quarterLength = 2.0
     >>> r.duration.type
@@ -1985,6 +1983,13 @@ class Rest(GeneralNote):
 
     >>> r1 == note.Note()
     False
+
+    Currently, there are these convenience features, but they are going away
+    (They were originally added because isinstance was slow. It is now very fast)
+    >>> r.isRest
+    True
+    >>> r.isNote
+    False
     '''
     isRest = True
     name = 'rest'

music21/prebase.py

@@ -117,7 +117,7 @@ def classes(self) -> tuple[str, ...]:
         {10.0} <music21.clef.GClef>
         {30.0} <music21.clef.FrenchViolinClef>
 
-        `Changed 2015 Sep`: returns a tuple, not a list.
+        Changed in v2: returns a tuple, not a list.
         '''
         try:
             return self._classTupleCacheDict[self.__class__]

music21/stream/base.py

@@ -4890,7 +4890,7 @@ def optionalAddRest():
             elOffset = self.elementOffset(el, returnSpecial=True)
 
             # retain all streams (exception: Voices if retainVoices  is False
-            if el.isStream and (retainVoices or ('Voice' not in el.classes)):
+            if isinstance(el, Stream) and (retainVoices or ('Voice' not in el.classes)):
                 optionalAddRest()
                 outEl = el.template(fillWithRests=fillWithRests,
                                     removeClasses=removeClasses,
@@ -4906,7 +4906,7 @@ def optionalAddRest():
 
             # okay now determine if we will be skipping or keeping this element
             skip_element = False
-            if removeAll is True:
+            if removeAll:
                 # with this setting we remove everything by default
                 skip_element = True
             elif el.classSet.intersection(removeClasses):