From c5884024de856a9c3a87da2ceb0412c951e3b7f1 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Thu, 6 Oct 2022 08:47:38 -0400 Subject: [PATCH] Use rstrip() in place of replace() where applicable Former-commit-id: 6b0a80036ec8166663dfdbd02c720f4b5ed23064 [formerly 88e97d0131bdb0ac9e681a763e37cab1acb046e9] Former-commit-id: 1e861149b7485ef6676ce4c5b721dd4ea0d8ba90 --- bin/sshync.py | 15 +++++++-------- bin/sshyp.py | 32 ++++++++++++++++---------------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/bin/sshync.py b/bin/sshync.py index caae2b5..4618210 100755 --- a/bin/sshync.py +++ b/bin/sshync.py @@ -54,8 +54,7 @@ def sort_titles_mods(_list_1, _list_2): # creates and returns two lists (of tit def make_profile(_profile_dir, _local_dir, _remote_dir, _identity, _ip, _port, _user): # creates a sshync job profile - open(_profile_dir, 'w').write(_user + '\n' + _ip + '\n' + _port + '\n' + _local_dir + '\n' + _remote_dir + '\n' + - _identity + '\n') + open(_profile_dir, 'w').write(f"{_user}\n{_ip}\n{_port}\n{_local_dir}\n{_remote_dir}\n{_identity}\n") def get_profile(_profile_dir): # returns a list of data read from a sshync job profile @@ -66,12 +65,12 @@ def get_profile(_profile_dir): # returns a list of data read from a sshync job _profile_data = None s_exit(1) # extract data from profile - _user = _profile_data[0].replace('\n', '') - _ip = _profile_data[1].replace('\n', '') - _port = _profile_data[2].replace('\n', '') - _local_dir = _profile_data[3].replace('\n', '') - _remote_dir = _profile_data[4].replace('\n', '') - _identity = _profile_data[5].replace('\n', '') + _user = _profile_data[0].rstrip() + _ip = _profile_data[1].rstrip() + _port = _profile_data[2].rstrip() + _local_dir = _profile_data[3].rstrip() + _remote_dir = _profile_data[4].rstrip() + _identity = _profile_data[5].rstrip() return _user, _ip, _port, _local_dir, _remote_dir, _identity diff --git a/bin/sshyp.py b/bin/sshyp.py index 97b0cb9..bafba17 100755 --- a/bin/sshyp.py +++ b/bin/sshyp.py @@ -670,43 +670,43 @@ def copy_data(): # copies a specified field of an entry to the clipboard _copy_line = open(f"{tmp_dir}{_shm_folder}/{_shm_entry}", 'r').readlines() if uname()[0] == 'Haiku': # Haiku clipboard detection if argument_list[2] == 'username' or argument_list[2] == '-u': - system('clipboard -c ' + "'" + _copy_line[1].replace('\n', '').replace("'", "'\\''") + "'") + system('clipboard -c ' + "'" + _copy_line[1].rstrip().replace("'", "'\\''") + "'") elif argument_list[2] == 'password' or argument_list[2] == '-p': - system('clipboard -c ' + "'" + _copy_line[0].replace('\n', '').replace("'", "'\\''") + "'") + system('clipboard -c ' + "'" + _copy_line[0].rstrip().replace("'", "'\\''") + "'") elif argument_list[2] == 'url' or argument_list[2] == '-l': - system('clipboard -c ' + "'" + _copy_line[2].replace('\n', '').replace("'", "'\\''") + "'") + system('clipboard -c ' + "'" + _copy_line[2].rstrip().replace("'", "'\\''") + "'") elif argument_list[2] == 'note' or argument_list[2] == '-n': - system('clipboard -c ' + "'" + _copy_line[3].replace('\n', '').replace("'", "'\\''") + "'") + system('clipboard -c ' + "'" + _copy_line[3].rstrip().replace("'", "'\\''") + "'") Popen('sleep 30; clipboard -r', shell=True, close_fds=True) elif Path("/data/data/com.termux").exists(): # Termux (Android) clipboard detection if argument_list[2] == 'username' or argument_list[2] == '-u': - system('termux-clipboard-set ' + "'" + _copy_line[1].replace('\n', '').replace("'", "'\\''") + "'") + system('termux-clipboard-set ' + "'" + _copy_line[1].rstrip().replace("'", "'\\''") + "'") elif argument_list[2] == 'password' or argument_list[2] == '-p': - system('termux-clipboard-set ' + "'" + _copy_line[0].replace('\n', '').replace("'", "'\\''") + "'") + system('termux-clipboard-set ' + "'" + _copy_line[0].rstrip().replace("'", "'\\''") + "'") elif argument_list[2] == 'url' or argument_list[2] == '-l': - system('termux-clipboard-set ' + "'" + _copy_line[2].replace('\n', '').replace("'", "'\\''") + "'") + system('termux-clipboard-set ' + "'" + _copy_line[2].rstrip().replace("'", "'\\''") + "'") elif argument_list[2] == 'note' or argument_list[2] == '-n': - system('termux-clipboard-set ' + "'" + _copy_line[3].replace('\n', '').replace("'", "'\\''") + "'") + system('termux-clipboard-set ' + "'" + _copy_line[3].rstrip().replace("'", "'\\''") + "'") Popen("sleep 30; termux-clipboard-set ''", shell=True, close_fds=True) elif environ.get('WAYLAND_DISPLAY') == 'wayland-0': # Wayland clipboard detection if argument_list[2] == 'username' or argument_list[2] == '-u': - system('wl-copy ' + "'" + _copy_line[1].replace('\n', '').replace("'", "'\\''") + "'") + system('wl-copy ' + "'" + _copy_line[1].rstrip().replace("'", "'\\''") + "'") elif argument_list[2] == 'password' or argument_list[2] == '-p': - system('wl-copy ' + "'" + _copy_line[0].replace('\n', '').replace("'", "'\\''") + "'") + system('wl-copy ' + "'" + _copy_line[0].rstrip().replace("'", "'\\''") + "'") elif argument_list[2] == 'url' or argument_list[2] == '-l': - system('wl-copy ' + "'" + _copy_line[2].replace('\n', '').replace("'", "'\\''") + "'") + system('wl-copy ' + "'" + _copy_line[2].rstrip().replace("'", "'\\''") + "'") elif argument_list[2] == 'note' or argument_list[2] == '-n': - system('wl-copy ' + "'" + _copy_line[3].replace('\n', '').replace("'", "'\\''") + "'") + system('wl-copy ' + "'" + _copy_line[3].rstrip().replace("'", "'\\''") + "'") Popen('sleep 30; wl-copy -c', shell=True, close_fds=True) else: # X11 clipboard detection if argument_list[2] == 'username' or argument_list[2] == '-u': - system('echo -n ' + "'" + _copy_line[1].replace('\n', '').replace("'", "'\\''") + "'" + ' | xclip -sel c') + system('echo -n ' + "'" + _copy_line[1].rstrip().replace("'", "'\\''") + "'" + ' | xclip -sel c') elif argument_list[2] == 'password' or argument_list[2] == '-p': - system('echo -n ' + "'" + _copy_line[0].replace('\n', '').replace("'", "'\\''") + "'" + ' | xclip -sel c') + system('echo -n ' + "'" + _copy_line[0].rstrip().replace("'", "'\\''") + "'" + ' | xclip -sel c') elif argument_list[2] == 'url' or argument_list[2] == '-l': - system('echo -n ' + "'" + _copy_line[2].replace('\n', '').replace("'", "'\\''") + "'" + ' | xclip -sel c') + system('echo -n ' + "'" + _copy_line[2].rstrip().replace("'", "'\\''") + "'" + ' | xclip -sel c') elif argument_list[2] == 'note' or argument_list[2] == '-n': - system('echo -n ' + "'" + _copy_line[3].replace('\n', '').replace("'", "'\\''") + "'" + ' | xclip -sel c') + system('echo -n ' + "'" + _copy_line[3].rstrip().replace("'", "'\\''") + "'" + ' | xclip -sel c') Popen("sleep 30; echo -n '' | xclip -sel c", shell=True, close_fds=True) rmtree(f"{tmp_dir}{_shm_folder}")