Remove Py3 deprecation warnings and added .gitignore. I cannot port to

PyPy yet, since zope.security has still no PyPy support.

3 files changed, 11 insertions, 11 deletions

diff --git a/src/zope/i18n/tests/test_formats.py b/src/zope/i18n/tests/test_formats.py
index 0c260b4..ca3aeb2 100644
--- a/src/zope/i18n/tests/test_formats.py
+++ b/src/zope/i18n/tests/test_formats.py
@@ -178,7 +178,7 @@ class TestDateTimePatternParser(TestCase):
         try:
             parseDateTimePattern("HHHHH")
         except DateTimePatternParseError as err:
-            self.assert_(str(err).endswith('You have: 5'))
+            self.assertTrue(str(err).endswith('You have: 5'))
 
 
 class TestBuildDateTimeParseInfo(TestCase):
@@ -255,7 +255,7 @@ class TestDateTimeFormat(TestCase):
     format = DateTimeFormat(calendar=LocaleCalendarStub())
 
     def testInterfaceConformity(self):
-        self.assert_(IDateTimeFormat.providedBy(self.format))
+        self.assertTrue(IDateTimeFormat.providedBy(self.format))
 
     def testParseSimpleDateTime(self):
         # German short
@@ -828,7 +828,7 @@ class TestNumberFormat(TestCase):
         'infinity': 'oo', 'nan': 'N/A'})
 
     def testInterfaceConformity(self):
-        self.assert_(INumberFormat.providedBy(self.format))
+        self.assertTrue(INumberFormat.providedBy(self.format))
 
     def testParseSimpleInteger(self):
         self.assertEqual(self.format.parse('23341', '###0'),
diff --git a/src/zope/i18n/tests/test_itranslationdomain.py b/src/zope/i18n/tests/test_itranslationdomain.py
index 9e1775c..53fda3e 100644
--- a/src/zope/i18n/tests/test_itranslationdomain.py
+++ b/src/zope/i18n/tests/test_itranslationdomain.py
@@ -93,7 +93,7 @@ class TestITranslationDomain(PlacelessSetup):
         translate = self._domain.translate
         translated = translate('no way', target_language='en')
         self.assertEqual(translated, "no way")
-        self.assert_(type(translated) is unicode)
+        self.assertTrue(type(translated) is unicode)
 
     def testNoTargetLanguage(self):
         translate = self._domain.translate
diff --git a/src/zope/i18n/tests/test_zcml.py b/src/zope/i18n/tests/test_zcml.py
index fc9d90c..968c47e 100644
--- a/src/zope/i18n/tests/test_zcml.py
+++ b/src/zope/i18n/tests/test_zcml.py
@@ -57,7 +57,7 @@ class DirectivesTest(PlacelessSetup, unittest.TestCase):
 
     def testRegisterTranslations(self):
         from zope.configuration import xmlconfig
-        self.assert_(queryUtility(ITranslationDomain) is None)
+        self.assertTrue(queryUtility(ITranslationDomain) is None)
         xmlconfig.string(
             template % '''
             <configure package="zope.i18n.tests">
@@ -72,7 +72,7 @@ class DirectivesTest(PlacelessSetup, unittest.TestCase):
 
     def testAllowedTranslations(self):
         from zope.configuration import xmlconfig
-        self.assert_(queryUtility(ITranslationDomain) is None)
+        self.assertTrue(queryUtility(ITranslationDomain) is None)
         config.ALLOWED_LANGUAGES = ('de', 'fr')
         xmlconfig.string(
             template % '''
@@ -88,7 +88,7 @@ class DirectivesTest(PlacelessSetup, unittest.TestCase):
 
     def testRegisterDistributedTranslations(self):
         from zope.configuration import xmlconfig
-        self.assert_(queryUtility(ITranslationDomain, 'zope-i18n') is None)
+        self.assertTrue(queryUtility(ITranslationDomain, 'zope-i18n') is None)
         xmlconfig.string(
             template % '''
             <configure package="zope.i18n.tests">
@@ -122,7 +122,7 @@ class DirectivesTest(PlacelessSetup, unittest.TestCase):
     def testRegisterAndCompileTranslations(self):
         from zope.configuration import xmlconfig
         config.COMPILE_MO_FILES = True
-        self.assert_(queryUtility(ITranslationDomain) is None)
+        self.assertTrue(queryUtility(ITranslationDomain) is None)
 
         # Copy an old and outdated file over, so we can test if the
         # newer file check works
@@ -160,8 +160,8 @@ class DirectivesTest(PlacelessSetup, unittest.TestCase):
 
     def testRegisterTranslationsForDomain(self):
         from zope.configuration import xmlconfig
-        self.assert_(queryUtility(ITranslationDomain, 'zope-i18n') is None)
-        self.assert_(queryUtility(ITranslationDomain, 'zope-i18n2') is None)
+        self.assertTrue(queryUtility(ITranslationDomain, 'zope-i18n') is None)
+        self.assertTrue(queryUtility(ITranslationDomain, 'zope-i18n2') is None)
         xmlconfig.string(
             template % '''
             <configure package="zope.i18n.tests">
@@ -174,7 +174,7 @@ class DirectivesTest(PlacelessSetup, unittest.TestCase):
         self.assertEquals(util._catalogs,
                           {'test': ['test'], 'en': [unicode(path)]})
 
-        self.assert_(queryUtility(ITranslationDomain, 'zope-i18n2') is None)
+        self.assertTrue(queryUtility(ITranslationDomain, 'zope-i18n2') is None)
 
 
 def test_suite():