diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-11 00:32:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-11 00:32:27 -0500 |
| commit | 74e4c9d9976f0eb529fdd7fb21cd88ad1a47553f (patch) | |
| tree | 723585c89c8da3798285d4218f76f249d3a3d447 /roles/lib_utils | |
| parent | 0c08ff121fbd32cb71ee241b4e33df84bd3d7506 (diff) | |
| parent | 9826ad6c9edcfeb9af9c3e7e166b402ba64ea4bf (diff) | |
| download | openshift-74e4c9d9976f0eb529fdd7fb21cd88ad1a47553f.tar.gz openshift-74e4c9d9976f0eb529fdd7fb21cd88ad1a47553f.tar.bz2 openshift-74e4c9d9976f0eb529fdd7fb21cd88ad1a47553f.tar.xz openshift-74e4c9d9976f0eb529fdd7fb21cd88ad1a47553f.zip | |
Merge pull request #4156 from mwoodson/fix_yedit_seps
Merged by openshift-bot
Diffstat (limited to 'roles/lib_utils')
| -rw-r--r-- | roles/lib_utils/library/yedit.py | 2 | ||||
| -rw-r--r-- | roles/lib_utils/src/class/yedit.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/lib_utils/library/yedit.py b/roles/lib_utils/library/yedit.py index 9adaeeb52..928b067aa 100644 --- a/roles/lib_utils/library/yedit.py +++ b/roles/lib_utils/library/yedit.py @@ -212,7 +212,7 @@ class YeditException(Exception): class Yedit(object): ''' Class to modify yaml files ''' re_valid_key = r"(((\[-?\d+\])|([0-9a-zA-Z%s/_-]+)).?)+$" - re_key = r"(?:\[(-?\d+)\])|([0-9a-zA-Z%s/_-]+)" + re_key = r"(?:\[(-?\d+)\])|([0-9a-zA-Z{}/_-]+)" com_sep = set(['.', '#', '|', ':']) # pylint: disable=too-many-arguments diff --git a/roles/lib_utils/src/class/yedit.py b/roles/lib_utils/src/class/yedit.py index e0a27012f..957c35a06 100644 --- a/roles/lib_utils/src/class/yedit.py +++ b/roles/lib_utils/src/class/yedit.py @@ -11,7 +11,7 @@ class YeditException(Exception): class Yedit(object): ''' Class to modify yaml files ''' re_valid_key = r"(((\[-?\d+\])|([0-9a-zA-Z%s/_-]+)).?)+$" - re_key = r"(?:\[(-?\d+)\])|([0-9a-zA-Z%s/_-]+)" + re_key = r"(?:\[(-?\d+)\])|([0-9a-zA-Z{}/_-]+)" com_sep = set(['.', '#', '|', ':']) # pylint: disable=too-many-arguments |