Merge pull request #1474 from cuthbertLab/pylint2-15-4

Remove TYPE_CHECKING workaround for Pylint

music21/abcFormat/__init__.py

@@ -60,7 +60,6 @@
 import io
 import re
 import typing as t
-from typing import TYPE_CHECKING  # pylint needs no alias
 import unittest
 
 from music21 import common
@@ -70,7 +69,7 @@
 
 from music21.abcFormat import translate
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import bar
     from music21 import clef
     from music21 import duration
@@ -1635,7 +1634,7 @@ def getQuarterLength(self,
         # assume we have a complete fraction
         elif '/' in numStr:
             nStr, dStr = numStr.split('/')
-            if TYPE_CHECKING:
+            if t.TYPE_CHECKING:
                 assert nStr is not None
                 assert dStr is not None
             n = int(nStr.strip())

music21/analysis/discrete.py

@@ -27,7 +27,6 @@
 from collections import OrderedDict
 from collections.abc import Iterable, Sequence
 import typing as t
-from typing import TYPE_CHECKING  # pylint needs no alias
 import unittest
 
 from music21 import environment
@@ -39,7 +38,7 @@
 from music21 import pitch
 
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import stream
 
 

music21/articulations.py

@@ -77,7 +77,6 @@
 from __future__ import annotations
 
 import typing as t
-from typing import TYPE_CHECKING  # Pylint bug
 import unittest
 
 from music21 import base
@@ -86,7 +85,7 @@
 from music21 import environment
 from music21 import style
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import interval
 
 

music21/base.py

@@ -44,7 +44,6 @@
 from importlib.util import find_spec
 import typing as t
 from typing import overload  # Pycharm can't do alias
-from typing import TYPE_CHECKING  # pylint needs no alias
 import unittest
 import warnings
 import weakref
@@ -67,7 +66,7 @@
 # needed for temporal manipulations; not music21 objects
 from music21 import tie
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     import fractions
     from io import IOBase
     import pathlib
@@ -2749,7 +2748,7 @@ def duration(self) -> Duration:
             self._duration = Duration(0)
 
         d_out = self._duration
-        if TYPE_CHECKING:
+        if t.TYPE_CHECKING:
             assert d_out is not None
 
         return d_out

music21/beam.py

@@ -75,7 +75,7 @@
 from __future__ import annotations
 
 from collections.abc import Iterable
-from typing import TYPE_CHECKING  # pylint bug
+import typing as t
 import unittest
 
 from music21 import exceptions21
@@ -86,7 +86,7 @@
 from music21.common.objects import EqualSlottedObjectMixin
 
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import base
 
 

music21/chord/__init__.py

@@ -21,7 +21,6 @@
 import copy
 import typing as t
 from typing import overload  # pycharm bug
-from typing import TYPE_CHECKING  # pylint bug
 import unittest
 
 from music21 import beam
@@ -41,7 +40,7 @@
 from music21.chord import tools
 
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import stream
 
 
@@ -470,7 +469,7 @@ def volume(self) -> 'music21.volume.Volume':  # do NOT change to volume.Volume
         if velocities:  # avoid division by zero error
             self._volume.velocity = int(round(sum(velocities) / len(velocities)))
 
-        if TYPE_CHECKING:
+        if t.TYPE_CHECKING:
             assert self._volume is not None
         return self._volume
 
@@ -487,7 +486,7 @@ def volume(self, expr: None | 'music21.volume.Volume' | int | float):
             note.NotRest._setVolume(self, expr, setClient=False)
         elif common.isNum(expr):
             vol = self._getVolume()
-            if TYPE_CHECKING:
+            if t.TYPE_CHECKING:
                 assert isinstance(expr, (int, float))
 
             if expr < 1:  # assume a scalar
@@ -4042,7 +4041,7 @@ def semiClosedPosition(
         if inPlace is True:
             c2 = self
 
-        if TYPE_CHECKING:
+        if t.TYPE_CHECKING:
             from music21.stream import Stream
             assert isinstance(c2, Stream)
         # startOctave = c2.bass().octave
@@ -5009,7 +5008,7 @@ def duration(self) -> Duration:
             self._duration = pitchZeroDuration
 
         d_out = self._duration
-        if TYPE_CHECKING:
+        if t.TYPE_CHECKING:
             assert isinstance(d_out, Duration)
         return d_out
 

music21/chord/tools.py

@@ -14,10 +14,9 @@
 '''
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing as t
 
-
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import chord
     from music21 import pitch
 

music21/clef.py

@@ -19,7 +19,7 @@
 from __future__ import annotations
 
 from collections.abc import Iterable, Sequence
-from typing import TYPE_CHECKING  # pylint needs no alias
+import typing as t
 import unittest
 
 from music21 import base
@@ -29,7 +29,7 @@
 from music21 import style
 
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import stream
 
 
@@ -879,7 +879,7 @@ def clefFromString(clefString, octaveShift=0) -> Clef:
             clefObj.line = lineNum
         else:
             ClefType = line_list[lineNum]
-            if TYPE_CHECKING:
+            if t.TYPE_CHECKING:
                 assert ClefType is not None
                 assert issubclass(ClefType, PitchClef)
             clefObj = ClefType()

music21/common/types.py

@@ -13,11 +13,10 @@
 from collections.abc import Callable, Iterable
 from fractions import Fraction
 import typing as t
-from typing import TYPE_CHECKING
 
 from music21.common.enums import OffsetSpecial
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     import music21  # pylint: disable=unused-import
 
 DocOrder = list[str | Callable]

music21/corpus/manager.py

@@ -22,7 +22,7 @@
 from collections.abc import Iterable
 import pathlib
 import os
-from typing import TYPE_CHECKING
+import typing as t
 
 from music21 import common
 from music21 import converter
@@ -33,7 +33,7 @@
 from music21.corpus import corpora
 
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21.metadata import bundles
     from music21 import stream
 

music21/derivation.py

@@ -19,15 +19,15 @@
 
 from collections.abc import Generator
 import functools
-from typing import TYPE_CHECKING  # Pylint bug
+import typing as t
 import unittest
 
 from music21 import common
 from music21.common.objects import SlottedObjectMixin
 from music21 import environment
 
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import base
 
 

music21/duration.py

@@ -55,7 +55,6 @@
 import io
 from math import inf, isnan
 import typing as t
-from typing import TYPE_CHECKING  # pylint bug
 import unittest
 
 from music21 import common
@@ -68,7 +67,7 @@
 from music21 import prebase
 
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import base
     from music21 import note
     from music21 import stream
@@ -3524,7 +3523,7 @@ def fixBrokenTupletDuration(self, tupletGroup: list[note.GeneralNote]) -> None:
             currentTupletDuration = opFrac(currentTupletDuration + n.duration.quarterLength)
             thisTup = n.duration.tuplets[0]
             tupDurationActual = thisTup.durationActual
-            if TYPE_CHECKING:
+            if t.TYPE_CHECKING:
                 assert tupDurationActual is not None
 
             thisTupType = tupDurationActual.type

music21/expressions.py

@@ -26,7 +26,7 @@
 
 import copy
 import string
-from typing import TYPE_CHECKING  # pylint needs no alias
+import typing as t
 
 from music21 import base
 from music21 import common
@@ -37,7 +37,7 @@
 from music21 import style
 
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import note
 
 

music21/graph/__init__.py

@@ -45,7 +45,6 @@
 ]
 
 import typing as t
-from typing import TYPE_CHECKING  # pylint needs no alias
 import unittest
 
 from music21 import common
@@ -58,7 +57,7 @@
 from music21.graph import utilities
 
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import stream
 
 

music21/instrument.py

@@ -28,7 +28,6 @@
 import importlib
 import unittest
 import typing as t
-from typing import TYPE_CHECKING  # must be imported separately
 
 from music21 import base
 from music21 import common
@@ -39,7 +38,7 @@
 from music21 import pitch
 from music21.tree.trees import OffsetTree
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import stream
 
 environLocal = environment.Environment('instrument')

music21/interval.py

@@ -27,7 +27,6 @@
 import math
 import re
 import typing as t
-from typing import TYPE_CHECKING  # pylint needs no alias
 
 from music21 import base
 from music21 import common
@@ -37,7 +36,7 @@
 from music21 import exceptions21
 
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import key
     from music21 import note
     from music21 import pitch
@@ -3072,7 +3071,7 @@ def __init__(self,
 
         # both self.diatonic and self.chromatic can still both be None if an
         # empty Interval class is being created, such as in deepcopy
-        if TYPE_CHECKING:
+        if t.TYPE_CHECKING:
             assert diatonic is not None
             assert chromatic is not None
 

music21/meter/base.py

@@ -21,7 +21,6 @@
 import fractions
 from math import gcd
 import typing as t
-from typing import TYPE_CHECKING  # pylint needs no alias
 import unittest
 
 from music21 import base
@@ -40,7 +39,7 @@
 
 environLocal = environment.Environment('meter')
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import stream
 
 # this is just a placeholder so that .beamSequence, etc. do not need to

music21/midi/translate.py

@@ -19,7 +19,6 @@
 import copy
 import math
 import typing as t
-from typing import TYPE_CHECKING
 import unittest
 import warnings
 
@@ -43,7 +42,7 @@
 from music21.midi.percussion import MIDIPercussionException, PercussionMapper
 
 
-if TYPE_CHECKING:
+if t.TYPE_CHECKING:
     from music21 import base
     from music21 import midi
 
@@ -2084,7 +2083,7 @@ def midiTrackToStream(
         ts_iter = conductorPart['TimeSignature']
         if ts_iter:
             meterStream = ts_iter.stream()
-            if TYPE_CHECKING:
+            if t.TYPE_CHECKING:
                 assert meterStream is not None
 
             # Supply any missing time signature at the start