From 3dea4973cd8a88b756cdf873420258a422e88ed2 Mon Sep 17 00:00:00 2001 From: Jindun SHAO Date: Thu, 17 May 2018 17:32:53 +0200 Subject: [PATCH 1/2] Fix warnings --- .gitignore | 3 +++ src/yaml_tools.py | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c38c3a7..7857e5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ /venv/ /.idea +/.vscode/ + yaml-tools.iml + *.pyc .coverage diff --git a/src/yaml_tools.py b/src/yaml_tools.py index d9d21f7..8d9411a 100644 --- a/src/yaml_tools.py +++ b/src/yaml_tools.py @@ -61,7 +61,7 @@ def has_valid_brackets(s): :param s: e.g. my_list[0] :return: (True, key, index) or (None, None, None) """ - list_regex = re.compile("\A\w+\[{1}\d+\]{1}\Z") + list_regex = re.compile(r"\A\w+\[{1}\d+\]{1}\Z") if list_regex.match(s) is not None: key = s[:int(s.find('['))] index = int(s[s.find('[') + 1: len(s) - 1]) @@ -128,10 +128,10 @@ def delete(): is_array, key, index = has_valid_brackets(item_to_delete) try: if is_array: - tmp = item_parent[key][index] # to trigger a KeyError if not found + item_parent[key][index] # to trigger a KeyError if not found del item_parent[key][index] else: - tmp = item_parent[item_to_delete] + item_parent[item_to_delete] del item_parent[item_to_delete] except (AttributeError, KeyError, IndexError, TypeError): print("An error occurred when deleting '{}' :".format(item_to_delete)) From 37dbd9471b7c0555ec8ba43ca9249f64f2cb67e6 Mon Sep 17 00:00:00 2001 From: Jindun SHAO Date: Fri, 25 May 2018 16:03:10 +0200 Subject: [PATCH 2/2] adding shebang --- src/yaml_tools.py | 2 ++ 1 file changed, 2 insertions(+) mode change 100644 => 100755 src/yaml_tools.py diff --git a/src/yaml_tools.py b/src/yaml_tools.py old mode 100644 new mode 100755 index 8d9411a..4b039ac --- a/src/yaml_tools.py +++ b/src/yaml_tools.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + import sys import argparse import ruamel.yaml