diff options
| author | Scott Moser <smoser@ubuntu.com> | 2018-04-18 03:35:41 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-04-18 03:35:41 -0600 |
| commit | acca826adf39ddfedde78cfbfc47e81a06c6f42a (patch) | |
| tree | 3f30b915acc60f31e12ed5467ba9b1e1fe990f42 /cloudinit/util.py | |
| parent | 6a979bb2fabd187efc392de7b0852cd0361bc9b8 (diff) | |
| download | vyos-cloud-init-acca826adf39ddfedde78cfbfc47e81a06c6f42a.tar.gz vyos-cloud-init-acca826adf39ddfedde78cfbfc47e81a06c6f42a.zip | |
pycodestyle: Fix invalid escape sequences in string literals.
Python has deprecated these invalid string literals now
https://bugs.python.org/issue27364
and pycodestyle is identifying them with a W605 warning.
https://github.com/PyCQA/pycodestyle/pull/676
So basically, any use of \ not followed by one of [\'"abfnrtv]
or \ooo (octal) \xhh (hex) or a newline is invalid. This is most
comomnly seen for us in regex. To solve, you either:
a.) use a raw string r'...'
b.) correctly escape the \ that was not intended to be interpreted.
Diffstat (limited to 'cloudinit/util.py')
| -rw-r--r-- | cloudinit/util.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index acdc0d85..1717b529 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -1446,7 +1446,7 @@ def get_config_logfiles(cfg): for fmt in get_output_cfg(cfg, None): if not fmt: continue - match = re.match('(?P<type>\||>+)\s*(?P<target>.*)', fmt) + match = re.match(r'(?P<type>\||>+)\s*(?P<target>.*)', fmt) if not match: continue target = match.group('target') @@ -2275,8 +2275,8 @@ def parse_mount(path): # the regex is a bit complex. to better understand this regex see: # https://regex101.com/r/2F6c1k/1 # https://regex101.com/r/T2en7a/1 - regex = r'^(/dev/[\S]+|.*zroot\S*?) on (/[\S]*) ' + \ - '(?=(?:type)[\s]+([\S]+)|\(([^,]*))' + regex = (r'^(/dev/[\S]+|.*zroot\S*?) on (/[\S]*) ' + r'(?=(?:type)[\s]+([\S]+)|\(([^,]*))') for line in mount_locs: m = re.search(regex, line) if not m: |