Merge pull request #18 from ramonsaraiva/few-fixes

Fix dict is not callable in TonedScale.scales

pytheory/charts.py

@@ -68,7 +68,7 @@ def acceptable_tones(self):
 
     @property
     def acceptable_tone_names(self):
-        return tuple([tone.name for tone in self.acceptable_tones])
+        return tuple((tone.name for tone in self.acceptable_tones))
 
     def _possible_fingerings(self, *, fretboard):
         def find_fingerings(tone):
@@ -129,11 +129,11 @@ def gen():
                 if fingering_score(possible_fingering) == max_score:
                     yield possible_fingering
 
-        best_fingerings = tuple([g for g in gen()])
+        best_fingerings = tuple(g for g in gen())
         if not multiple:
             return self.fix_fingering(best_fingerings[0])
         else:
-            return tuple([self.fix_fingering(f) for f in best_fingerings])
+            return tuple((self.fix_fingering(f) for f in best_fingerings))
 
 
 

pytheory/chords.py

@@ -3,7 +3,7 @@ def __init__(self, *, tones):
         self.tones = tones
 
     def __repr__(self):
-        l = tuple([tone.full_name for tone in self.tones])
+        l = tuple((tone.full_name for tone in self.tones))
         return f"<Chord tones={l!r}>"
 
     # @property
@@ -20,7 +20,7 @@ def __init__(self, *, tones):
         self.tones = tones
 
     def __repr__(self):
-        l = tuple([tone.full_name for tone in self.tones])
+        l = tuple((tone.full_name for tone in self.tones))
         return f"<Fretboard tones={l!r}>"
 
     def fingering(self, *positions):

pytheory/scales.py

@@ -108,7 +108,7 @@ def get(self, scale):
 
     @property
     def scales(self):
-        return tuple(self._scales().keys())
+        return tuple(self._scales.keys())
 
     @property
     def _scales(self):

pytheory/systems.py

@@ -18,7 +18,7 @@ def semitones(self):
     @property
     def tones(self):
         from . import Tone
-        return tuple([Tone.from_tuple(tone) for tone in self.tone_names])
+        return tuple((Tone.from_tuple(tone) for tone in self.tone_names))
 
 
     @property