Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flush missed v0.13 backlog items. #4600

Merged
merged 4 commits into from
Oct 26, 2021
Merged

Flush missed v0.13 backlog items. #4600

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55325b5
Flush missed v0.13 backlog items.
MichaelBroughton Oct 26, 2021
8b6d53c
include gate_operation
MichaelBroughton Oct 26, 2021
394e56f
Merge remote-tracking branch 'upstream/master' into v13_flush
MichaelBroughton Oct 26, 2021
929551d
lint.
MichaelBroughton Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
include gate_operation
  • Loading branch information
@MichaelBroughton
MichaelBroughton committed Oct 26, 2021
commit 8b6d53c9cef2502273dfb5aaf5239d6339ab229a
16 changes: 0 additions & 16 deletions cirq-core/cirq/ops/gate_operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,28 +222,12 @@ def _measurement_key_name_(self) -> Optional[str]:
getter = getattr(self.gate, '_measurement_key_name_', None)
if getter is not None:
return getter()
getter = getattr(self.gate, '_measurement_key_', None)
if getter is not None:
_warn_or_error(
f'_measurement_key_ was used but is deprecated.\n'
f'It will be removed in cirq v0.13.\n'
f'Use _measurement_key_name_ instead.\n'
)
return getter()
return NotImplemented

def _measurement_key_names_(self) -> Optional[AbstractSet[str]]:
getter = getattr(self.gate, '_measurement_key_names_', None)
if getter is not None:
return getter()
getter = getattr(self.gate, '_measurement_keys_', None)
if getter is not None:
_warn_or_error(
f'_measurement_keys_ was used but is deprecated.\n'
f'It will be removed in cirq v0.13.\n'
f'Use _measurement_key_names_ instead.\n'
)
return getter()
return NotImplemented

def _measurement_key_obj_(self) -> Optional[value.MeasurementKey]:
Expand Down