From 69a14678de1c4f9b35414cbb00f33330478e4c58 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@sentrium.io>
Date: Fri, 25 Oct 2019 20:47:25 -0500
Subject: [vyos.config] T1758: adjust regex for change in Python 3.7
Python 3.7 considers r'\s*' an empty pattern match, instead of the
previous behaviour of matching whitespace characters.
---
python/vyos/config.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/python/vyos/config.py b/python/vyos/config.py
index 3a340b2da..7f65a9397 100644
--- a/python/vyos/config.py
+++ b/python/vyos/config.py
@@ -127,7 +127,7 @@ class Config(object):
# It may cause problems with exists() when it's used for checking values,
# since values may contain whitespace.
if isinstance(path, str):
- path = re.split(r'\s*', path)
+ path = re.split(r'\s+', path)
elif isinstance(path, list):
pass
else:
@@ -161,7 +161,7 @@ class Config(object):
# and path supplied as method argument
# XXX: for small strings in-place concatenation is not a problem
if isinstance(path, str):
- self._level = re.split(r'\s*', path)
+ self._level = re.split(r'\s+', path)
elif isinstance(path, list):
self._level = path
else:
@@ -192,7 +192,7 @@ class Config(object):
else:
# libvyosconfig exists() works only for _nodes_, not _values_
# libvyattacfg one also worked for values, so we emulate that case here
- path = re.split(r'\s*', path)
+ path = re.split(r'\s+', path)
path_without_value = path[:-1]
path_str = " ".join(path_without_value)
try:
--
cgit v1.2.3