Better handling of Python versions

Author: mdmintz

seleniumbase/common/unobfuscate.py

@@ -9,15 +9,16 @@
 """
 
 from seleniumbase.common import encryption
+import sys
 import time
 
 
 def main():
-    try:
+    if sys.version_info[0] >= 3:
+        input_method = input  # Using Python 3 (or higher)
+    else:
         # Python 2 has the raw_input() method. Python 3 does not.
         input_method = raw_input  # noqa: ignore=F821
-    except Exception:
-        input_method = input  # Using Python 3
     try:
         while(1):
             code = input_method(

seleniumbase/core/log_helper.py

@@ -33,7 +33,7 @@ def log_test_failure_data(test, test_logpath, driver, browser):
     data_to_save = []
     data_to_save.append("Last_Page: %s" % last_page)
     data_to_save.append("Browser: %s " % browser)
-    if sys.version.startswith('3') and hasattr(test, '_outcome'):
+    if sys.version_info[0] >= 3 and hasattr(test, '_outcome'):
         if test._outcome.errors:
             try:
                 exc_message = test._outcome.errors[0][1][1]

seleniumbase/fixtures/base_case.py

@@ -3377,7 +3377,7 @@ def tearDown(self):
         super(SubClassOfBaseCase, self).tearDown()
         """
         has_exception = False
-        if sys.version.startswith('3') and hasattr(self, '_outcome'):
+        if sys.version_info[0] >= 3 and hasattr(self, '_outcome'):
             if hasattr(self._outcome, 'errors') and self._outcome.errors:
                 has_exception = True
         else: