Skip to content

Commit

Permalink
Merge 252724c into 2877eee
Browse files Browse the repository at this point in the history
  • Loading branch information
terrorfisch committed May 17, 2021
2 parents 2877eee + 252724c commit 05cbed9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions qupulse/hardware/feature_awg/tabor.py
Expand Up @@ -549,7 +549,7 @@ def set_repetition_mode(self, program_name: str, repetition_mode: str) -> None:
Throws:
ValueError: this Exception is thrown when an invalid repetition mode is given
"""
if repetition_mode is "infinite" or repetition_mode is "once":
if repetition_mode in ("infinite", "once"):
self._channel_tuple._known_programs[program_name].program._repetition_mode = repetition_mode
else:
raise ValueError("{} is no vaild repetition mode".format(repetition_mode))
Expand Down Expand Up @@ -721,7 +721,7 @@ def run_current_program(self) -> None:
if self._channel_tuple._current_program:
repetition_mode = self._channel_tuple._known_programs[
self._channel_tuple._current_program].program._repetition_mode
if repetition_mode is "infinite":
if repetition_mode == "infinite":
self._cont_repetition_mode()
self._channel_tuple.device[SCPI].send_cmd(':TRIG',
paranoia_level=self._channel_tuple.internal_paranoia_level)
Expand All @@ -737,7 +737,7 @@ def run_current_program(self) -> None:
if self._channel_tuple._current_program:
repetition_mode = self._channel_tuple._known_programs[
self._channel_tuple._current_program].program._repetition_mode
if repetition_mode is "infinite":
if repetition_mode == "infinite":
self._cont_repetition_mode()
self._channel_tuple.device[SCPI].send_cmd(':TRIG', paranoia_level=self._channel_tuple.internal_paranoia_level)
else:
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
Expand Up @@ -62,6 +62,7 @@ python_files=*_tests.py *_bug.py
filterwarnings =
# syntax is action:message_regex:category:module_regex:lineno
# we fail on all with a whitelist because a dependency might mess-up passing the correct stacklevel
error::SyntaxWarning
error::DeprecationWarning
# pytest uses readline which uses collections.abc
ignore:Using or importing the ABCs from \'collections\' instead of from \'collections\.abc\' is deprecated:DeprecationWarning:.*readline.*
Expand Down

0 comments on commit 05cbed9

Please sign in to comment.