get rid of io.TextIOWrapper

1 files changed, 21 insertions, 22 deletions

diff --git a/src/backend/installSrc.py b/src/backend/installSrc.py
index 466ee0a..420b4d5 100644
--- a/src/backend/installSrc.py
+++ b/src/backend/installSrc.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python3
 
-import io
 import os
 import shutil
 import subprocess
@@ -41,13 +40,13 @@ def start(pkgname):
                                 os.remove(binary.rstrip().split("/")[1])
 
                         portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), 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")
@@ -74,13 +73,13 @@ def start(pkgname):
                                 os.remove(binary.rstrip().split("/")[1])
 
                         portageExec = subprocess.Popen(['emerge', '--usepkg', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), 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,26 +87,26 @@ def start(pkgname):
                     print("\n" + "These are the source packages that would be merged, in order:" + "\n\n"  + "  ".join(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
                     if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
                         portageExec = subprocess.Popen(['emerge', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), 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")
         else:
             portageExec = subprocess.Popen(['emerge', '--quiet', '--pretend', '--getbinpkg', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            stdout, stderr = portageExec.communicate()
 
-            for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
-                if not "Local copy of remote index is up-to-date and will be used." in portageOutput.rstrip():
-                    if not "ebuild" in portageOutput.rstrip():
-                        if not "binary" in portageOutput.rstrip():
-                            print(portageOutput.rstrip())
+            for portageOutput in stdout.decode('ascii').splitlines():
+                if not "Local copy of remote index is up-to-date and will be used." in portageOutput:
+                    if not "ebuild" in portageOutput:
+                        if not "binary" in portageOutput:
+                            print(portageOutput)
 
-            portageExec.communicate()
             sys.exit("\n" + "Cannot proceed; Apply the above changes to your portage configuration files and try again; Quitting." + "\n")
     else:
         sys.exit("\nYou need root permissions to do this, exiting!\n")