diff --git a/ppadb/command/transport/__init__.py b/ppadb/command/transport/__init__.py index 1adadf6..768094a 100644 --- a/ppadb/command/transport/__init__.py +++ b/ppadb/command/transport/__init__.py @@ -92,7 +92,7 @@ def list_packages(self): def get_properties(self): result = self.shell("getprop") - result_pattern = "^\[([\s\S]*?)\]: \[([\s\S]*?)\]\r?$" + result_pattern = r"^\[([\s\S]*?)\]: \[([\s\S]*?)\]\r?$" properties = {} for line in result.split('\n'): diff --git a/ppadb/device.py b/ppadb/device.py index dd08ec4..ffcb32b 100644 --- a/ppadb/device.py +++ b/ppadb/device.py @@ -31,7 +31,7 @@ class Device(Transport, Serial, Input, Utils, WM, Traffic, CPUStat, BatteryStats): - INSTALL_RESULT_PATTERN = "(Success|Failure|Error)\s?(.*)" + INSTALL_RESULT_PATTERN = r"(Success|Failure|Error)\s?(.*)" UNINSTALL_RESULT_PATTERN = "(Success|Failure.*|.*Unknown package:.*)" def __init__(self, client, serial): diff --git a/ppadb/device_async.py b/ppadb/device_async.py index 5e4a8b0..abcae88 100644 --- a/ppadb/device_async.py +++ b/ppadb/device_async.py @@ -21,7 +21,7 @@ def _get_src_info(src): class DeviceAsync(TransportAsync): - INSTALL_RESULT_PATTERN = "(Success|Failure|Error)\s?(.*)" + INSTALL_RESULT_PATTERN = r"(Success|Failure|Error)\s?(.*)" UNINSTALL_RESULT_PATTERN = "(Success|Failure.*|.*Unknown package:.*)" def __init__(self, client, serial): diff --git a/ppadb/plugins/device/cpustat.py b/ppadb/plugins/device/cpustat.py index 1175f3d..9dd38e1 100644 --- a/ppadb/plugins/device/cpustat.py +++ b/ppadb/plugins/device/cpustat.py @@ -87,7 +87,7 @@ def total(self): class CPUStat(Plugin): total_cpu_pattern = re.compile( - "cpu\s+([\d]+)\s([\d]+)\s([\d]+)\s([\d]+)\s([\d]+)\s([\d]+)\s([\d]+)\s([\d]+)\s([\d]+)\s([\d]+)\s") + r"cpu\s+([\d]+)\s([\d]+)\s([\d]+)\s([\d]+)\s([\d]+)\s([\d]+)\s([\d]+)\s([\d]+)\s([\d]+)\s([\d]+)\s") def cpu_times(self): return self.get_total_cpu() diff --git a/ppadb/plugins/device/traffic.py b/ppadb/plugins/device/traffic.py index 0e1a66a..e44fbe9 100644 --- a/ppadb/plugins/device/traffic.py +++ b/ppadb/plugins/device/traffic.py @@ -33,7 +33,7 @@ def get_traffic(self, package_name): cmd = 'dumpsys package {} | grep userId'.format(package_name) result = self.shell(cmd).strip() - pattern = "userId=([\d]+)" + pattern = r"userId=([\d]+)" if result: match = re.search(pattern, result) diff --git a/ppadb/plugins/device/utils.py b/ppadb/plugins/device/utils.py index 225674d..99872ee 100644 --- a/ppadb/plugins/device/utils.py +++ b/ppadb/plugins/device/utils.py @@ -32,7 +32,7 @@ def get_top_activity(self): return None def get_top_activities(self): - pattern = "ACTIVITY\s([\w\.]+)/([\w\.]+)\s[\w\d]+\spid=([\d]+)" + pattern = r"ACTIVITY\s([\w\.]+)/([\w\.]+)\s[\w\d]+\spid=([\d]+)" cmd = "dumpsys activity top | grep ACTIVITY" result = self.shell(cmd) @@ -45,13 +45,13 @@ def get_top_activities(self): return activities def get_meminfo(self, package_name): - total_meminfo_re = re.compile('\s*TOTAL\s*(?P\d+)' - '\s*(?P\d+)' - '\s*(?P\d+)' - '\s*(?P\d+)' - '\s*(?P\d+)' - '\s*(?P\d+)' - '\s*(?P\d+)') + total_meminfo_re = re.compile(r'\s*TOTAL\s*(?P\d+)' + r'\s*(?P\d+)' + r'\s*(?P\d+)' + r'\s*(?P\d+)' + r'\s*(?P\d+)' + r'\s*(?P\d+)' + r'\s*(?P\d+)') cmd = 'dumpsys meminfo {}'.format(package_name) result = self.shell(cmd) @@ -82,7 +82,7 @@ def get_uid(self, package_name): cmd = 'dumpsys package {} | grep userId'.format(package_name) result = self.shell(cmd).strip() - pattern = "userId=([\d]+)" + pattern = r"userId=([\d]+)" if result: match = re.search(pattern, result) @@ -99,7 +99,7 @@ def get_package_version_name(self, package_name): cmd = 'dumpsys package {} | grep versionName'.format(package_name) result = self.shell(cmd).strip() - pattern = "versionName=([\d\.]+)" + pattern = r"versionName=([\d\.]+)" if result: match = re.search(pattern, result) diff --git a/ppadb/plugins/device/wm.py b/ppadb/plugins/device/wm.py index 7a3c520..6d88823 100644 --- a/ppadb/plugins/device/wm.py +++ b/ppadb/plugins/device/wm.py @@ -9,7 +9,7 @@ ]) class WM(Plugin): - SIZE_RE = 'Physical size:\s([\d]+)x([\d]+)' + SIZE_RE = r'Physical size:\s([\d]+)x([\d]+)' def wm_size(self): result = self.shell("wm size") match = re.search(self.SIZE_RE, result)