Merge pull request #2495 from matthewrmshin/codacy

Fix selected issues reported by Codacy

bin/cylc-broadcast

@@ -75,7 +75,7 @@ import sys
 if '--use-ssh' in sys.argv[1:]:
     sys.argv.remove('--use-ssh')
     from cylc.remote import remrun
-    if remrun().execute(force_required=True):
+    if remrun():
         sys.exit(0)
 
 import re

bin/cylc-cat-log

@@ -29,7 +29,7 @@ window, or 'View in Editor' opens a temporary copy of it in your editor."""
 
 import sys
 from cylc.remote import remrun
-if remrun().execute():
+if remrun():
     sys.exit(0)
 
 import os
@@ -331,7 +331,7 @@ def main():
                 '%s:%s' % (user_at_host, filename), viewfile]
         else:
             cp = ['cp', filename, viewfile]
-        proc = Popen(cp, stderr=PIPE, stdout=PIPE)
+        proc = Popen(cp, stdin=open(os.devnull), stderr=PIPE, stdout=PIPE)
         err = proc.communicate()[1]
         ret_code = proc.wait()
         if ret_code:
@@ -365,7 +365,7 @@ def main():
             sys.stderr.write(
                 " ".join(quote(item) for item in command) + "\n")
             stderr = None
-        proc = Popen(command, stderr=stderr)
+        proc = Popen(command, stdin=open(os.devnull), stderr=stderr)
         err = proc.communicate()[1]
         ret_code = proc.wait()
         if ret_code == 0:

bin/cylc-cat-state

@@ -23,7 +23,7 @@ This command is deprecated; use "cylc ls-checkpoints" instead."""
 
 import sys
 from cylc.remote import remrun
-if remrun().execute():
+if remrun():
     sys.exit(0)
 
 import os

bin/cylc-check-versions

@@ -35,10 +35,9 @@ User -v/--verbose to see the command invoked to determine the remote version
 site dependent -- see cylc global config documentation."""
 
 import sys
-import subprocess
+from subprocess import Popen, PIPE
 
 import cylc.flags
-from cylc.remote import remrun
 from cylc.option_parsers import CylcOptionParser as COP
 from cylc.version import CYLC_VERSION
 from cylc.config import SuiteConfig, SuiteConfigError
@@ -99,11 +98,9 @@ def main():
             user_at_host = host
         if verbose:
             print "%s: %s" % (user_at_host, ' '.join(argv))
-        p = subprocess.Popen(
-            argv, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        out, err = p.communicate()
-        res = p.wait()
-        if res == 0:
+        proc = Popen(argv, stdin=open(os.devnull), stdout=PIPE, stderr=PIPE)
+        out, err = proc.communicate()
+        if proc.wait() == 0:
             if verbose:
                 print "   %s" % out
             contacted += 1

bin/cylc-checkpoint

@@ -25,7 +25,7 @@ import sys
 if "--use-ssh" in sys.argv[1:]:
     sys.argv.remove("--use-ssh")
     from cylc.remote import remrun
-    if remrun().execute(force_required=True):
+    if remrun():
         sys.exit(0)
 
 import cylc.flags

bin/cylc-diff

@@ -30,7 +30,7 @@ suite definition directory are not currently differenced."""
 
 import sys
 from cylc.remote import remrun
-if remrun().execute():
+if remrun():
     sys.exit(0)
 
 import cylc.flags

bin/cylc-documentation

@@ -36,12 +36,12 @@ import sys
 for arg in sys.argv[1:]:
     if arg.startswith('--host=') or arg.startswith('--user='):
         from cylc.remote import remrun
-        if remrun().execute(force_required=True, forward_x11=True):
+        if remrun(forward_x11=True):
             sys.exit(0)
 
 import os
 import re
-import subprocess
+from subprocess import call
 from optparse import OptionParser
 
 import cylc.flags
@@ -168,7 +168,7 @@ def main():
         sys.exit(0)
 
     try:
-        retcode = subprocess.call(command_list)
+        retcode = call(command_list, stdin=open(os.devnull))
     except OSError as exc:
         print >> sys.stderr, 'ERROR, failed to execute: %s' % command
         if cylc.flags.debug:

bin/cylc-dump

@@ -36,7 +36,7 @@ import sys
 if '--use-ssh' in sys.argv[1:]:
     sys.argv.remove('--use-ssh')
     from cylc.remote import remrun
-    if remrun().execute():
+    if remrun():
         sys.exit(0)
 
 import cylc.flags

bin/cylc-edit

