Fixes for sanity checks broken by upstream (#435)

* init for upstream sanity checks

* PY3 removed

* procenv.py PY3 fix

* changelog

* Bulk commit of linter changes

* Clean-up

1 files changed, 9 insertions, 10 deletions

diff --git a/tests/unit/mock/procenv.py b/tests/unit/mock/procenv.py
index d7f3dc95..d21e2a0e 100644
--- a/tests/unit/mock/procenv.py
+++ b/tests/unit/mock/procenv.py
@@ -29,7 +29,6 @@ from contextlib import contextmanager
 from io import BytesIO, StringIO
 
 from ansible.module_utils._text import to_bytes
-from ansible.module_utils.six import PY3
 
 from ansible_collections.vyos.vyos.tests.unit.compat import unittest
 
@@ -42,11 +41,11 @@ def swap_stdin_and_argv(stdin_data="", argv_data=tuple()):
     real_stdin = sys.stdin
     real_argv = sys.argv
 
-    if PY3:
-        fake_stream = StringIO(stdin_data)
-        fake_stream.buffer = BytesIO(to_bytes(stdin_data))
-    else:
-        fake_stream = BytesIO(to_bytes(stdin_data))
+    # if PY3:
+    fake_stream = StringIO(stdin_data)
+    fake_stream.buffer = BytesIO(to_bytes(stdin_data))
+    # else:
+    # fake_stream = BytesIO(to_bytes(stdin_data))
 
     try:
         sys.stdin = fake_stream
@@ -65,10 +64,10 @@ def swap_stdout():
     """
     old_stdout = sys.stdout
 
-    if PY3:
-        fake_stream = StringIO()
-    else:
-        fake_stream = BytesIO()
+    # if PY3:
+    fake_stream = StringIO()
+    # else:
+    # fake_stream = BytesIO()
 
     try:
         sys.stdout = fake_stream