Commit 8627d6c

committed

Fix for Python code scanning alerts

1 parent 6359af9 commit 8627d6cCopy full SHA for 8627d6c

File tree

+12

-7

lines changed

+12

-7

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@`
`17`	`17`
`18`	`18`
`19`	`19`	`def load_package(filename):`
`20`		`- pkg = json.load(open(filename))["packages"][0]`
	`20`	`+ with open(filename) as f:`
	`21`	`+ pkg = json.load(f)["packages"][0]`
`21`	`22`	`print("Loaded package {0} from {1}".format(pkg["name"], filename), file=sys.stderr)`
`22`	`23`	`print("{0} platform(s), {1} tools".format(len(pkg["platforms"]), len(pkg["tools"])), file=sys.stderr)`
`23`	`24`	`return pkg`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,8 @@ def serve(remote_addr, local_addr, remote_port, local_port, password, filename,`
`94`	`94`	`return 1`
`95`	`95`
`96`	`96`	`content_size = os.path.getsize(filename)`
`97`		`- file_md5 = hashlib.md5(open(filename, "rb").read()).hexdigest()`
	`97`	`+ with open(filename, "rb") as f:`
	`98`	`+ file_md5 = hashlib.md5(f.read()).hexdigest()`
`98`	`99`	`logging.info("Upload size: %d", content_size)`
`99`	`100`	`message = "%d %d %d %s\n" % (command, local_port, content_size, file_md5)`
`100`	`101`
`@@ -163,6 +164,7 @@ def serve(remote_addr, local_addr, remote_port, local_port, password, filename,`
`163`	`164`	`sock2.close()`
`164`	`165`
`165`	`166`	`logging.info("Waiting for device...")`
	`167`	`+`
`166`	`168`	`try:`
`167`	`169`	`sock.settimeout(10)`
`168`	`170`	`connection, client_address = sock.accept()`
`@@ -172,6 +174,7 @@ def serve(remote_addr, local_addr, remote_port, local_port, password, filename,`
`172`	`174`	`logging.error("No response from device")`
`173`	`175`	`sock.close()`
`174`	`176`	`return 1`
	`177`	`+`
`175`	`178`	`try:`
`176`	`179`	`with open(filename, "rb") as f:`
`177`	`180`	`if PROGRESS:`
`@@ -225,7 +228,8 @@ def serve(remote_addr, local_addr, remote_port, local_port, password, filename,`
`225`	`228`	`logging.error("Error response from device")`
`226`	`229`	`connection.close()`
`227`	`230`	`return 1`
`228`		`-`
	`231`	`+ except Exception as e: # noqa: E722`
	`232`	`+ logging.error("Error: %s", str(e))`
`229`	`233`	`finally:`
`230`	`234`	`connection.close()`
`231`	`235`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -348,9 +348,8 @@ def get_tool(tool, force_download, force_extract):`
`348`	`348`	`urlretrieve(url, local_path, report_progress, context=ctx)`
`349`	`349`	`elif "Windows" in sys_name:`
`350`	`350`	`r = requests.get(url)`
`351`		`- f = open(local_path, "wb")`
`352`		`- f.write(r.content)`
`353`		`- f.close()`
	`351`	`+ with open(local_path, "wb") as f:`
	`352`	`+ f.write(r.content)`
`354`	`353`	`else:`
`355`	`354`	`is_ci = os.environ.get("GITHUB_WORKSPACE")`
`356`	`355`	`if is_ci:`
`@@ -374,7 +373,8 @@ def get_tool(tool, force_download, force_extract):`
`374`	`373`
`375`	`374`
`376`	`375`	`def load_tools_list(filename, platform):`
`377`		`- tools_info = json.load(open(filename))["packages"][0]["tools"]`
	`376`	`+ with open(filename, "r") as f:`
	`377`	`+ tools_info = json.load(f)["packages"][0]["tools"]`
`378`	`378`	`tools_to_download = []`
`379`	`379`	`for t in tools_info:`
`380`	`380`	`if platform == "x86_64-mingw32":`

Comments

(0)