Merge pull request #683 from mwcraig/no-object-subclass

Remove a bit more python2 stuff

ccdproc/combiner.py

@@ -12,7 +12,7 @@
 __all__ = ['Combiner', 'combine']
 
 
-class Combiner(object):
+class Combiner:
     """
     A class for combining CCDData objects.
 

ccdproc/core.py

@@ -1861,7 +1861,7 @@ def bitfield_to_boolean_mask(bitfield, ignore_bits=0, flip_bits=None):
         good_mask_value=False, dtype=bool)
 
 
-class Keyword(object):
+class Keyword:
     """
     """
     def __init__(self, name, unit=None, value=None):

ccdproc/image_collection.py

@@ -27,7 +27,7 @@
 _ASTROPY_LT_1_3 = not minversion("astropy", "1.3")
 
 
-class ImageFileCollection(object):
+class ImageFileCollection:
     """
     Representation of a collection of image files.
 

ccdproc/tests/pytest_fixtures.py

@@ -164,7 +164,7 @@ def teardown():
 
     request.addfinalizer(teardown)
 
-    class Result(object):
+    class Result:
         def __init__(self, n, directory):
             self.n_test = n
             self.test_dir = directory

ccdproc/tests/test_image_collection.py

@@ -43,7 +43,7 @@ def test_fits_summary(triage_setup):
     assert summary['filter'][no_filter_no_object_row].mask
 
 
-class TestImageFileCollectionRepresentation(object):
+class TestImageFileCollectionRepresentation:
     def test_repr_location(self, triage_setup):
         ic = ImageFileCollection(location=triage_setup.test_dir)
         assert repr(ic) == "ImageFileCollection(location={0!r})".format(
@@ -93,11 +93,12 @@ def test_repr_ext(self, triage_setup):
                .format(triage_setup.test_dir))
         assert repr(ic) == ref
 
+
 # This should work mark all test methods as using the triage_setup
 # fixture, but it doesn't, so the fixture is given explicitly as an
 # argument to each method.
 # @pytest.mark.usefixtures("triage_setup")
-class TestImageFileCollection(object):
+class TestImageFileCollection:
     def _setup_logger(self, path, level=logging.WARN):
         """
         Set up file logger at the path.