Changeset 7501 for main/waeup.sirp/trunk/src/waeup/sirp

Timestamp:

23 Jan 2012, 12:35:12 (13 years ago)

Author:

uli

Message:

Fix deprecation warnings with Python 2.7

Location:

main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests

Files:

• test_datewidget.py (modified) (2 diffs)
• test_objectwidget.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_datewidget.py

@@ -58 +58 @@
     def test_hasInput(self):
         del self._widget.request.form['field.foo']
-        self.failIf(self._widget.hasInput())
+        self.assertFalse(self._widget.hasInput())
         self._widget.request.form['field.foo'] = u''
-        self.failUnless(self._widget.hasInput())
+        self.assertTrue(self._widget.hasInput())
         self._widget.request.form['field.foo'] = u'2003-03-26'
-        self.failUnless(self._widget.hasInput())
+        self.assertTrue(self._widget.hasInput())
 
     def test_getDefaultInputValue(self,
@@ -101 +101 @@
 
     def testDefaultDisplayStyle(self):
-        self.failIf(self._widget.displayStyle)
+        self.assertFalse(self._widget.displayStyle)
 
     def testRenderDefault(self):

main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_objectwidget.py

@@ -120 +120 @@
         error_html = widget.error()
         if sys.version_info < (2, 5):
-            self.failUnless("email: <zope.formlib.interfaces.Mis" 
+            self.assertTrue("email: <zope.formlib.interfaces.Mis" 
                              in error_html)
-            self.failUnless("name: <zope.formlib.interfaces.Miss"
+            self.assertTrue("name: <zope.formlib.interfaces.Miss"
                              in error_html)
         else:
-            self.failUnless(
+            self.assertTrue(
                 "email: MissingInputError(u'field.foo.email', u'', None)"
                 in error_html)
-            self.failUnless(
+            self.assertTrue(
                 "name: MissingInputError(u'field.foo.name', u'', None)"
                 in error_html)