Cleaned up some slots inconsistencies.

Abjad · May 22, 2015 · e38fab4 · e38fab4
1 parent ccf7dda
commit e38fab4
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 9 deletions.
diff --git a/abjad/tools/indicatortools/Dynamic.py b/abjad/tools/indicatortools/Dynamic.py
@@ -53,6 +53,11 @@ class Dynamic(AbjadValueObject):
 
     ### CLASS VARIABLES ###
 
+    __slots__ = (
+        '_default_scope',
+        '_name',
+        )
+
     _format_slot = 'right'
 
     _composite_dynamic_name_to_steady_state_dynamic_name = {

diff --git a/abjad/tools/indicatortools/KeySignature.py b/abjad/tools/indicatortools/KeySignature.py
@@ -27,6 +27,12 @@ class KeySignature(AbjadValueObject):
 
     ### CLASS VARIABLES ###
 
+    __slots__ = (
+        '_default_scope',
+        '_mode',
+        '_tonic',
+        )
+
     _format_slot = 'opening'
 
     ### INITIALIZER ###

diff --git a/abjad/tools/mathtools/Infinity.py b/abjad/tools/mathtools/Infinity.py
@@ -35,6 +35,12 @@ class Infinity(AbjadObject):
     global Abjad namespace.
     '''
 
+    ### CLASS VARIABLES ###
+
+    __slots__ = (
+        '_value',
+        )
+
     ### INTIALIZER ###
 
     def __init__(self):
@@ -111,4 +117,4 @@ def _storage_format_specification(self):
             storage_format_pieces=(
                 type(self).__name__,
                 ),
-            )
+            )
diff --git a/abjad/tools/pitchtools/NamedIntervalClass.py b/abjad/tools/pitchtools/NamedIntervalClass.py
@@ -15,6 +15,11 @@ class NamedIntervalClass(IntervalClass):
 
     ### CLASS VARIABLES ###
 
+    __slots__ = (
+        '_number',
+        '_quality_string',
+        )
+
     _acceptable_quality_strings = (
         'perfect',
         'major',
@@ -54,7 +59,6 @@ class NamedIntervalClass(IntervalClass):
 
     def __init__(self, *args):
         from abjad.tools import pitchtools
-        from abjad.tools import sequencetools
         if len(args) == 1 and \
             isinstance(args[0], (pitchtools.NamedInterval,
                 pitchtools.NamedIntervalClass)):

diff --git a/abjad/tools/pitchtools/NamedInversionEquivalentIntervalClass.py b/abjad/tools/pitchtools/NamedInversionEquivalentIntervalClass.py
@@ -14,6 +14,13 @@ class NamedInversionEquivalentIntervalClass(NamedIntervalClass):
     Inversion-equivalent diatonic interval-classes are immutable.
     '''
 
+    ### CLASS VARIABLES ###
+
+    __slots__ = (
+        '_number',
+        '_quality_string',
+        )
+
     ### INITIALIZER ###
 
     def __init__(self, *args):

diff --git a/abjad/tools/timespantools/OffsetTimespanTimeRelation.py b/abjad/tools/timespantools/OffsetTimespanTimeRelation.py
@@ -38,6 +38,13 @@ class OffsetTimespanTimeRelation(TimeRelation):
     Offset / timespan time relations are immutable.
     '''
 
+    ### CLASS VARIABLES ###
+
+    __slots__ = (
+        '_offset',
+        '_timespan',
+        )
+
     ### INITIALIZER ###
 
     def __init__(self, inequality=None, timespan=None, offset=None):
@@ -193,4 +200,4 @@ def timespan(self):
 
         Returns timespan or none.
         '''
-        return self._timespan
+        return self._timespan
diff --git a/abjad/tools/timespantools/TimeRelation.py b/abjad/tools/timespantools/TimeRelation.py
@@ -9,14 +9,20 @@ class TimeRelation(AbjadObject):
     Time relations are immutable.
     '''
 
+    ### CLASS VARIABLES ###
+
+    __slots__ = (
+        '_inequality',
+        )
+
     ### INITIALIZER ###
 
     def __init__(self, inequality=None):
         from abjad.tools import timespantools
-        default_inequality = timespantools.CompoundInequality([
-            'timespan_1.start_offset < timespan_2.start_offset',
-            ])
-        inequality = inequality or default_inequality
+        if not inequality:
+            inequality = timespantools.CompoundInequality([
+                'timespan_1.start_offset < timespan_2.start_offset',
+                ])
         assert isinstance(
             inequality, timespantools.CompoundInequality), repr(inequality)
         self._inequality = inequality

diff --git a/abjad/tools/timespantools/TimespanTimespanTimeRelation.py b/abjad/tools/timespantools/TimespanTimespanTimeRelation.py
@@ -145,10 +145,16 @@ class TimespanTimespanTimeRelation(TimeRelation):
     Timespan / timespan time relations are immutable.
     '''
 
+    ### CLASS VARIABLES ###
+
+    __slots__ = (
+        '_timespan_1',
+        '_timespan_2',
+        )
+
     ### INITIALIZER ###
 
     def __init__(self, inequality=None, timespan_1=None, timespan_2=None):
-        from abjad.tools import timespantools
         TimeRelation.__init__(self, inequality=inequality)
         self._timespan_1 = timespan_1
         self._timespan_2 = timespan_2
@@ -494,4 +500,4 @@ def get_offset_indices(
         elif 0 < len(result):
             message = 'inequality evaluates to disjunct range: {!r}.'
             message = message.format(result)
-            raise Exception(message)
+            raise Exception(message)