Remove _compat and dependents.

Author: TkTech

flask_babel/__init__.py

@@ -19,7 +19,6 @@
 from pytz import timezone, UTC
 from werkzeug.datastructures import ImmutableDict
 
-from flask_babel._compat import string_types
 from flask_babel.speaklater import LazyString
 
 
@@ -249,10 +248,7 @@ def get_timezone():
             if rv is None:
                 tzinfo = babel.default_timezone
             else:
-                if isinstance(rv, string_types):
-                    tzinfo = timezone(rv)
-                else:
-                    tzinfo = rv
+                tzinfo = timezone(rv) if isinstance(rv, str) else rv
         ctx.babel_tzinfo = tzinfo
     return tzinfo
 
@@ -519,7 +515,7 @@ class Domain(object):
     """
 
     def __init__(self, translation_directories=None, domain='messages'):
-        if isinstance(translation_directories, string_types):
+        if isinstance(translation_directories, str):
             translation_directories = [translation_directories]
         self._translation_directories = translation_directories
         self.domain = domain

flask_babel/_compat.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-from flask_babel._compat import text_type
-
-
 class LazyString(object):
     def __init__(self, func, *args, **kwargs):
         self._func = func
@@ -11,67 +7,69 @@ def __init__(self, func, *args, **kwargs):
     def __getattr__(self, attr):
         if attr == "__setstate__":
             raise AttributeError(attr)
-        string = text_type(self)
+
+        string = str(self)
         if hasattr(string, attr):
             return getattr(string, attr)
+
         raise AttributeError(attr)
 
     def __repr__(self):
-        return "l'{0}'".format(text_type(self))
+        return "l'{0}'".format(str(self))
 
     def __str__(self):
-        return text_type(self._func(*self._args, **self._kwargs))
+        return str(self._func(*self._args, **self._kwargs))
 
     def __len__(self):
-        return len(text_type(self))
+        return len(str(self))
 
     def __getitem__(self, key):
-        return text_type(self)[key]
+        return str(self)[key]
 
     def __iter__(self):
-        return iter(text_type(self))
+        return iter(str(self))
 
     def __contains__(self, item):
-        return item in text_type(self)
+        return item in str(self)
 
     def __add__(self, other):
-        return text_type(self) + other
+        return str(self) + other
 
     def __radd__(self, other):
-        return other + text_type(self)
+        return other + str(self)
 
     def __mul__(self, other):
-        return text_type(self) * other
+        return str(self) * other
 
     def __rmul__(self, other):
-        return other * text_type(self)
+        return other * str(self)
 
     def __lt__(self, other):
-        return text_type(self) < other
+        return str(self) < other
 
     def __le__(self, other):
-        return text_type(self) <= other
+        return str(self) <= other
 
     def __eq__(self, other):
-        return text_type(self) == other
+        return str(self) == other
 
     def __ne__(self, other):
-        return text_type(self) != other
+        return str(self) != other
 
     def __gt__(self, other):
-        return text_type(self) > other
+        return str(self) > other
 
     def __ge__(self, other):
-        return text_type(self) >= other
+        return str(self) >= other
 
     def __html__(self):
-        return text_type(self)
+        return str(self)
 
     def __hash__(self):
-        return hash(text_type(self))
+        return hash(str(self))
 
     def __mod__(self, other):
-        return text_type(self) % other
+        return str(self) % other
 
     def __rmod__(self, other):
-        return other + text_type(self)
+        return other + str(self)

flask_babel/speaklater.py

@@ -5,7 +5,6 @@
 
 import flask_babel as babel
 from flask_babel import gettext, lazy_gettext, lazy_ngettext, ngettext
-from flask_babel._compat import text_type
 
 
 def test_basics():
@@ -47,11 +46,12 @@ def test_lazy_gettext():
     babel.Babel(app, default_locale='de_DE')
     yes = lazy_gettext(u'Yes')
     with app.test_request_context():
-        assert text_type(yes) == 'Ja'
+        assert str(yes) == 'Ja'
         assert yes.__html__() == 'Ja'
+
     app.config['BABEL_DEFAULT_LOCALE'] = 'en_US'
     with app.test_request_context():
-        assert text_type(yes) == 'Yes'
+        assert str(yes) == 'Yes'
         assert yes.__html__() == 'Yes'
 
 
@@ -60,11 +60,11 @@ def test_lazy_ngettext():
     babel.Babel(app, default_locale='de_DE')
     one_apple = lazy_ngettext(u'%(num)s Apple', u'%(num)s Apples', 1)
     with app.test_request_context():
-        assert text_type(one_apple) == '1 Apfel'
+        assert str(one_apple) == '1 Apfel'
         assert one_apple.__html__() == '1 Apfel'
     two_apples = lazy_ngettext(u'%(num)s Apple', u'%(num)s Apples', 2)
     with app.test_request_context():
-        assert text_type(two_apples) == u'2 Äpfel'
+        assert str(two_apples) == u'2 Äpfel'
         assert two_apples.__html__() == u'2 Äpfel'
 
 
@@ -73,10 +73,10 @@ def test_lazy_gettext_defaultdomain():
     b = babel.Babel(app, default_locale='de_DE', default_domain='test')
     first = lazy_gettext('first')
     with app.test_request_context():
-        assert text_type(first) == 'erste'
+        assert str(first) == 'erste'
     app.config['BABEL_DEFAULT_LOCALE'] = 'en_US'
     with app.test_request_context():
-        assert text_type(first) == 'first'
+        assert str(first) == 'first'
 
 
 def test_list_translations():