Skip to content

Commit ad05116

Browse files
authored
Merge pull request #3179 from hansu/issue-3175
Fix "Change to raw strings to fix Python SyntaxWarning"
2 parents 0fe7982 + ab2c15b commit ad05116

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

src/emc/usr_intf/qtplasmac/qtplasmac-materials.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -285,44 +285,44 @@ def on_convert_clicked(self):
285285
self.materialCutM = 'CUT_MODE = 1'
286286
elif 'PlasmaTool' in line:
287287
valid = True
288-
elif line.startswith('Tool number'):
288+
elif line.startswith(r'Tool\ number'):
289289
a,b = line.split('=')
290290
self.materialNum = '[MATERIAL_NUMBER_{}]'.format(b.strip().replace(']',''))
291291
elif line.startswith('Name='):
292292
a,b = line.split('=',1)
293293
self.materialName = 'NAME = {}'.format(b.strip())
294-
elif line.startswith('Kerf width'):
294+
elif line.startswith(r'Kerf\ width'):
295295
a,b = line.split('=',1)
296296
self.materialKerf = "{id:}{val:.{i}f}".format(id='KERF_WIDTH = ',
297297
i=self.precision, val=float(b.strip()) / self.divisor)
298-
elif line.startswith('Pierce height'):
298+
elif line.startswith(r'Pierce\ height'):
299299
a,b = line.split('=',1)
300300
self.materialPierceH = "{id:}{val:.{i}f}".format(id='PIERCE_HEIGHT = ',
301301
i=self.precision, val=float(b.strip()) / self.divisor)
302-
elif line.startswith('Pierce delay'):
302+
elif line.startswith(r'Pierce\ delay'):
303303
a,b = line.split('=',1)
304304
self.materialPierceD = 'PIERCE_DELAY = {}'.format(b.strip())
305-
elif line.startswith('Cut height'):
305+
elif line.startswith(r'Cut\ height'):
306306
a,b = line.split('=',1)
307307
self.materialCutH = "{id:}{val:.{i}f}".format(id='CUT_HEIGHT = ',
308308
i=self.precision, val=float(b.strip()) / self.divisor)
309-
elif line.startswith('Feed rate'):
309+
elif line.startswith(r'Feed\ rate'):
310310
a,b = line.split('=',1)
311311
self.materialCutS = "{id:}{val:.{i}f}".format(id='CUT_SPEED = ',
312312
i=0, val=float(b.strip()) / self.divisor)
313-
elif line.startswith('Cut current') or (line.startswith('Preset current') and self.materialCutA == 'CUT_AMPS = 0'):
313+
elif line.startswith(r'Cut\ current') or (line.startswith('Preset\ current') and self.materialCutA == 'CUT_AMPS = 0'):
314314
a,b = line.split('=',1)
315315
self.materialCutA = 'CUT_AMPS = {}'.format(b.strip())
316-
elif line.startswith('Cut voltage') or (line.startswith('Preset volts') and self.materialCutV == 'CUT_VOLTS = 0'):
316+
elif line.startswith(r'Cut\ voltage') or (line.startswith('Preset\ volts') and self.materialCutV == 'CUT_VOLTS = 0'):
317317
a,b = line.split('=',1)
318318
self.materialCutV = 'CUT_VOLTS = {}'.format(b.strip())
319-
elif line.startswith('Pause at end of cut'):
319+
elif line.startswith(r'Pause\ at\ end\ of\ cut'):
320320
a,b = line.split('=',1)
321321
self.materialPauseE = 'PAUSE_AT_END = {}'.format(b.strip())
322-
elif line.startswith('Gas pressure') or (line.startswith('Preset Air Pressure') and self.materialGasP == 'GAS_PRESSURE = 0'):
322+
elif line.startswith(r'Gas\ pressure') or (line.startswith('Preset\ Air\ Pressure') and self.materialGasP == 'GAS_PRESSURE = 0'):
323323
a,b = line.split('=',1)
324324
self.materialGasp = 'GAS_PRESSURE = {}'.format(b.strip())
325-
elif line.startswith('Cut mode') or (line.startswith('Preset mode') and self.materialCutM == 'CUT_MODE = 1'):
325+
elif line.startswith(r'Cut\ mode') or (line.startswith('Preset\ mode') and self.materialCutM == 'CUT_MODE = 1'):
326326
a,b = line.split('=',1)
327327
self.materialCutM = 'CUT_MODE = {}'.format(b.strip())
328328
count += 1

0 commit comments

Comments
 (0)