--- a/scripts/install.py Wed Jun 17 17:12:21 2020 +0200 +++ b/scripts/install.py Wed Jun 17 20:18:54 2020 +0200 @@ -19,7 +19,7 @@ import glob import shutil import fnmatch -import subprocess +import subprocess # secok import time import io import json @@ -93,7 +93,7 @@ if sys.platform.startswith(("win", "cygwin")): try: - input("Press enter to continue...") + input("Press enter to continue...") # secok except (EOFError, SyntaxError): pass @@ -366,7 +366,7 @@ wname = os.path.join(saveDir, wname) copyToFile(wname, wrapper) - os.chmod(wname, 0o755) + os.chmod(wname, 0o755) # secok return wname @@ -1014,7 +1014,7 @@ os.path.join(os.path.dirname(__file__), "create_windows_links.py"), ] - subprocess.call(args) + subprocess.call(args) # secok else: print( "\nThe Python package 'pywin32' is not installed. Desktop and" @@ -1114,7 +1114,7 @@ '''exec "{2}" "{3}/{4}.py" "$@"\n''' .format(pathLine, dyldLine, starter, pydir, "eric6")) copyToFile(wname, wrapper) - os.chmod(wname, 0o755) + os.chmod(wname, 0o755) # secok shutilCopy(os.path.join(eric6SourceDir, "pixmaps", "eric_2.icns"), os.path.join(directories["icns"], "eric.icns")) @@ -1302,9 +1302,9 @@ else: print("{0}\n\nShall '{1}' be installed using pip? (Y/n)" .format(message, packageName), end=" ") - answer = input() + answer = input() # secok if answer in ("", "Y", "y"): - exitCode = subprocess.call( + exitCode = subprocess.call( # secok [sys.executable, "-m", "pip", "install", packageName]) ok = (exitCode == 0) @@ -1319,7 +1319,7 @@ @rtype bool """ try: - pipOut = subprocess.check_output([ + pipOut = subprocess.check_output([ # secok sys.executable, "-m", "pip", "list", "--outdated", "--format=json" ]) @@ -1350,9 +1350,9 @@ answer = "y" else: print("Shall 'pip' be updated (recommended)? (Y/n)", end=" ") - answer = input() + answer = input() # secok if answer in ("", "Y", "y"): - subprocess.call( + subprocess.call( # secok [sys.executable, "-m", "pip", "install", "--upgrade", "pip"]) @@ -1652,7 +1652,7 @@ except EnvironmentError: pass try: - hgOut = subprocess.check_output(["hg", "identify", "-i"]) + hgOut = subprocess.check_output(["hg", "identify", "-i"]) # secok hgOut = hgOut.decode() except (OSError, subprocess.CalledProcessError): hgOut = "" @@ -1838,6 +1838,7 @@ elif opt == "-f": try: exec(compile(open(arg).read(), arg, 'exec'), globals()) + # secok if len(cfg) != configLength: print("The configuration dictionary in '{0}' is incorrect." " Aborting".format(arg))