Make constants class variables

Author: mwcraig

astrowidgets/ginga.py

@@ -23,12 +23,6 @@
 
 __all__ = ['ImageWidget']
 
-# Allowed locations for cursor display
-ALLOWED_CURSOR_LOCATIONS = ['top', 'bottom', None]
-
-# List of marker names that are for internal use only
-RESERVED_MARKER_SET_NAMES = ['all']
-
 
 class ImageWidget(ipyw.VBox):
     """
@@ -55,6 +49,11 @@ class ImageWidget(ipyw.VBox):
         correct value to use.*
 
     """
+    # Allowed locations for cursor display
+    ALLOWED_CURSOR_LOCATIONS = ('top', 'bottom', None)
+
+    # List of marker names that are for internal use only
+    RESERVED_MARKER_SET_NAMES = ('all', )
 
     def __init__(self, logger=None, image_width=500, image_height=500,
                  pixel_coords_offset=0, **kwargs):
@@ -648,11 +647,11 @@ def _validate_marker_name(self, marker_name):
         """
         Raise an error if the marker_name is not allowed.
         """
-        if marker_name in RESERVED_MARKER_SET_NAMES:
+        if marker_name in self.RESERVED_MARKER_SET_NAMES:
             raise ValueError('The marker name {} is not allowed. Any name is '
                              'allowed except these: '
                              '{}'.format(marker_name,
-                                         ', '.join(RESERVED_MARKER_SET_NAMES)))
+                                         ', '.join(self.RESERVED_MARKER_SET_NAMES)))
 
     def add_markers(self, table, x_colname='x', y_colname='y',
                     skycoord_colname='coord', use_skycoord=False,
@@ -888,7 +887,7 @@ def cursor(self, val):
         else:
             raise ValueError('Invalid value {} for cursor.'
                              'Valid values are: '
-                             '{}'.format(val, ALLOWED_CURSOR_LOCATIONS))
+                             '{}'.format(val, self.ALLOWED_CURSOR_LOCATIONS))
         self._cursor = val
 
     @property

astrowidgets/interface_definition.py

@@ -30,6 +30,12 @@ class ImageViewerInterface(Protocol):
     stretch: str
     # viewer: Any
 
+    # Allowed locations for cursor display
+    ALLOWED_CURSOR_LOCATIONS = ('top', 'bottom', None)
+
+    # List of marker names that are for internal use only
+    RESERVED_MARKER_SET_NAMES = ('all')
+
     # The methods, grouped loosely by purpose
 
     # Methods for loading data