Skip to content

Commit 6bfb6d1

Browse files
authored
chore: fix string concatenation (#282)
1 parent 2a0ccc2 commit 6bfb6d1

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

adbe/adb_enhanced.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,9 @@ def _get_device_serials() -> [str]:
461461
if "unauthorized" in device_info:
462462
device_info = ' '.join(device_info.split()[1:])
463463
print_error(
464-
('Unlock Device "%s" and give USB debugging access to '
465-
+ 'this PC/Laptop by unlocking and reconnecting '
466-
+ 'the device. More info about this device: "%s"\n') % (
464+
("Unlock Device \"%s\" and give USB debugging access to "
465+
"this PC/Laptop by unlocking and reconnecting "
466+
"the device. More info about this device: \"%s\"\n") % (
467467
device_serial, device_info))
468468
else:
469469
device_serials.append(device_serial)
@@ -647,7 +647,7 @@ def dump_screenrecord(filepath):
647647
# I have tested that on API 23 and above this works. Till Api 22, on emulator, it does not.
648648
if api_version < 23 and _is_emulator():
649649
print_error_and_exit("screenrecord is not supported on emulator below API 23\n"
650-
+ "Source: https://issuetracker.google.com/issues/36982354")
650+
"Source: https://issuetracker.google.com/issues/36982354")
651651

652652
original_sigint_handler = None
653653

@@ -2056,13 +2056,11 @@ def print_pending_alarms(output_dump_alarm, padding):
20562056
def alarm_manager(param):
20572057
cmd = "dumpsys alarm"
20582058
api_version = get_device_android_api_version()
2059-
err_msg_api = "Your Android version (API 28 and bellow) does not support " \
2060-
"listing pending alarm"
2059+
err_msg_api = "Your Android version (API 28 and bellow) does not support listing pending alarm"
20612060

20622061
c, o, e = execute_adb_shell_command2(cmd)
20632062
if c != 0:
2064-
print_error_and_exit("Something gone wrong on "
2065-
"dumping alarms. Error: %s" % e)
2063+
print_error_and_exit("Something gone wrong on dumping alarms. Error: %s" % e)
20662064
return
20672065

20682066
if not isinstance(param, AlarmEnum):

adbe/main.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,9 @@ def _using_python2():
360360

361361

362362
def _fail_with_python2_warning():
363-
msg = ('You are using Python 2\nADB-enhanced no longer supports Python 2.\n'
364-
+ 'Install Python 3 and then re-install this tool using\n'
365-
+ '\"sudo pip uninstall adb-enhanced && sudo pip3 install adb-enhanced\"')
363+
msg = ("You are using Python 2\nADB-enhanced no longer supports Python 2.\n"
364+
"Install Python 3 and then re-install this tool using\n"
365+
"\"sudo pip uninstall adb-enhanced && sudo pip3 install adb-enhanced\"")
366366
print_error_and_exit(msg)
367367

368368

0 commit comments

Comments
 (0)