Skip to content

Commit

Permalink
Remove more deprecation warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
@strichter
strichter committed Mar 8, 2013
1 parent bedf81b commit cc543e4
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions src/zope/i18n/locales/tests/test_locales.py
View file
Expand Up @@ -35,7 +35,7 @@ def setUp(self):
self.locales = self._makeNewProvider()

def testInterfaceConformity(self):
self.assert_(ILocaleProvider.providedBy(self.locales))
self.assertTrue(ILocaleProvider.providedBy(self.locales))

def test_getLocale(self):
locale = self.locales.getLocale(None, None, None)
Expand Down Expand Up @@ -70,7 +70,7 @@ def test_loadLocale(self):
[(None, None, None)])

self.locales.loadLocale('en', None, None)
self.assert_(('en', None, None) in self.locales._locales.keys())
self.assertTrue(('en', None, None) in self.locales._locales.keys())

def test_loadLocaleFailure(self):
self.assertRaises(LoadLocaleError, self.locales.loadLocale, 'zzz')
Expand Down Expand Up @@ -125,13 +125,13 @@ class TestGlobalLocaleProvider(TestCase):

def testLoading(self):
locales.loadLocale(None, None, None)
self.assert_((None, None, None) in locales._locales)
self.assertTrue((None, None, None) in locales._locales)
locales.loadLocale('en', None, None)
self.assert_(('en', None, None) in locales._locales)
self.assertTrue(('en', None, None) in locales._locales)
locales.loadLocale('en', 'US', None)
self.assert_(('en', 'US', None) in locales._locales)
self.assertTrue(('en', 'US', None) in locales._locales)
locales.loadLocale('en', 'US', 'POSIX')
self.assert_(('en', 'US', 'POSIX') in locales._locales)
self.assertTrue(('en', 'US', 'POSIX') in locales._locales)

def test_getLocale(self):
locale = locales.getLocale('en', 'GB')
Expand Down
26 changes: 13 additions & 13 deletions src/zope/i18n/tests/test_zcml.py
View file
Expand Up @@ -67,8 +67,8 @@ def testRegisterTranslations(self):
path = os.path.join(os.path.dirname(zope.i18n.tests.__file__),
'locale', 'en', 'LC_MESSAGES', 'zope-i18n.mo')
util = getUtility(ITranslationDomain, 'zope-i18n')
self.assertEquals(util._catalogs.get('test'), ['test'])
self.assertEquals(util._catalogs.get('en'), [unicode(path)])
self.assertEqual(util._catalogs.get('test'), ['test'])
self.assertEqual(util._catalogs.get('en'), [unicode(path)])

def testAllowedTranslations(self):
from zope.configuration import xmlconfig
Expand All @@ -83,8 +83,8 @@ def testAllowedTranslations(self):
path = os.path.join(os.path.dirname(zope.i18n.tests.__file__),
'locale', 'de', 'LC_MESSAGES', 'zope-i18n.mo')
util = getUtility(ITranslationDomain, 'zope-i18n')
self.assertEquals(util._catalogs,
{'test': ['test'], 'de': [unicode(path)]})
self.assertEqual(util._catalogs,
{'test': ['test'], 'de': [unicode(path)]})

def testRegisterDistributedTranslations(self):
from zope.configuration import xmlconfig
Expand All @@ -106,18 +106,18 @@ def testRegisterDistributedTranslations(self):
path2 = os.path.join(os.path.dirname(zope.i18n.tests.__file__),
'locale2', 'en', 'LC_MESSAGES', 'zope-i18n.mo')
util = getUtility(ITranslationDomain, 'zope-i18n')
self.assertEquals(util._catalogs.get('test'), ['test', 'test'])
self.assertEquals(util._catalogs.get('en'),
self.assertEqual(util._catalogs.get('test'), ['test', 'test'])
self.assertEqual(util._catalogs.get('en'),
[unicode(path1), unicode(path2)])

msg = util.translate(u'Additional message', target_language='en')
self.assertEquals(msg, u'Additional message translated')
self.assertEqual(msg, u'Additional message translated')

msg = util.translate(u'New Domain', target_language='en')
self.assertEquals(msg, u'New Domain translated')
self.assertEqual(msg, u'New Domain translated')

msg = util.translate(u'New Language', target_language='en')
self.assertEquals(msg, u'New Language translated')
self.assertEqual(msg, u'New Language translated')

def testRegisterAndCompileTranslations(self):
from zope.configuration import xmlconfig
Expand Down Expand Up @@ -145,15 +145,15 @@ def testRegisterAndCompileTranslations(self):
</configure>
''', self.context)
util = getUtility(ITranslationDomain, 'zope-i18n')
self.assertEquals(util._catalogs,
self.assertEqual(util._catalogs,
{'test': ['test'], 'en': [unicode(path)]})

msg = util.translate(u"I'm a newer file", target_language='en')
self.assertEquals(msg, u"I'm a newer file translated")
self.assertEqual(msg, u"I'm a newer file translated")

util = getUtility(ITranslationDomain, 'zope-i18n2')
msg = util.translate(u"I'm a new file", target_language='en')
self.assertEquals(msg, u"I'm a new file translated")
self.assertEqual(msg, u"I'm a new file translated")

# Reset the mtime of the mo file
os.utime(path, (path_atime, path_mtime))
Expand All @@ -171,7 +171,7 @@ def testRegisterTranslationsForDomain(self):
path = os.path.join(os.path.dirname(zope.i18n.tests.__file__),
'locale3', 'en', 'LC_MESSAGES', 'zope-i18n.mo')
util = getUtility(ITranslationDomain, 'zope-i18n')
self.assertEquals(util._catalogs,
self.assertEqual(util._catalogs,
{'test': ['test'], 'en': [unicode(path)]})

self.assertTrue(queryUtility(ITranslationDomain, 'zope-i18n2') is None)
Expand Down

0 comments on commit cc543e4

Please sign in to comment.