Skip to content

Commit

Permalink
JP-3725: Remove DefaultOrderedDict (spacetelescope#8915)
Browse files Browse the repository at this point in the history
  • Loading branch information
emolter authored and hayescr committed Oct 29, 2024
1 parent 2d5fe0a commit bdfe87f
Showing 1 changed file with 2 additions and 47 deletions.
49 changes: 2 additions & 47 deletions jwst/exp_to_source/exp_to_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"""
import logging

from collections import OrderedDict
from collections.abc import Callable
from collections import defaultdict

from stdatamodels.properties import merge_tree
from stdatamodels.jwst.datamodels import MultiExposureModel
Expand Down Expand Up @@ -31,7 +30,7 @@ def exp_to_source(inputs):
instance contains slits belonging to the same source.
The key is the ID of each source, i.e. ``source_id``.
"""
result = DefaultOrderedDict(MultiExposureModel)
result = defaultdict(MultiExposureModel)

for exposure in inputs:
log.info(f'Reorganizing data from exposure {exposure.meta.filename}')
Expand Down Expand Up @@ -111,47 +110,3 @@ def multislit_to_container(inputs):
containers[id] = SourceModelContainer(containers[id])

return containers


class DefaultOrderedDict(OrderedDict):
# Source http://stackoverflow.com/a/6190500/562769
def __init__(self, default_factory=None, *a, **kw):
if (default_factory is not None and
not isinstance(default_factory, Callable)):
raise TypeError('first argument must be callable')
OrderedDict.__init__(self, *a, **kw)
self.default_factory = default_factory

def __getitem__(self, key):
try:
return OrderedDict.__getitem__(self, key)
except KeyError:
return self.__missing__(key)

def __missing__(self, key):
if self.default_factory is None:
raise KeyError(key)
self[key] = value = self.default_factory()
return value

def __reduce__(self):
if self.default_factory is None:
args = tuple()
else:
args = self.default_factory,
return type(self), args, None, None, self.items()

def copy(self):
return self.__copy__()

def __copy__(self):
return type(self)(self.default_factory, self)

def __deepcopy__(self, memo):
import copy
return type(self)(self.default_factory,
copy.deepcopy(self.items()))

def __repr__(self):
return 'OrderedDefaultDict(%s, %s)' % (self.default_factory,
OrderedDict.__repr__(self))

0 comments on commit bdfe87f

Please sign in to comment.