Skip to content

Fix: multiple string escape warnings thrown by python 12 #2748

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

Merged
WhoBrokeTheBuild merged 1 commit into from
Apr 25, 2024
Merged

Fix: multiple string escape warnings thrown by python 12 #2748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pydevices/MitDevices/dt100.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def acq2sh(self, command):

def waitState(self, state):
import pexpect
regstr = '([0-9\.]*) [0-9] ST_(.*)\r\n'
regstr = '([0-9\\.]*) [0-9] ST_(.*)\r\n'
dprint("waitState %s" % regstr)
wantex = re.compile(regstr)

Expand Down
4 changes: 2 additions & 2 deletions pydevices/RfxDevices/CYGNET4K.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ def setValue(self, addrlist, value, useExtReg=False):
def resetMicro(self):
"""Will trap Micro causing watchdog and reset of firmware."""
# The camera will give no response to this command
self.serialIO(b'\x55\x99\x66\x11\x50\EB', None)
self.serialIO(b'\x55\x99\x66\x11\x50\xEB', None)
return self

def setSystemState(self, byte):
Expand Down Expand Up @@ -458,7 +458,7 @@ def setRoiXSize(self, value):

def setRoiXOffset(self, value):
"""set ROI X offset as 12-bit value"""
return self.setValue(b'\81\x82', min(0xFFF, value), True)
return self.setValue(b'\x81\x82', min(0xFFF, value), True)

def setRoiYSize(self, value):
"""set ROI Y size as 12-bit value"""
Expand Down
2 changes: 1 addition & 1 deletion pydevices/RfxDevices/FAKECAMERA.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class FAKECAMERA(Device):
{'path': ':COMMENT', 'type': 'text'},
{'path': ':EXP_NAME', 'type': 'text', 'value': 'cameratest'},
{'path': ':EXP_SHOT', 'type': 'text', 'value': '84'},
{'path': ':EXP_NODE', 'type': 'text', 'value': '\CAMERATEST::FLIR:FRAMES'},
{'path': ':EXP_NODE', 'type': 'text', 'value': '\\CAMERATEST::FLIR:FRAMES'},
{'path': ':FRAME_RATE', 'type': 'numeric', 'value': 25},
{'path': ':READ_LOOP', 'type': 'text', 'value': 'NO'},
{'path': ':STREAMING', 'type': 'text', 'value': 'Stream and Store'},
Expand Down
4 changes: 2 additions & 2 deletions pydevices/RfxDevices/PLFE.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,9 @@ def copyBits(self, source, dest, mask):

def deserialize_msg(self, msg):
assert re.match(
'^(\#[0-5][01]([01][0-9][0-9]|2[0-4][0-9]|25[0-5])){6}$', msg)
'^(\\#[0-5][01]([01][0-9][0-9]|2[0-4][0-9]|25[0-5])){6}$', msg)

# assert re.match('^(\#[0-5][01]([01][0-9][0-9]|2[0-5][0-5])){6}$', msg)
# assert re.match('^(\\#[0-5][01]([01][0-9][0-9]|2[0-5][0-5])){6}$', msg)

data = []

Expand Down