Fix regressions occuring during PY2 deprecation. (#1011)

* Fix regressions occuring during PY2 deprecation.

* Added parenthesis for readability.

Author: dieppedalle

openhtf/output/callbacks/__init__.py

@@ -43,7 +43,9 @@ def __init__(self, filename: Text):
     self.temp = tempfile.NamedTemporaryFile(delete=False)
 
   def write(self, write_data: Union[Text, bytes]) -> int:
-    return self.temp.write(six.ensure_binary(write_data))
+    if isinstance(write_data, str):
+      write_data = write_data.encode()
+    return self.temp.write(write_data)
 
   def close(self) -> None:
     self.temp.close()
@@ -133,7 +135,7 @@ def __call__(self, test_rec: test_record.TestRecord) -> None:
         outfile.write(serialized_record.encode())
       elif isinstance(serialized_record, Iterable):
         for chunk in serialized_record:
-          outfile.write(chunk.encode())
+          outfile.write(chunk.encode() if isinstance(chunk, str) else chunk)
       else:
         raise TypeError('Expected string or iterable but got {}.'.format(
             type(serialized_record)))

openhtf/output/callbacks/mfg_inspector.py

@@ -148,7 +148,8 @@ def __init__(self,
     if user and keydata:
       self.credentials = oauth2client.client.SignedJwtAssertionCredentials(
           service_account_name=self.user,
-          private_key=self.keydata.encode(),
+          private_key=(self.keydata.encode()
+                       if isinstance(self.keydata, str) else self.keydata),
           scope=self.SCOPE_CODE_URI,
           user_agent='OpenHTF Guzzle Upload Client',
           token_uri=self.token_uri)

openhtf/util/threads.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 """Thread library defining a few helpers."""
 
+import _thread
 import contextlib
 import cProfile
 import ctypes
@@ -22,11 +23,6 @@
 import sys
 import threading
 
-try:
-  import _thread  # pylint: disable=g-import-not-at-top
-except ImportError:
-  import _dummy_thread as _thread  # pylint: disable=g-import-not-at-top
-
 _LOG = logging.getLogger(__name__)