From f82ea5a5d4fd4c99c57b8259a4722bcb374bea3d Mon Sep 17 00:00:00 2001
From: Ricky O'Steen <39831871+rosteen@users.noreply.github.com>
Date: Mon, 31 Jul 2023 17:09:57 -0400
Subject: [PATCH] Fix some comparisons that should have been using isinstance
 (#1071)

---
 specutils/spectra/spectrum1d.py       |  6 +++---
 specutils/tests/test_spectral_axis.py | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/specutils/spectra/spectrum1d.py b/specutils/spectra/spectrum1d.py
index 1065f57d8..33f5343be 100644
--- a/specutils/spectra/spectrum1d.py
+++ b/specutils/spectra/spectrum1d.py
@@ -397,9 +397,9 @@ def __getitem__(self, item):
         """
         new_spectral_axis_index = self.spectral_axis_index
 
-        if self.flux.ndim > 1 or (type(item) == tuple and item[0] == Ellipsis):
-            if type(item) == tuple:
-                if len(item) == self.flux.ndim or item[0] == Ellipsis:
+        if self.flux.ndim > 1 or (isinstance(item, tuple) and item[0] is Ellipsis):
+            if isinstance(item, tuple):
+                if len(item) == len(self.flux.shape) or item[0] is Ellipsis:
                     spec_item = item[self.spectral_axis_index]
                     if not isinstance(spec_item, slice):
                         if isinstance(item, u.Quantity):
diff --git a/specutils/tests/test_spectral_axis.py b/specutils/tests/test_spectral_axis.py
index d5013f0f2..f2c737fd1 100644
--- a/specutils/tests/test_spectral_axis.py
+++ b/specutils/tests/test_spectral_axis.py
@@ -172,7 +172,7 @@ def test_change_redshift():
 
     assert spec.redshift.unit.physical_type == 'dimensionless'
     assert_quantity_allclose(spec.redshift, u.Quantity(0))
-    assert type(spec.spectral_axis) == SpectralAxis
+    assert isinstance(spec.spectral_axis, SpectralAxis)
 
     with pytest.warns(
         AstropyDeprecationWarning,
@@ -182,13 +182,13 @@ def test_change_redshift():
 
     assert spec.redshift.unit.physical_type == 'dimensionless'
     assert_quantity_allclose(spec.redshift, u.Quantity(0.1))
-    assert type(spec.spectral_axis) == SpectralAxis
+    assert isinstance(spec.spectral_axis, SpectralAxis)
 
     spec = Spectrum1D(spectral_axis=wave, flux=flux, redshift=0.2)
 
     assert spec.redshift.unit.physical_type == 'dimensionless'
     assert_quantity_allclose(spec.redshift, u.Quantity(0.2))
-    assert type(spec.spectral_axis) == SpectralAxis
+    assert isinstance(spec.spectral_axis, SpectralAxis)
 
     with pytest.warns(
         AstropyDeprecationWarning,
@@ -198,7 +198,7 @@ def test_change_redshift():
 
     assert spec.redshift.unit.physical_type == 'dimensionless'
     assert_quantity_allclose(spec.redshift, u.Quantity(0.4))
-    assert type(spec.spectral_axis) == SpectralAxis
+    assert isinstance(spec.spectral_axis, SpectralAxis)
 
 
 def test_no_change_redshift():
@@ -208,13 +208,13 @@ def test_no_change_redshift():
 
     assert spec.redshift.unit.physical_type == 'dimensionless'
     assert_quantity_allclose(spec.redshift, u.Quantity(0))
-    assert type(spec.spectral_axis) == SpectralAxis
+    assert isinstance(spec.spectral_axis, SpectralAxis)
 
     spec.set_redshift_to(0.5)
 
     assert spec.redshift.unit.physical_type == 'dimensionless'
     assert_quantity_allclose(spec.redshift, u.Quantity(0.5))
-    assert type(spec.spectral_axis) == SpectralAxis
+    assert isinstance(spec.spectral_axis, SpectralAxis)
 
     assert_quantity_allclose(spec.wavelength, wave)