Skip to content

Commit

Permalink
Cleanup inconsistency in take_exposure call (#457)
Browse files Browse the repository at this point in the history
The base method and sbig expect `*args, **kwargs`. Warning messages
were appearing in the tests for the simulator
  • Loading branch information
wtgee authored Feb 8, 2018
1 parent 7c3d2fb commit f64f2be
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pocs/camera/canon_gphoto2.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def take_observation(self, observation, headers=None, filename=None, *args, **kw

return camera_event

def take_exposure(self, seconds=1.0 * u.second, filename=None):
def take_exposure(self, seconds=1.0 * u.second, filename=None, *args, **kwargs):
"""Take an exposure for given number of seconds and saves to provided filename
Note:
Expand Down
8 changes: 7 additions & 1 deletion pocs/camera/simulator.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,13 @@ def take_observation(self, observation, headers=None, filename=None, *args, **kw

return camera_event

def take_exposure(self, seconds=1.0 * u.second, filename=None, dark=False, blocking=False):
def take_exposure(self,
seconds=1.0 * u.second,
filename=None,
dark=False,
blocking=False,
*args,
**kwargs):
""" Take an exposure for given number of seconds """
assert self.is_connected, self.logger.error("Camera must be connected for take_exposure!")

Expand Down

0 comments on commit f64f2be

Please sign in to comment.