From d300b9e57ffc3d5252e90a89f3fcc7a4936a27ad Mon Sep 17 00:00:00 2001
From: douglas-raillard-arm <douglas.raillard@gmail.com>
Date: Mon, 16 Nov 2020 15:50:48 +0000
Subject: [PATCH] devlib.utils: Fix escape sequences

Fix invalid escape sequence, mostly in regex that were not r-strings.
---
 devlib/utils/android.py | 2 +-
 devlib/utils/gem5.py    | 2 +-
 devlib/utils/misc.py    | 2 +-
 devlib/utils/ssh.py     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/devlib/utils/android.py b/devlib/utils/android.py
index e1c968f..d77eecd 100755
--- a/devlib/utils/android.py
+++ b/devlib/utils/android.py
@@ -649,7 +649,7 @@ def grant_app_permissions(target, package):
     dumpsys = target.execute('dumpsys package {}'.format(package))
 
     permissions = re.search(
-        'requested permissions:\s*(?P<permissions>(android.permission.+\s*)+)', dumpsys
+        r'requested permissions:\s*(?P<permissions>(android.permission.+\s*)+)', dumpsys
     )
     if permissions is None:
         return
diff --git a/devlib/utils/gem5.py b/devlib/utils/gem5.py
index d25574a..cc48c07 100644
--- a/devlib/utils/gem5.py
+++ b/devlib/utils/gem5.py
@@ -18,7 +18,7 @@ import logging
 from devlib.utils.types import numeric
 
 
-GEM5STATS_FIELD_REGEX = re.compile("^(?P<key>[^- ]\S*) +(?P<value>[^#]+).+$")
+GEM5STATS_FIELD_REGEX = re.compile(r"^(?P<key>[^- ]\S*) +(?P<value>[^#]+).+$")
 GEM5STATS_DUMP_HEAD = '---------- Begin Simulation Statistics ----------'
 GEM5STATS_DUMP_TAIL = '---------- End Simulation Statistics   ----------'
 GEM5STATS_ROI_NUMBER = 8
diff --git a/devlib/utils/misc.py b/devlib/utils/misc.py
index 2e29f69..d2aabfa 100644
--- a/devlib/utils/misc.py
+++ b/devlib/utils/misc.py
@@ -495,7 +495,7 @@ def escape_spaces(text):
 
     .. note:: :func:`pipes.quote` should be favored where possible.
     """
-    return text.replace(' ', '\ ')
+    return text.replace(' ', '\\ ')
 
 
 def getch(count=1):
diff --git a/devlib/utils/ssh.py b/devlib/utils/ssh.py
index bf2f828..0177e31 100644
--- a/devlib/utils/ssh.py
+++ b/devlib/utils/ssh.py
@@ -1396,7 +1396,7 @@ class Gem5Connection(TelnetConnection):
         both of these.
         """
         gem5_logger.debug("Sending Sync")
-        self.conn.send("echo \*\*sync\*\*\n")
+        self.conn.send("echo \\*\\*sync\\*\\*\n")
         self.conn.expect(r"\*\*sync\*\*", timeout=self.default_timeout)
         self.conn.expect([self.conn.UNIQUE_PROMPT, self.conn.PROMPT], timeout=self.default_timeout)
         self.conn.expect([self.conn.UNIQUE_PROMPT, self.conn.PROMPT], timeout=self.default_timeout)