From 00c597fbd8d309bd74f91aae27af84a1e93a4a0d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Sep 2022 23:24:05 +0100 Subject: get rid of io.TextIOWrapper --- src/backend/upgradePkg.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/backend/upgradePkg.py') diff --git a/src/backend/upgradePkg.py b/src/backend/upgradePkg.py index c2176e9..293dc66 100644 --- a/src/backend/upgradePkg.py +++ b/src/backend/upgradePkg.py @@ -1,7 +1,6 @@ #!/usr/bin/python3 import atexit -import io import os import shutil import subprocess @@ -43,13 +42,13 @@ def start(): os.remove(binary.rstrip().split("/")[1]) portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = portageExec.communicate() - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): - if not "These are the packages that would be merged, in order:" in portageOutput.rstrip(): - if not "Calculating dependencies" in portageOutput.rstrip(): - print(portageOutput.rstrip()) + for portageOutput in stdout.decode('ascii').splitlines(): + if not "These are the packages that would be merged, in order:" in portageOutput: + if not "Calculating dependencies" in portageOutput: + print(portageOutput) - portageExec.communicate() sisyphus.syncDatabase.syncLocal() else: sys.exit("\n" + "Ok; Quitting." + "\n") @@ -88,15 +87,15 @@ def startqt(): os.remove(binary.rstrip().split("/")[1]) portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = portageExec.communicate() # kill portage if the program dies or it's terminated by the user atexit.register(sisyphus.killPortage.start, portageExec) - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): - if not "These are the packages that would be merged, in order:" in portageOutput.rstrip(): - if not "Calculating dependencies" in portageOutput.rstrip(): - print(portageOutput.rstrip()) + for portageOutput in stdout.decode('ascii').splitlines(): + if not "These are the packages that would be merged, in order:" in portageOutput: + if not "Calculating dependencies" in portageOutput: + print(portageOutput) - portageExec.communicate() sisyphus.syncDatabase.syncLocal() else: print("\n" + "No package upgrades found; Quitting." + "\n") -- cgit v1.2.3