[Checkins] SVN: zope.schema/branches/jinty-python3/ Fix deprecated unittest methods
Brian Sutherland
jinty at web.de
Tue Oct 11 06:49:15 EST 2011
Log message for revision 123053:
Fix deprecated unittest methods
Changed:
U zope.schema/branches/jinty-python3/CHANGES.txt
U zope.schema/branches/jinty-python3/src/zope/schema/tests/test_accessors.py
U zope.schema/branches/jinty-python3/src/zope/schema/tests/test_choice.py
U zope.schema/branches/jinty-python3/src/zope/schema/tests/test_equality.py
U zope.schema/branches/jinty-python3/src/zope/schema/tests/test_field.py
U zope.schema/branches/jinty-python3/src/zope/schema/tests/test_listfield.py
U zope.schema/branches/jinty-python3/src/zope/schema/tests/test_objectfield.py
U zope.schema/branches/jinty-python3/src/zope/schema/tests/test_schema.py
U zope.schema/branches/jinty-python3/src/zope/schema/tests/test_setfield.py
U zope.schema/branches/jinty-python3/src/zope/schema/tests/test_states.py
U zope.schema/branches/jinty-python3/src/zope/schema/tests/test_strfield.py
U zope.schema/branches/jinty-python3/src/zope/schema/tests/test_tuplefield.py
U zope.schema/branches/jinty-python3/src/zope/schema/tests/test_vocabulary.py
-=-
Modified: zope.schema/branches/jinty-python3/CHANGES.txt
===================================================================
--- zope.schema/branches/jinty-python3/CHANGES.txt 2011-10-11 11:28:01 UTC (rev 123052)
+++ zope.schema/branches/jinty-python3/CHANGES.txt 2011-10-11 11:49:13 UTC (rev 123053)
@@ -5,6 +5,8 @@
3.9.0 (unreleased)
------------------
+- Fix deprecated unittest methods.
+
- Port to Python 3. This adds a dependency on six and removes support for
Python 2.5.
Modified: zope.schema/branches/jinty-python3/src/zope/schema/tests/test_accessors.py
===================================================================
--- zope.schema/branches/jinty-python3/src/zope/schema/tests/test_accessors.py 2011-10-11 11:28:01 UTC (rev 123052)
+++ zope.schema/branches/jinty-python3/src/zope/schema/tests/test_accessors.py 2011-10-11 11:49:13 UTC (rev 123053)
@@ -62,10 +62,10 @@
for attr in ('title', 'description', 'readonly'):
self.assertEqual(getattr(I['getFoo'], attr), getattr(field, attr))
- self.assert_(IText.providedBy(I['getFoo']))
+ self.assertTrue(IText.providedBy(I['getFoo']))
- self.assert_(IMethod.providedBy(I['getFoo']))
- self.assert_(IMethod.providedBy(I['setFoo']))
+ self.assertTrue(IMethod.providedBy(I['getFoo']))
+ self.assertTrue(IMethod.providedBy(I['setFoo']))
self.assertEqual(I['setFoo'].field, field)
self.assertEqual(I['setFoo'].__name__, 'setFoo')
@@ -75,17 +75,17 @@
self.assertRaises(Exception, verifyClass, I, Bad)
self.assertRaises(Exception, verifyObject, I, Bad())
- self.assertEquals(I['getFoo'].query(Bad(), 42), 42)
+ self.assertEqual(I['getFoo'].query(Bad(), 42), 42)
self.assertRaises(AttributeError, I['getFoo'].get, Bad())
verifyClass(I, Good)
verifyObject(I, Good())
- self.assertEquals(I['getFoo'].query(Good(), 42), u('foo'))
- self.assertEquals(I['getFoo'].get(Good()), u('foo'))
+ self.assertEqual(I['getFoo'].query(Good(), 42), u('foo'))
+ self.assertEqual(I['getFoo'].get(Good()), u('foo'))
instance = Good()
I['getFoo'].set(instance, u('whatever'))
- self.assertEquals(instance.set, 1)
+ self.assertEqual(instance.set, 1)
def test_doc(self):
Modified: zope.schema/branches/jinty-python3/src/zope/schema/tests/test_choice.py
===================================================================
--- zope.schema/branches/jinty-python3/src/zope/schema/tests/test_choice.py 2011-10-11 11:28:01 UTC (rev 123052)
+++ zope.schema/branches/jinty-python3/src/zope/schema/tests/test_choice.py 2011-10-11 11:49:13 UTC (rev 123053)
@@ -72,11 +72,11 @@
def check_preconstructed(self, cls, okval, badval):
v = SampleVocabulary()
field = cls(vocabulary=v)
- self.assert_(field.vocabulary is v)
- self.assert_(field.vocabularyName is None)
+ self.assertTrue(field.vocabulary is v)
+ self.assertTrue(field.vocabularyName is None)
bound = field.bind(None)
- self.assert_(bound.vocabulary is v)
- self.assert_(bound.vocabularyName is None)
+ self.assertTrue(bound.vocabulary is v)
+ self.assertTrue(bound.vocabularyName is None)
bound.default = okval
self.assertEqual(bound.default, okval)
self.assertRaises(ValidationError, setattr, bound, "default", badval)
@@ -87,11 +87,11 @@
def check_constructed(self, cls, okval, badval):
vocabulary.setVocabularyRegistry(DummyRegistry())
field = cls(vocabulary="vocab")
- self.assert_(field.vocabulary is None)
+ self.assertTrue(field.vocabulary is None)
self.assertEqual(field.vocabularyName, "vocab")
o = object()
bound = field.bind(o)
- self.assert_(isinstance(bound.vocabulary, SampleVocabulary))
+ self.assertTrue(isinstance(bound.vocabulary, SampleVocabulary))
bound.default = okval
self.assertEqual(bound.default, okval)
self.assertRaises(ValidationError, setattr, bound, "default", badval)
Modified: zope.schema/branches/jinty-python3/src/zope/schema/tests/test_equality.py
===================================================================
--- zope.schema/branches/jinty-python3/src/zope/schema/tests/test_equality.py 2011-10-11 11:28:01 UTC (rev 123052)
+++ zope.schema/branches/jinty-python3/src/zope/schema/tests/test_equality.py 2011-10-11 11:49:13 UTC (rev 123053)
@@ -27,7 +27,7 @@
def test_equality(self):
for text in self.equality:
- self.assertEquals(eval(text), eval(text))
+ self.assertEqual(eval(text), eval(text))
def test_suite():
return TestSuite(
Modified: zope.schema/branches/jinty-python3/src/zope/schema/tests/test_field.py
===================================================================
--- zope.schema/branches/jinty-python3/src/zope/schema/tests/test_field.py 2011-10-11 11:28:01 UTC (rev 123052)
+++ zope.schema/branches/jinty-python3/src/zope/schema/tests/test_field.py 2011-10-11 11:49:13 UTC (rev 123053)
@@ -49,7 +49,7 @@
self.assertEqual(field.queryTaggedValue('a'), field2.queryTaggedValue('a'))
for n in ('__class__', '__name__', '__doc__', 'title', 'description',
'readonly', 'required', 'interface'):
- self.assertEquals(getattr(field2, n), getattr(field, n), n)
+ self.assertEqual(getattr(field2, n), getattr(field, n), n)
def testValidate(self):
field = self._Field_Factory(
@@ -120,13 +120,13 @@
a = Text()
b = Text()
- self.failUnless(S1['a'].order < S1['b'].order)
+ self.assertTrue(S1['a'].order < S1['b'].order)
class S2(Interface):
b = Text()
a = Text()
- self.failUnless(S2['a'].order > S2['b'].order)
+ self.assertTrue(S2['a'].order > S2['b'].order)
def testConstraint(self):
def isodd(x):
@@ -171,7 +171,7 @@
class MyField(Field):
pass
field = MyField(title=u('my'))
- self.assert_(field.required)
+ self.assertTrue(field.required)
def test_suite():
checker = renormalizing.RENormalizing([
Modified: zope.schema/branches/jinty-python3/src/zope/schema/tests/test_listfield.py
===================================================================
--- zope.schema/branches/jinty-python3/src/zope/schema/tests/test_listfield.py 2011-10-11 11:28:01 UTC (rev 123052)
+++ zope.schema/branches/jinty-python3/src/zope/schema/tests/test_listfield.py 2011-10-11 11:49:13 UTC (rev 123053)
@@ -112,9 +112,9 @@
def testImplements(self):
field = List()
- self.failUnless(IList.providedBy(field))
- self.failUnless(ISequence.providedBy(field))
- self.failUnless(ICollection.providedBy(field))
+ self.assertTrue(IList.providedBy(field))
+ self.assertTrue(ISequence.providedBy(field))
+ self.assertTrue(ICollection.providedBy(field))
def test_suite():
return makeSuite(ListTest)
Modified: zope.schema/branches/jinty-python3/src/zope/schema/tests/test_objectfield.py
===================================================================
--- zope.schema/branches/jinty-python3/src/zope/schema/tests/test_objectfield.py 2011-10-11 11:28:01 UTC (rev 123052)
+++ zope.schema/branches/jinty-python3/src/zope/schema/tests/test_objectfield.py 2011-10-11 11:49:13 UTC (rev 123053)
@@ -233,7 +233,7 @@
self.assertRaises(ValidationError, field.validate, data)
self.assertRaises(WrongContainedType, field.validate, data)
errors = self.getErrors(field.validate, data)
- self.assertEquals(errors[0], RequiredMissing('foo'))
+ self.assertEqual(errors[0], RequiredMissing('foo'))
def test_validate_FieldPropertyTestData(self):
field = self.makeTestObject(schema=ITestSchema, required=False)
@@ -250,7 +250,7 @@
self.assertRaises(ValidationError, field.validate, data)
self.assertRaises(WrongContainedType, field.validate, data)
errors = self.getErrors(field.validate, data)
- self.assert_(isinstance(errors[0], SchemaNotFullyImplemented))
+ self.assertTrue(isinstance(errors[0], SchemaNotFullyImplemented))
def test_validate_with_non_object_value(self):
field = self.makeTestObject(
@@ -274,12 +274,12 @@
pass
context = Dummy()
field.set(context, data)
- self.assertEquals(1, len(events))
+ self.assertEqual(1, len(events))
event = events[0]
- self.failUnless(IBeforeObjectAssignedEvent.providedBy(event))
- self.assertEquals(data, event.object)
- self.assertEquals('object_field', event.name)
- self.assertEquals(context, event.context)
+ self.assertTrue(IBeforeObjectAssignedEvent.providedBy(event))
+ self.assertEqual(data, event.object)
+ self.assertEqual('object_field', event.name)
+ self.assertEqual(context, event.context)
# cycles
Modified: zope.schema/branches/jinty-python3/src/zope/schema/tests/test_schema.py
===================================================================
--- zope.schema/branches/jinty-python3/src/zope/schema/tests/test_schema.py 2011-10-11 11:28:01 UTC (rev 123052)
+++ zope.schema/branches/jinty-python3/src/zope/schema/tests/test_schema.py 2011-10-11 11:49:13 UTC (rev 123053)
@@ -52,62 +52,62 @@
def test_getFieldNames(self):
names = getFieldNames(ISchemaTest)
self.assertEqual(len(names),3)
- self.assert_('title' in names)
- self.assert_('description' in names)
- self.assert_('spam' in names)
+ self.assertTrue('title' in names)
+ self.assertTrue('description' in names)
+ self.assertTrue('spam' in names)
def test_getFieldNamesAll(self):
names = getFieldNames(ISchemaTestSubclass)
self.assertEqual(len(names),4)
- self.assert_('title' in names)
- self.assert_('description' in names)
- self.assert_('spam' in names)
- self.assert_('foo' in names)
+ self.assertTrue('title' in names)
+ self.assertTrue('description' in names)
+ self.assertTrue('spam' in names)
+ self.assertTrue('foo' in names)
def test_getFields(self):
fields = getFields(ISchemaTest)
- self.assert_('title' in fields)
- self.assert_('description' in fields)
- self.assert_('spam' in fields)
+ self.assertTrue('title' in fields)
+ self.assertTrue('description' in fields)
+ self.assertTrue('spam' in fields)
# test whether getName() has the right value
for key, value in fields.items():
- self.assertEquals(key, value.getName())
+ self.assertEqual(key, value.getName())
def test_getFieldsAll(self):
fields = getFields(ISchemaTestSubclass)
- self.assert_('title' in fields)
- self.assert_('description' in fields)
- self.assert_('spam' in fields)
- self.assert_('foo' in fields)
+ self.assertTrue('title' in fields)
+ self.assertTrue('description' in fields)
+ self.assertTrue('spam' in fields)
+ self.assertTrue('foo' in fields)
# test whether getName() has the right value
for key, value in fields.items():
- self.assertEquals(key, value.getName())
+ self.assertEqual(key, value.getName())
def test_getFieldsInOrder(self):
fields = getFieldsInOrder(ISchemaTest)
field_names = [name for name, field in fields]
- self.assertEquals(field_names, ['title', 'description', 'spam'])
+ self.assertEqual(field_names, ['title', 'description', 'spam'])
for key, value in fields:
- self.assertEquals(key, value.getName())
+ self.assertEqual(key, value.getName())
def test_getFieldsInOrderAll(self):
fields = getFieldsInOrder(ISchemaTestSubclass)
field_names = [name for name, field in fields]
- self.assertEquals(field_names, ['title', 'description', 'spam', 'foo'])
+ self.assertEqual(field_names, ['title', 'description', 'spam', 'foo'])
for key, value in fields:
- self.assertEquals(key, value.getName())
+ self.assertEqual(key, value.getName())
def test_getFieldsNamesInOrder(self):
names = getFieldNamesInOrder(ISchemaTest)
- self.assertEquals(names, ['title', 'description', 'spam'])
+ self.assertEqual(names, ['title', 'description', 'spam'])
def test_getFieldsNamesInOrderAll(self):
names = getFieldNamesInOrder(ISchemaTestSubclass)
- self.assertEquals(names, ['title', 'description', 'spam', 'foo'])
+ self.assertEqual(names, ['title', 'description', 'spam', 'foo'])
def test_suite():
return makeSuite(SchemaTest)
Modified: zope.schema/branches/jinty-python3/src/zope/schema/tests/test_setfield.py
===================================================================
--- zope.schema/branches/jinty-python3/src/zope/schema/tests/test_setfield.py 2011-10-11 11:28:01 UTC (rev 123052)
+++ zope.schema/branches/jinty-python3/src/zope/schema/tests/test_setfield.py 2011-10-11 11:49:13 UTC (rev 123053)
@@ -158,14 +158,14 @@
def testNoUniqueArgument(self):
self.assertRaises(TypeError, Set, unique=False)
self.assertRaises(TypeError, Set, unique=True)
- self.failUnless(Set().unique)
+ self.assertTrue(Set().unique)
def testImplements(self):
field = Set()
- self.failUnless(ISet.providedBy(field))
- self.failUnless(IUnorderedCollection.providedBy(field))
- self.failUnless(IAbstractSet.providedBy(field))
- self.failUnless(ICollection.providedBy(field))
+ self.assertTrue(ISet.providedBy(field))
+ self.assertTrue(IUnorderedCollection.providedBy(field))
+ self.assertTrue(IAbstractSet.providedBy(field))
+ self.assertTrue(ICollection.providedBy(field))
class FrozenSetTest(CollectionFieldTestBase):
"""Test the Tuple Field."""
@@ -274,14 +274,14 @@
def testNoUniqueArgument(self):
self.assertRaises(TypeError, FrozenSet, unique=False)
self.assertRaises(TypeError, FrozenSet, unique=True)
- self.failUnless(FrozenSet().unique)
+ self.assertTrue(FrozenSet().unique)
def testImplements(self):
field = FrozenSet()
- self.failUnless(IFrozenSet.providedBy(field))
- self.failUnless(IAbstractSet.providedBy(field))
- self.failUnless(IUnorderedCollection.providedBy(field))
- self.failUnless(ICollection.providedBy(field))
+ self.assertTrue(IFrozenSet.providedBy(field))
+ self.assertTrue(IAbstractSet.providedBy(field))
+ self.assertTrue(IUnorderedCollection.providedBy(field))
+ self.assertTrue(ICollection.providedBy(field))
def test_suite():
suite = TestSuite()
Modified: zope.schema/branches/jinty-python3/src/zope/schema/tests/test_states.py
===================================================================
--- zope.schema/branches/jinty-python3/src/zope/schema/tests/test_states.py 2011-10-11 11:28:01 UTC (rev 123052)
+++ zope.schema/branches/jinty-python3/src/zope/schema/tests/test_states.py 2011-10-11 11:49:13 UTC (rev 123053)
@@ -62,17 +62,17 @@
def test_default_presentation(self):
field = IBirthInfo.getDescriptionFor("state1")
bound = field.bind(object())
- self.assert_(verifyObject(IVocabulary, bound.vocabulary))
+ self.assertTrue(verifyObject(IVocabulary, bound.vocabulary))
self.assertEqual(bound.vocabulary.getTerm("VA").title, "Virginia")
def test_contains(self):
vocab = states.StateVocabulary()
- self.assert_(verifyObject(IVocabulary, vocab))
+ self.assertTrue(verifyObject(IVocabulary, vocab))
count = 0
L = list(vocab)
for term in L:
count += 1
- self.assert_(term.value in vocab)
+ self.assertTrue(term.value in vocab)
self.assertEqual(count, len(vocab))
# make sure we get the same values the second time around:
L = [term.value for term in L]
@@ -84,9 +84,9 @@
def test_prebound_vocabulary(self):
field = IBirthInfo.getDescriptionFor("state3")
bound = field.bind(None)
- self.assert_(bound.vocabularyName is None)
- self.assert_(verifyObject(IVocabulary, bound.vocabulary))
- self.assert_("AL" in bound.vocabulary)
+ self.assertTrue(bound.vocabularyName is None)
+ self.assertTrue(verifyObject(IVocabulary, bound.vocabulary))
+ self.assertTrue("AL" in bound.vocabulary)
def test_suite():
Modified: zope.schema/branches/jinty-python3/src/zope/schema/tests/test_strfield.py
===================================================================
--- zope.schema/branches/jinty-python3/src/zope/schema/tests/test_strfield.py 2011-10-11 11:28:01 UTC (rev 123052)
+++ zope.schema/branches/jinty-python3/src/zope/schema/tests/test_strfield.py 2011-10-11 11:49:13 UTC (rev 123053)
@@ -140,11 +140,11 @@
# Using a normal value, the field gets updated
field.set(dummy, u('test'))
- self.assertEquals(u('test'), dummy.password)
+ self.assertEqual(u('test'), dummy.password)
# Using UNCHANGED_PASSWORD the field is not updated.
field.set(dummy, field.UNCHANGED_PASSWORD)
- self.assertEquals(u('test'), dummy.password)
+ self.assertEqual(u('test'), dummy.password)
class LineTest(SingleLine, BytesTest):
Modified: zope.schema/branches/jinty-python3/src/zope/schema/tests/test_tuplefield.py
===================================================================
--- zope.schema/branches/jinty-python3/src/zope/schema/tests/test_tuplefield.py 2011-10-11 11:28:01 UTC (rev 123052)
+++ zope.schema/branches/jinty-python3/src/zope/schema/tests/test_tuplefield.py 2011-10-11 11:49:13 UTC (rev 123053)
@@ -117,9 +117,9 @@
def testImplements(self):
field = Tuple()
- self.failUnless(ITuple.providedBy(field))
- self.failUnless(ISequence.providedBy(field))
- self.failUnless(ICollection.providedBy(field))
+ self.assertTrue(ITuple.providedBy(field))
+ self.assertTrue(ISequence.providedBy(field))
+ self.assertTrue(ICollection.providedBy(field))
def test_suite():
suite = TestSuite()
Modified: zope.schema/branches/jinty-python3/src/zope/schema/tests/test_vocabulary.py
===================================================================
--- zope.schema/branches/jinty-python3/src/zope/schema/tests/test_vocabulary.py 2011-10-11 11:28:01 UTC (rev 123052)
+++ zope.schema/branches/jinty-python3/src/zope/schema/tests/test_vocabulary.py 2011-10-11 11:49:13 UTC (rev 123053)
@@ -48,11 +48,11 @@
def test_setVocabularyRegistry(self):
r = DummyRegistry()
vocabulary.setVocabularyRegistry(r)
- self.assert_(vocabulary.getVocabularyRegistry() is r)
+ self.assertTrue(vocabulary.getVocabularyRegistry() is r)
def test_getVocabularyRegistry(self):
r = vocabulary.getVocabularyRegistry()
- self.assert_(interfaces.IVocabularyRegistry.providedBy(r))
+ self.assertTrue(interfaces.IVocabularyRegistry.providedBy(r))
# TODO: still need to test the default implementation
@@ -99,13 +99,13 @@
def test_simple_term_title(self):
t = vocabulary.SimpleTerm(1)
verifyObject(interfaces.ITokenizedTerm, t)
- self.failUnlessRaises(DoesNotImplement, verifyObject,
+ self.assertRaises(DoesNotImplement, verifyObject,
interfaces.ITitledTokenizedTerm, t)
- self.failUnless(t.title is None)
+ self.assertTrue(t.title is None)
t = vocabulary.SimpleTerm(1, title="Title")
verifyObject(interfaces.ITokenizedTerm, t)
verifyObject(interfaces.ITitledTokenizedTerm, t)
- self.failUnlessEqual(t.title, "Title")
+ self.assertEqual(t.title, "Title")
def test_order(self):
value = 1
@@ -119,18 +119,18 @@
value += 1
def test_implementation(self):
- self.failUnless(verifyObject(interfaces.IVocabulary, self.list_vocab))
- self.failUnless(
+ self.assertTrue(verifyObject(interfaces.IVocabulary, self.list_vocab))
+ self.assertTrue(
verifyObject(interfaces.IVocabularyTokenized, self.list_vocab))
- self.failUnless(verifyObject(interfaces.IVocabulary, self.items_vocab))
- self.failUnless(
+ self.assertTrue(verifyObject(interfaces.IVocabulary, self.items_vocab))
+ self.assertTrue(
verifyObject(interfaces.IVocabularyTokenized, self.items_vocab))
def test_addt_interfaces(self):
class IStupid(Interface):
pass
v = vocabulary.SimpleVocabulary.fromValues([1, 2, 3], IStupid)
- self.failUnless(IStupid.providedBy(v))
+ self.assertTrue(IStupid.providedBy(v))
def test_len(self):
self.assertEqual(len(self.list_vocab), 3)
@@ -138,14 +138,14 @@
def test_contains(self):
for v in (self.list_vocab, self.items_vocab):
- self.assert_(1 in v and 2 in v and 3 in v)
- self.assert_(5 not in v)
+ self.assertTrue(1 in v and 2 in v and 3 in v)
+ self.assertTrue(5 not in v)
def test_iter_and_get_term(self):
for v in (self.list_vocab, self.items_vocab):
for term in v:
- self.assert_(v.getTerm(term.value) is term)
- self.assert_(v.getTermByToken(term.token) is term)
+ self.assertTrue(v.getTerm(term.value) is term)
+ self.assertTrue(v.getTermByToken(term.token) is term)
def test_nonunique_tokens(self):
self.assertRaises(
@@ -162,13 +162,13 @@
try:
vocabulary.SimpleVocabulary.fromValues([2, '2'])
except ValueError as e:
- self.assertEquals(str(e), "term tokens must be unique: '2'")
+ self.assertEqual(str(e), "term tokens must be unique: '2'")
def test_nonunique_token_messages(self):
try:
vocabulary.SimpleVocabulary.fromItems([(0, 'one'), (1, 'one')])
except ValueError as e:
- self.assertEquals(str(e), "term values must be unique: 'one'")
+ self.assertEqual(str(e), "term values must be unique: 'one'")
def test_overriding_createTerm(self):
class MyTerm(object):
More information about the checkins
mailing list