Commit 7e4f2b2e authored by Kipp Cannon's avatar Kipp Cannon

cache.py: replace deprecated function

- glue.ligolw.lsctables.instrument_set_from_ifos() --> glue.ligolw.lsctables.instrumentsproperty.get()
Original: df2f43d7182a77e1d5b3030652749cedf50b9787
parent a9a6d422
...@@ -307,7 +307,7 @@ class CacheEntry(object): ...@@ -307,7 +307,7 @@ class CacheEntry(object):
The \"observatory\" column of the cache entry, which is frequently The \"observatory\" column of the cache entry, which is frequently
used to store instrument names, is parsed into instrument names for used to store instrument names, is parsed into instrument names for
the dictionary keys using the same rules as the dictionary keys using the same rules as
glue.ligolw.lsctables.instrument_set_from_ifos(). glue.ligolw.lsctables.instrumentsproperty.get().
Example: Example:
...@@ -317,8 +317,8 @@ class CacheEntry(object): ...@@ -317,8 +317,8 @@ class CacheEntry(object):
""" """
# the import has to be done here to break the cyclic # the import has to be done here to break the cyclic
# dependancy # dependancy
from glue.ligolw.lsctables import instrument_set_from_ifos from glue.ligolw.lsctables import instrumentsproperty
instruments = instrument_set_from_ifos(self.observatory) or (None,) instruments = instrumentsproperty.get(self.observatory) or (None,)
return segments.segmentlistdict((instrument, segments.segmentlist(self.segment is not None and [self.segment] or [])) for instrument in instruments) return segments.segmentlistdict((instrument, segments.segmentlist(self.segment is not None and [self.segment] or [])) for instrument in instruments)
@classmethod @classmethod
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment