update line properties code for Python 3.8

murrayrm · murrayrm · commit dd6983ef83e5 · 2023-07-02T21:14:27.000-07:00
diff --git a/control/tests/timeplot_test.py b/control/tests/timeplot_test.py
@@ -312,6 +312,7 @@ def test_combine_traces():
         combresp6 = ct.combine_traces([resp1, resp])
 
 
+@slycotonly
 def test_linestyles():
     # Check to make sure we can change line styles
     sys_mimo = ct.tf2ss(
diff --git a/control/timeplot.py b/control/timeplot.py
@@ -395,10 +395,11 @@ def _make_line_label(signal_index, signal_labels, trace_index):
 
             # Set up line properties for this output, trace
             if len(fmt) == 0:
-                line_props = \
-                    output_props[i % oprop_len if overlay_signals else 0] | \
-                    trace_props[trace % tprop_len if overlay_traces else 0] | \
-                    kwargs
+                line_props = output_props[
+                    i % oprop_len if overlay_signals else 0].copy()
+                line_props.update(
+                    trace_props[trace % tprop_len if overlay_traces else 0])
+                line_props.update(kwargs)
             else:
                 line_props = kwargs
 
@@ -418,10 +419,11 @@ def _make_line_label(signal_index, signal_labels, trace_index):
 
             # Set up line properties for this output, trace
             if len(fmt) == 0:
-                line_props = \
-                    input_props[i % iprop_len if overlay_signals else 0] | \
-                    trace_props[trace % tprop_len if overlay_traces else 0] | \
-                    kwargs
+                line_props = input_props[
+                    i % iprop_len if overlay_signals else 0].copy()
+                line_props.update(
+                    trace_props[trace % tprop_len if overlay_traces else 0])
+                line_props.update(kwargs)
             else:
                 line_props = kwargs
 