@@ -58,13 +58,13 @@ See also 'cylc [prep] view'."""
 
 import sys
 from cylc.remote import remrun
-if remrun().execute(forward_x11=True):
+if remrun(forward_x11=True):
     sys.exit(0)
 
 import os
 import re
 import datetime
-import subprocess
+from subprocess import call
 from shutil import copy
 
 import cylc.flags
@@ -124,7 +124,7 @@ def main():
         command_list.append(suiterc)
         command = ' '.join(command_list)
         # THIS BLOCKS UNTIL THE COMMAND COMPLETES
-        retcode = subprocess.call(command_list)
+        retcode = call(command_list, stdin=open(os.devnull))
         if retcode != 0:
             # the command returned non-zero exist status
             print >> sys.stderr, command, 'failed:', retcode
@@ -172,7 +172,7 @@ def main():
     command_list.append(suiterc)
     command = ' '.join(command_list)
     # THIS BLOCKS UNTIL THE COMMAND COMPLETES
-    retcode = subprocess.call(command_list)
+    retcode = call(command_list, stdin=open(os.devnull))
     if retcode != 0:
         # the command returned non-zero exist status
         print >> sys.stderr, command, 'failed:', retcode

bin/cylc-get-directory

@@ -28,7 +28,7 @@ from cylc.suite_srv_files_mgr import SuiteSrvFilesManager
 import cylc.flags
 
 from cylc.remote import remrun
-if remrun().execute():
+if remrun():
     sys.exit(0)
 
 

bin/cylc-get-suite-config

@@ -53,7 +53,7 @@ $ cylc get-suite-config --item=[runtime][modelX] SUITE
 
 import sys
 from cylc.remote import remrun
-if remrun().execute():
+if remrun():
     sys.exit(0)
 
 import re

bin/cylc-get-suite-contact

@@ -22,7 +22,7 @@ Print contact information of running suite REG."""
 
 import sys
 from cylc.remote import remrun
-if remrun().execute():
+if remrun():
     sys.exit(0)
 
 from cylc.option_parsers import CylcOptionParser as COP

bin/cylc-get-suite-version

@@ -26,7 +26,7 @@ import sys
 if '--use-ssh' in sys.argv[1:]:
     sys.argv.remove('--use-ssh')
     from cylc.remote import remrun
-    if remrun().execute():
+    if remrun():
         sys.exit(0)
 
 import cylc.flags

bin/cylc-graph

@@ -70,7 +70,7 @@ from cylc.suite_srv_files_mgr import SuiteSrvFilesManager
 from cylc.task_id import TaskID
 from cylc.templatevars import load_template_vars
 
-if remrun().execute(forward_x11=True):
+if remrun(forward_x11=True):
     sys.exit(0)
 
 from cylc.option_parsers import CylcOptionParser as COP

bin/cylc-gscan

@@ -28,7 +28,7 @@ import sys
 if "--use-ssh" in sys.argv[1:]:
     sys.argv.remove("--use-ssh")
     from cylc.remote import remrun
-    if remrun().execute(forward_x11=True):
+    if remrun(forward_x11=True):
         sys.exit(0)
 
 import gtk

bin/cylc-gui

@@ -42,7 +42,7 @@ import sys
 if '--use-ssh' in sys.argv[1:]:
     sys.argv.remove('--use-ssh')
     from cylc.remote import remrun
-    if remrun().execute(forward_x11=True):
+    if remrun(forward_x11=True):
         sys.exit(0)
 
 import os

bin/cylc-hold

@@ -30,7 +30,7 @@ import sys
 if '--use-ssh' in sys.argv[1:]:
     sys.argv.remove('--use-ssh')
     from cylc.remote import remrun
-    if remrun().execute(force_required=True):
+    if remrun():
         sys.exit(0)
 
 import cylc.flags

bin/cylc-insert

@@ -37,7 +37,7 @@ import sys
 if '--use-ssh' in sys.argv[1:]:
     sys.argv.remove('--use-ssh')
     from cylc.remote import remrun
-    if remrun().execute(force_required=True):
+    if remrun():
         sys.exit(0)
 
 import cylc.flags

bin/cylc-jobs-kill

@@ -38,7 +38,7 @@ def main():
     BatchSysManager().jobs_kill(args[0], args[1:])
 
 
-if __name__ == "__main__" and not remrun().execute():
+if __name__ == "__main__" and not remrun():
     from cylc.option_parsers import CylcOptionParser as COP
     from cylc.batch_sys_manager import BatchSysManager
     main()

bin/cylc-jobs-poll

@@ -37,7 +37,7 @@ def main():
     BatchSysManager().jobs_poll(args[0], args[1:])
 
 
-if __name__ == "__main__" and not remrun().execute():
+if __name__ == "__main__" and not remrun():
     from cylc.option_parsers import CylcOptionParser as COP
     from cylc.batch_sys_manager import BatchSysManager
     main()

bin/cylc-jobs-submit

