pwsafe: Abolish the `chomp' function, and only chomp when reading stdin.

We have `S.rstrip()' instead.

diff --git a/pwsafe b/pwsafe
index 5f2e75d1e7ae22f488c6d14f772ec9491c01e9df..50a58780f6e1bb565cffa0805adde996a1a07c15 100644 (file)
--- 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