From 0b1e97d99c6a8f1730b780a9dd222355eb997780 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Sun, 23 Aug 2015 16:23:30 +0530
Subject: [PATCH] Treat entire input as password

Instead of just the first line.

PEP8 fixes.
---
 actions/ikiwiki                         | 4 ++--
 actions/pagekite                        | 2 +-
 actions/transmission                    | 4 ++--
 plinth/modules/dynamicdns/dynamicdns.py | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/actions/ikiwiki b/actions/ikiwiki
index 35bf7d7cd..76d3eeaa8 100755
--- a/actions/ikiwiki
+++ b/actions/ikiwiki
@@ -95,7 +95,7 @@ def subcommand_get_sites(_):
 
 def subcommand_create_wiki(arguments):
     """Create a wiki."""
-    pw_bytes = sys.stdin.readline().encode()
+    pw_bytes = sys.stdin.read().encode()
     proc = subprocess.Popen(
         ['ikiwiki', '-setup', SETUP_WIKI,
          arguments.wiki_name, arguments.admin_name],
@@ -107,7 +107,7 @@ def subcommand_create_wiki(arguments):
 
 def subcommand_create_blog(arguments):
     """Create a blog."""
-    pw_bytes = sys.stdin.readline().encode()
+    pw_bytes = sys.stdin.read().encode()
     proc = subprocess.Popen(
         ['ikiwiki', '-setup', SETUP_BLOG,
          arguments.blog_name, arguments.admin_name],
diff --git a/actions/pagekite b/actions/pagekite
index f700d681c..01a39585f 100755
--- a/actions/pagekite
+++ b/actions/pagekite
@@ -224,7 +224,7 @@ def subcommand_get_kite(_):
 def subcommand_set_kite(arguments):
     """Set details of the kite"""
     aug.set(PATHS['kitename'], arguments.kite_name)
-    aug.set(PATHS['kitesecret'], sys.stdin.readline())
+    aug.set(PATHS['kitesecret'], sys.stdin.read())
     aug.save()
 
 
diff --git a/actions/transmission b/actions/transmission
index 7ff354f5f..4a80d37c2 100755
--- a/actions/transmission
+++ b/actions/transmission
@@ -46,7 +46,7 @@ def parse_arguments():
 
     # Merge given JSON configration with existing
     subparsers.add_parser(
-        'merge-configuration', 
+        'merge-configuration',
         help='Merge JSON configuration from stdin with existing')
 
     return parser.parse_args()
@@ -66,7 +66,7 @@ def subcommand_disable(_):
 
 def subcommand_merge_configuration(arguments):
     """Merge given JSON configuration with existing configuration."""
-    configuration = ''.join(sys.stdin.readlines())
+    configuration = sys.stdin.read()
     configuration = json.loads(configuration)
 
     current_configuration = open(TRANSMISSION_CONFIG, 'r').read()
diff --git a/plinth/modules/dynamicdns/dynamicdns.py b/plinth/modules/dynamicdns/dynamicdns.py
index 2d0dc4219..b959cd49b 100644
--- a/plinth/modules/dynamicdns/dynamicdns.py
+++ b/plinth/modules/dynamicdns/dynamicdns.py
@@ -366,7 +366,7 @@ def _apply_changes(request, old_status, new_status):
               '-U', new_status['dynamicdns_update_url'],
               '-c', disable_ssl_check,
               '-b', use_http_basic_auth],
-             input = new_status['dynamicdns_secret'].encode())
+             input=new_status['dynamicdns_secret'].encode())
 
         if old_status['enabled']:
             _run(['stop'])