diff options
Diffstat (limited to 'src/zope/i18n/tests/test_zcml.py')
| -rw-r--r-- | src/zope/i18n/tests/test_zcml.py | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/zope/i18n/tests/test_zcml.py b/src/zope/i18n/tests/test_zcml.py index cd3d2b4..5540beb 100644 --- a/src/zope/i18n/tests/test_zcml.py +++ b/src/zope/i18n/tests/test_zcml.py @@ -25,9 +25,8 @@ from zope.component.testing import PlacelessSetup from zope.configuration import xmlconfig import zope.i18n.tests -from zope.i18n._compat import text_type -from zope.i18n.interfaces import ITranslationDomain from zope.i18n import config +from zope.i18n.interfaces import ITranslationDomain template = """\ @@ -43,13 +42,13 @@ class DirectivesTest(PlacelessSetup, unittest.TestCase): # This test suite needs the [zcml] and [compile] extra dependencies def setUp(self): - super(DirectivesTest, self).setUp() + super().setUp() self.context = xmlconfig.file('meta.zcml', zope.i18n) self.allowed = config.ALLOWED_LANGUAGES config.ALLOWED_LANGUAGES = None def tearDown(self): - super(DirectivesTest, self).tearDown() + super().tearDown() config.ALLOWED_LANGUAGES = self.allowed def testRegisterTranslations(self): @@ -64,7 +63,7 @@ class DirectivesTest(PlacelessSetup, unittest.TestCase): 'locale', 'en', 'LC_MESSAGES', 'zope-i18n.mo') util = getUtility(ITranslationDomain, 'zope-i18n') self.assertEqual(util._catalogs.get('test'), ['test']) - self.assertEqual(util._catalogs.get('en'), [text_type(path)]) + self.assertEqual(util._catalogs.get('en'), [str(path)]) def testAllowedTranslations(self): self.assertTrue(queryUtility(ITranslationDomain) is None) @@ -79,7 +78,7 @@ class DirectivesTest(PlacelessSetup, unittest.TestCase): 'locale', 'de', 'LC_MESSAGES', 'zope-i18n.mo') util = getUtility(ITranslationDomain, 'zope-i18n') self.assertEqual(util._catalogs, - {'test': ['test'], 'de': [text_type(path)]}) + {'test': ['test'], 'de': [str(path)]}) def testRegisterDistributedTranslations(self): self.assertTrue(queryUtility(ITranslationDomain, 'zope-i18n') is None) @@ -102,16 +101,16 @@ class DirectivesTest(PlacelessSetup, unittest.TestCase): util = getUtility(ITranslationDomain, 'zope-i18n') self.assertEqual(util._catalogs.get('test'), ['test', 'test']) self.assertEqual(util._catalogs.get('en'), - [text_type(path1), text_type(path2)]) + [str(path1), str(path2)]) - msg = util.translate(u"Additional message", target_language='en') - self.assertEqual(msg, u"Additional message translated") + msg = util.translate("Additional message", target_language='en') + self.assertEqual(msg, "Additional message translated") - msg = util.translate(u"New Domain", target_language='en') - self.assertEqual(msg, u"New Domain translated") + msg = util.translate("New Domain", target_language='en') + self.assertEqual(msg, "New Domain translated") - msg = util.translate(u"New Language", target_language='en') - self.assertEqual(msg, u"New Language translated") + msg = util.translate("New Language", target_language='en') + self.assertEqual(msg, "New Language translated") def testRegisterAndCompileTranslations(self): config.COMPILE_MO_FILES = True @@ -139,14 +138,14 @@ class DirectivesTest(PlacelessSetup, unittest.TestCase): ''', self.context) util = getUtility(ITranslationDomain, 'zope-i18n') self.assertEqual(util._catalogs, - {'test': ['test'], 'en': [text_type(path)]}) + {'test': ['test'], 'en': [str(path)]}) - msg = util.translate(u"I'm a newer file", target_language='en') - self.assertEqual(msg, u"I'm a newer file translated") + msg = util.translate("I'm a newer file", target_language='en') + self.assertEqual(msg, "I'm a newer file translated") util = getUtility(ITranslationDomain, 'zope-i18n2') - msg = util.translate(u"I'm a new file", target_language='en') - self.assertEqual(msg, u"I'm a new file translated") + msg = util.translate("I'm a new file", target_language='en') + self.assertEqual(msg, "I'm a new file translated") # Reset the mtime of the mo file os.utime(path, (path_atime, path_mtime)) @@ -165,7 +164,7 @@ class DirectivesTest(PlacelessSetup, unittest.TestCase): 'locale3', 'en', 'LC_MESSAGES', 'zope-i18n.mo') util = getUtility(ITranslationDomain, 'zope-i18n') self.assertEqual(util._catalogs, - {'test': ['test'], 'en': [text_type(path)]}) + {'test': ['test'], 'en': [str(path)]}) self.assertTrue(queryUtility(ITranslationDomain, 'zope-i18n2') is None) |