search

labscript-suite / labscript

The 𝗹𝗮𝗯𝘀𝗰𝗿𝗶𝗽𝘁 library provides a translation from expressive Python code to low-level hardware instructions.
http://labscriptsuite.org
BSD 2-Clause "Simplified" License
9 stars 51 forks source link

Fix #78: labscript.py accidentally overwrites dedent() #79

Closed zakv closed 3 years ago

zakv commented 3 years ago

As explained in #78, the from pylab import * line in labscript.py imports dedent() from matplotlib.cbook which overwrites the desired dedent() imported from labscript_utils. This PR switches the order of those import statements so that dedent() points to labscript_utils.dedent().

zakv commented 3 years ago

Just realized that this didn't link with the issue like I had intended because I didn't use the magic word. This fixes #78.

zakv commented 3 years ago

Actually I don't think my last comment worked. #78 might have to be closed manually if/when this PR is merged.

philipstarkey commented 3 years ago

I've linked it manually. Possibly the magic phrases only work if you edit the first comment/PR description? I'm not sure!

zakv commented 3 years ago

Awesome, thanks!

zakv commented 3 years ago

This is a pretty straightforward and minimal change, so I'm going to merge it