From 532b561288f6a9628073e68aaa51b87d9c20e838 Mon Sep 17 00:00:00 2001
From: Ulf Magnusson <ulfalizer@gmail.com>
Date: Mon, 22 Jan 2018 19:20:13 +0100
Subject: Simplify escape()

The fancy regex isn't really justified. Much faster with replace() too,
though this is an unlikely hotspot.

Could have used a \g<0> backreference to refer to the entire match
instead of using a capturing group too. Hadn't discovered that.

Add some selftests for escape() and unescape() too.
---
 kconfiglib.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'kconfiglib.py')

diff --git a/kconfiglib.py b/kconfiglib.py
index f1a254d..550c347 100644
--- a/kconfiglib.py
+++ b/kconfiglib.py
@@ -3671,17 +3671,17 @@ def expr_str(expr):
                              _REL_TO_STR[expr[0]],
                              expr_str(expr[2]))
 
-# escape()/unescape() helpers
-_escape_re_sub = re.compile(r'(["\\])').sub
-_unescape_re_sub = re.compile(r"\\(.)").sub
-
 def escape(s):
     r"""
     Escapes the string 's' in the same fashion as is done for display in
     Kconfig format and when writing strings to a .config file. " and \ are
     replaced by \" and \\, respectively.
     """
-    return _escape_re_sub(r"\\\1", s)
+    # \ must be escaped before " to avoid double escaping
+    return s.replace("\\", r"\\").replace('"', r'\"')
+
+# unescape() helper
+_unescape_re_sub = re.compile(r"\\(.)").sub
 
 def unescape(s):
     r"""
-- 
cgit v1.2.3