refactor: move encode logic from device to ImageUtils

Author: dtopuzov

core/utils/device/device.py

@@ -71,11 +71,7 @@ def get_text(self):
         actual_image_path = os.path.join(Settings.TEST_OUT_IMAGES, img_name)
         File.delete(actual_image_path)
         self.get_screen(path=actual_image_path, log_level=logging.DEBUG)
-        text = ImageUtils.get_text(image_path=actual_image_path)
-        if Settings.PYTHON_VERSION < 3:
-            return text.decode('utf-8').strip()
-        else:
-            return text.encode('utf-8').strip().decode('utf-8')
+        return ImageUtils.get_text(image_path=actual_image_path)
 
     def wait_for_text(self, text, timeout=30, retry_delay=1):
         t_end = time.time() + timeout

core/utils/image_utils.py

@@ -13,6 +13,8 @@
 import pytesseract
 from PIL import Image
 
+from core.settings import Settings
+
 
 class ImageUtils(object):
     @staticmethod
@@ -110,4 +112,7 @@ def get_text(image_path):
         row_text = pytesseract.image_to_string(image, lang='eng',
                                                config="-c tessedit_char_whitelist=%s_-." % char_whitelist).strip()
         text = "".join([s for s in row_text.splitlines(True) if s.strip()])
-        return text.encode(encoding='utf-8', errors='ignore')
+        if Settings.PYTHON_VERSION < 3:
+            return str(text.decode('utf8').encode('utf8')).strip()
+        else:
+            return text.decode("utf-8").strip()