v5.5 -- fix lint errors, ready to release

cuthbertLab · Oct 29, 2018 · 4d258e0 · 4d258e0
1 parent 1e6f9f3
commit 4d258e0
Show file tree

Hide file tree

Showing 10 changed files with 270 additions and 272 deletions.
diff --git a/documentation/source/about/what.ipynb b/documentation/source/about/what.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_06_stream2.ipynb b/documentation/source/usersGuide/usersGuide_06_stream2.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_08_installingMusicXML.ipynb b/documentation/source/usersGuide/usersGuide_08_installingMusicXML.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_12_music21object.ipynb b/documentation/source/usersGuide/usersGuide_12_music21object.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_15_key.ipynb b/documentation/source/usersGuide/usersGuide_15_key.ipynb
diff --git a/documentation/source/usersGuide/usersGuide_22_graphing.ipynb b/documentation/source/usersGuide/usersGuide_22_graphing.ipynb
diff --git a/music21/abcFormat/translate.py b/music21/abcFormat/translate.py
@@ -891,11 +891,11 @@ def testAbcKeyImport(self):
         major = ['C', 'G', 'D', 'A', 'E', 'B', 'F#', 'C#']
         minor = ['Am', 'Em', 'Bm', 'F#m', 'C#m', 'G#m', 'D#m', 'A#m']
 
-        for n, (maj,min) in enumerate(zip(major, minor)):
-            am = abcFormat.ABCMetadata('K:'+maj)
+        for n, (majName, minName) in enumerate(zip(major, minor)):
+            am = abcFormat.ABCMetadata('K:' + majName)
             am.preParse()
             ks_major = am.getKeySignatureObject()
-            am = abcFormat.ABCMetadata('K:'+min)
+            am = abcFormat.ABCMetadata('K:' + minName)
             am.preParse()
             ks_minor = am.getKeySignatureObject()
             self.assertEqual(n, ks_major.sharps)
@@ -907,15 +907,15 @@ def testAbcKeyImport(self):
         major = ['C', 'F', 'Bb', 'Eb', 'Ab', 'Db', 'Gb', 'Cb']
         minor = ['Am', 'Dm', 'Gm', 'Cm', 'Fm', 'Bbm', 'Ebm', 'Abm']
 
-        for n, (maj,min) in enumerate(zip(major, minor)):
-            am = abcFormat.ABCMetadata('K:'+maj)
+        for n, (majName, minName) in enumerate(zip(major, minor)):
+            am = abcFormat.ABCMetadata('K:' + majName)
             am.preParse()
             ks_major = am.getKeySignatureObject()
-            am = abcFormat.ABCMetadata('K:'+min)
+            am = abcFormat.ABCMetadata('K:' + minName)
             am.preParse()
             ks_minor = am.getKeySignatureObject()
-            self.assertEqual(-n, ks_major.sharps)
-            self.assertEqual(-n, ks_minor.sharps)
+            self.assertEqual(-1 * n, ks_major.sharps)
+            self.assertEqual(-1 * n, ks_minor.sharps)
             self.assertEqual('major', ks_major.mode)
             self.assertEqual('minor', ks_minor.mode)
 

diff --git a/music21/figuredBass/checker.py b/music21/figuredBass/checker.py
@@ -364,15 +364,15 @@ def voiceCrossing(possibA):
     '''
     partViolations = []
     for part1Index in range(len(possibA)):
-        try:
+        try: # noqa
             higherPitch = possibA[part1Index]
-            higherPitch.ps # pylint: disable=pointless-statement # noqa
+            higherPitch.ps # pylint: disable=pointless-statement
         except AttributeError:
             continue
         for part2Index in range(part1Index + 1, len(possibA)):
-            try:
+            try: # noqa
                 lowerPitch = possibA[part2Index]
-                lowerPitch.ps # pylint: disable=pointless-statement # noqa
+                lowerPitch.ps # pylint: disable=pointless-statement
             except AttributeError:
                 continue
             if higherPitch < lowerPitch:

diff --git a/music21/interval.py b/music21/interval.py
@@ -21,6 +21,7 @@
 
 import abc
 import copy
+import enum
 import math
 import unittest
 
@@ -34,8 +35,6 @@
 _MOD = 'interval'
 environLocal = environment.Environment(_MOD)
 
-import enum
-
 #-------------------------------------------------------------------------------
 # constants
 

diff --git a/music21/test/testStream.py b/music21/test/testStream.py
@@ -4437,7 +4437,7 @@ def testElementsHighestTimeA(self):
         self.assertEqual(s.index(b1), 1)
 
     def testStoreAtEndFailures(self):
-        from music21 import stream, bar
+        from music21 import stream
 
         s = Stream()
         with self.assertRaises(stream.StreamException):
@@ -5140,7 +5140,8 @@ def testActiveSiteMangling(self):
         self.assertEqual(inner.activeSite, outer)
         junk = inner.semiFlat
         self.assertEqual(inner.activeSite, outer)
-        junk = inner.flat  # the order of these two calls ensures that _getFlatFromSemiflat is called
+        junk = inner.flat  
+        # the order of these two calls ensures that _getFlatFromSemiflat is called
         self.assertEqual(inner.activeSite, outer)
 
         # this works fine