tools: revise install.py for minor improvements

Trott · danielleadams · commit 8ad3455ae373 · 2021-01-12T07:09:28.000-05:00
* Use an with block for reading the config file. Refs: https://docs.python.org/3/tutorial/inputoutput.html#reading-and-writing-files * Use explicit blank return to make it clear that the return value is not actually used and that it is being used for flow control only.. PR-URL: #36626 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Christian Clauss <cclauss@me.com>
diff --git a/tools/install.py b/tools/install.py
@@ -19,8 +19,8 @@ def abspath(*args):
 return os.path.abspath(path)
 
 def load_config():
- s = open('config.gypi').read()
- return ast.literal_eval(s)
+ with open('config.gypi') as f:
+ return ast.literal_eval(f.read())
 
 def try_unlink(path):
 try:
@@ -223,11 +223,19 @@ def run(args):
 cmd = args[1] if len(args) > 1 else 'install'
 
 if os.environ.get('HEADERS_ONLY'):
- if cmd == 'install': return headers(install)
- if cmd == 'uninstall': return headers(uninstall)
+ if cmd == 'install':
+ headers(install)
+ return
+ if cmd == 'uninstall':
+ headers(uninstall)
+ return
 else:
- if cmd == 'install': return files(install)
- if cmd == 'uninstall': return files(uninstall)
+ if cmd == 'install':
+ files(install)
+ return
+ if cmd == 'uninstall':
+ files(uninstall)
+ return
 
 raise RuntimeError('Bad command: %s\n' % cmd)
 

-Original file line number
+Diff line change
 returnos.path.abspath(path)
 defload_config():
 -s=open('config.gypi').read()
 -returnast.literal_eval(s)
 +withopen('config.gypi')asf:
 +returnast.literal_eval(f.read())
 deftry_unlink(path):
 try:
 cmd=args[1] iflen(args) >1else'install'
 ifos.environ.get('HEADERS_ONLY'):
 -ifcmd=='install': returnheaders(install)
 -ifcmd=='uninstall': returnheaders(uninstall)
 +ifcmd=='install':
 +headers(install)
 +return
 +ifcmd=='uninstall':
 +headers(uninstall)
 +return
 else:
 -ifcmd=='install': returnfiles(install)
 -ifcmd=='uninstall': returnfiles(uninstall)
 +ifcmd=='install':
 +files(install)
 +return
 +ifcmd=='uninstall':
 +files(uninstall)
 +return
 raiseRuntimeError('Bad command: %s\n'%cmd)