[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/interface/ Merge from trunk:

[Philipp von Weitershausen]

Log message for revision 27506:
  Merge from trunk:
  
  ------------------------------------------------------------------------
  r27503 | philikon | 2004-09-12 16:38:44 +0200 (Sun, 12 Sep 2004) | 2 lines
  
  unittest.main accepts 'defaultTest', not 'default' as kw arg.
  
  ------------------------------------------------------------------------
  r27504 | philikon | 2004-09-12 16:39:47 +0200 (Sun, 12 Sep 2004) | 3 lines
  
  Vocabularies can be iterated over; elements of the iteration
  are terms, so no need to use this private attribute here.
  
  ------------------------------------------------------------------------
  
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/interface/tests/test_vocabulary.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/interface/vocabulary.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/interface/tests/test_vocabulary.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/interface/tests/test_vocabulary.py	2004-09-12 14:46:41 UTC (rev 27505)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/interface/tests/test_vocabulary.py	2004-09-12 14:51:13 UTC (rev 27506)
@@ -25,4 +25,4 @@
                         tearDown=setup.placelessTearDown)
 
 if __name__ == '__main__':
-    unittest.main(default='test_suite')
+    unittest.main(defaultTest='test_suite')

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/interface/vocabulary.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/interface/vocabulary.py	2004-09-12 14:46:41 UTC (rev 27505)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/interface/vocabulary.py	2004-09-12 14:51:13 UTC (rev 27506)
@@ -40,7 +40,7 @@
 
     >>> vocab = ObjectInterfacesVocabulary(Object())
     >>> import pprint
-    >>> names = [term.token for term in vocab._terms]
+    >>> names = [term.token for term in vocab]
     >>> names.sort()
     >>> pprint.pprint(names)
     ['zope.app.interface.vocabulary.I1',