@@ -42,7 +42,7 @@ def main():
         args[0], args[1:], remote_mode=opts.remote_mode)
 
 
-if __name__ == "__main__" and not remrun().execute():
+if __name__ == "__main__" and not remrun():
     from cylc.option_parsers import CylcOptionParser as COP
     from cylc.batch_sys_manager import BatchSysManager
     main()

bin/cylc-kill

@@ -28,7 +28,7 @@ import sys
 if '--use-ssh' in sys.argv[1:]:
     sys.argv.remove('--use-ssh')
     from cylc.remote import remrun
-    if remrun().execute(force_required=True):
+    if remrun():
         sys.exit(0)
 
 import cylc.flags

bin/cylc-list

@@ -29,7 +29,7 @@ viewer tool. To visualize the full multiple inheritance hierarchy use:
 import os
 import sys
 from cylc.remote import remrun
-if remrun().execute():
+if remrun():
     sys.exit(0)
 
 from cylc.config import SuiteConfig

bin/cylc-ls-checkpoints

@@ -25,7 +25,7 @@ parameters, task pool and broadcast states in the suite runtime database.
 
 import sys
 from cylc.remote import remrun
-if remrun().execute():
+if remrun():
     sys.exit(0)
 
 import os

bin/cylc-nudge

@@ -33,7 +33,7 @@ import sys
 if '--use-ssh' in sys.argv[1:]:
     sys.argv.remove('--use-ssh')
     from cylc.remote import remrun
-    if remrun().execute():
+    if remrun():
         sys.exit(0)
 
 import cylc.flags

bin/cylc-ping

@@ -25,7 +25,7 @@ import sys
 if '--use-ssh' in sys.argv[1:]:
     sys.argv.remove('--use-ssh')
     from cylc.remote import remrun
-    if remrun().execute():
+    if remrun():
         sys.exit(0)
 
 import cylc.flags

bin/cylc-poll

@@ -28,7 +28,7 @@ import sys
 if '--use-ssh' in sys.argv[1:]:
     sys.argv.remove('--use-ssh')
     from cylc.remote import remrun
-    if remrun().execute(force_required=True):
+    if remrun():
         sys.exit(0)
 
 import cylc.flags

bin/cylc-print

@@ -29,7 +29,7 @@ to prevent this ('foo$' matches only literal 'foo')."""
 
 import sys
 from cylc.remote import remrun
-if remrun().execute():
+if remrun():
     sys.exit(0)
 
 import os

bin/cylc-register

@@ -45,7 +45,7 @@ The suite can subsequently be started and targeted by cylc commands using
 
 import sys
 from cylc.remote import remrun
-if remrun().execute():
+if remrun():
     sys.exit(0)
 
 from cylc.option_parsers import CylcOptionParser as COP

bin/cylc-release

@@ -29,7 +29,7 @@ import sys
 if '--use-ssh' in sys.argv[1:]:
     sys.argv.remove('--use-ssh')
     from cylc.remote import remrun
-    if remrun().execute(force_required=True):
+    if remrun():
         sys.exit(0)
 
 import cylc.flags

bin/cylc-reload

@@ -43,7 +43,7 @@ import sys
 if '--use-ssh' in sys.argv[1:]:
     sys.argv.remove('--use-ssh')
     from cylc.remote import remrun
-    if remrun().execute():
+    if remrun():
         sys.exit(0)
 
 import cylc.flags

bin/cylc-remove

@@ -28,7 +28,7 @@ import sys
 if '--use-ssh' in sys.argv[1:]:
     sys.argv.remove('--use-ssh')
     from cylc.remote import remrun
-    if remrun().execute(force_required=True):
+    if remrun():
         sys.exit(0)
 
 import cylc.flags

bin/cylc-report-timings

@@ -49,7 +49,7 @@ the database query to obtain the timing information may take some time.
 
 import sys
 from cylc.remote import remrun
-if remrun().execute():
+if remrun():
     sys.exit(0)
 
 import cStringIO as StringIO

bin/cylc-reset

@@ -33,7 +33,7 @@ import sys
 if '--use-ssh' in sys.argv[1:]:
     sys.argv.remove('--use-ssh')
     from cylc.remote import remrun
-    if remrun().execute(force_required=True):
+    if remrun():
         sys.exit(0)
 
 import cylc.flags

bin/cylc-restart

@@ -20,7 +20,7 @@
 
 import sys
 from cylc.remote import remrun
-if remrun().execute():
+if remrun():
     sys.exit(0)
 
 from cylc.scheduler_cli import main

bin/cylc-run

@@ -20,7 +20,7 @@
 
 import sys
 from cylc.remote import remrun
-if remrun().execute():
+if remrun():
     sys.exit(0)