From 63ba6dfae101afe3102e0c3c3fb6318c34a207f8 Mon Sep 17 00:00:00 2001 Message-Id: <63ba6dfae101afe3102e0c3c3fb6318c34a207f8.1716867011.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 24 May 2015 18:02:31 +0100 Subject: [PATCH] pwsafe: Abolish the `chomp' function, and only chomp when reading stdin. Organization: Straylight/Edgeware From: Mark Wooding We have `S.rstrip()' instead. --- pwsafe | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pwsafe b/pwsafe index 5f2e75d..50a5878 100644 --- a/pwsafe +++ b/pwsafe @@ -53,12 +53,6 @@ def die(msg): moan(msg) exit(1) -def chomp(pp): - """Return the string PP, without its trailing newline if it has one.""" - if len(pp) > 0 and pp[-1] == '\n': - pp = pp[:-1] - return pp - ###-------------------------------------------------------------------------- ### Subcommand implementations. @@ -106,10 +100,10 @@ def cmd_store(av): vpp = C.getpass("Confirm passphrase `%s': " % tag) if pp != vpp: die("passphrases don't match") elif av[1] == '-': - pp = stdin.readline() + pp = stdin.readline().rstrip('\n') else: pp = av[1] - pw[av[0]] = chomp(pp) + pw[av[0]] = pp def cmd_copy(av): if len(av) < 1 or len(av) > 2: return 1 -- [mdw]