Simplify compat module by always treating Python 3 as normal case

Author: timofurrer

radish/compat.py

@@ -1,41 +1,19 @@
 # -*- coding: utf-8 -*-
 
 """
-    This module provide Oython 2 / Python 3 compatability
+This module provide Python 2 / Python 3 compatability
 """
 
-from sys import version_info
+import sys
 
 try:
     from io import StringIO
 except ImportError:
     from StringIO import StringIO
 
-from .exceptions import PythonCompatibilityError
-
 
 # flags to indicate Python versions
-PY2 = None
-"""
-Flag to indication CPython 2 compatibility, set to True when running CPython 2
-False otherwise
-"""
-
-PY3 = None
-"""
-Flag to indication CPython 2 compatibility, set to True when running CPython 3
-False otherwise
-"""
-
-# check major version if 2 then set PY2 to True
-if version_info[0] == 2:  # pragma: no cover
-    PY2 = True
-# check major version if 3 then set PY3 to True
-elif version_info[0] == 3:  # pragma: no cover
-    PY3 = True
-else:   # pragma: no cover
-    PY2 = False
-    PY3 = False
+PY2 = sys.version_info[0] == 2
 
 
 def u(text):  # pragma: no cover
@@ -45,17 +23,9 @@ def u(text):  # pragma: no cover
 
     :param text: text to encode
     :type text: str,unicode
-
-    :raises PythonCompatibilityError:
-       if unicode support is not handled by interpreter/version
     """
     # look for unicode in the builtins which only exists in python 2
     if PY2 is True:
-        unicode_text = unicode(text, "utf-8")
-    elif PY3 is True:
-        unicode_text = text
-    else:
-        msg = "unicode support unhandled for this Python interpreter/version"
-        raise PythonCompatibilityError(msg)
-
-    return unicode_text
+        return unicode(text, "utf-8")
+
+    return text

radish/exceptions.py

@@ -13,13 +13,6 @@ class RadishError(Exception):
     pass
 
 
-class PythonCompatibilityError(RadishError):
-    """
-        Raised if python compatibility is not possible
-    """
-    pass
-
-
 class LanguageNotSupportedError(RadishError):
     """
         Raised if the language could not be found.