Merge branch 'circuit-stretch' into stretchy-delay

kevinhartman · Feb 20, 2025 · 907853e · 907853e
2 parents 803fa8f + 86ac649
commit 907853e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/qiskit/qasm3/exporter.py b/qiskit/qasm3/exporter.py
@@ -1304,7 +1304,7 @@ def visit_value(self, node, /):
                 return ast.DurationLiteral(node.value[0], ast.DurationUnit.MICROSECOND)
             if isinstance(node.value, Duration.ms):
                 return ast.DurationLiteral(node.value[0], ast.DurationUnit.MILLISECOND)
-            if isinstance(node.value, Duration.sec):
+            if isinstance(node.value, Duration.s):
                 return ast.DurationLiteral(node.value[0], ast.DurationUnit.SECOND)
         raise RuntimeError(f"unhandled Value type '{node}'")
 

diff --git a/qiskit/qpy/binary_io/value.py b/qiskit/qpy/binary_io/value.py
@@ -438,7 +438,7 @@ def _write_duration(file_obj, duration: Duration):
     elif isinstance(duration, Duration.ms):
         file_obj.write(type_keys.CircuitDuration.MS)
         file_obj.write(struct.pack(formats.DURATION_MS_PACK, *formats.DURATION_MS(duration[0])))
-    elif isinstance(duration, Duration.sec):
+    elif isinstance(duration, Duration.s):
         file_obj.write(type_keys.CircuitDuration.S)
         file_obj.write(struct.pack(formats.DURATION_S_PACK, *formats.DURATION_S(duration[0])))
     else:

diff --git a/qiskit/qpy/type_keys.py b/qiskit/qpy/type_keys.py
@@ -583,7 +583,7 @@ def assign(cls, obj):
             return cls.US
         elif isinstance(obj, Duration.ms):
             return cls.MS
-        elif isinstance(obj, Duration.sec):
+        elif isinstance(obj, Duration.s):
             return cls.S
         else:
             raise exceptions.QpyError(