[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/ Backported

Stephan Richter srichter at cosmos.phy.tufts.edu
Thu Aug 12 15:45:57 EDT 2004


Log message for revision 27079:
  Backported
  
  r26524 | srichter | 2004-07-14 03:45:38 -0400 (Wed, 14 Jul 2004) | 6 lines
  r26551 | srichter | 2004-07-15 03:06:37 -0400 (Thu, 15 Jul 2004) | 6 lines
  r26522 | pruggera | 2004-07-14 01:42:06 -0400 (Wed, 14 Jul 2004) | 1 line
  r26531 | pruggera | 2004-07-14 13:00:15 -0400 (Wed, 14 Jul 2004) | 1 line
  r26534 | pruggera | 2004-07-14 15:55:34 -0400 (Wed, 14 Jul 2004) | 1 line
  r26540 | pruggera | 2004-07-14 18:14:25 -0400 (Wed, 14 Jul 2004) | 1 line
  
  
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/adapter.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/browser/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/tests.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/browser/apidoc.css
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/browser/apidoc.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/browser.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/tests.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/browser.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/menu.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/tests.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/utilities.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/utilitymodule/browser.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/viewmodule/tests.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/zcmlmodule/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/zcmlmodule/browser.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/runtimeinfo.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/servercontrol.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/translationdomaincontrol.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/zodbcontrol.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/tests/test_runtimeinfo.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/appsetup/appsetup.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/appsetup/bootstrap.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/basicskin/tests/sampleinterfaces.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/basicskin/tests/test_standardmacros.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/cache/annotationcacheable.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/cache/ram.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_annotationcacheable.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_caching.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_icache.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_ramcache.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/contentdirective.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/interface.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/adapter.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/exampleclass.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/factory.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/service.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_contentdirective.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_directives.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_factory.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_localservice.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_requirepermissions.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_servicedirective.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_servicemanagercontainer.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/views.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/tests/test_adding.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/tests/test_contents.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/tests/test_directive.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/constraints.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/contained.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/size.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/placelesssetup.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_containertraversable.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_containertraverser.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_directory.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_find.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_objectcopier.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_objectmover.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_size.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/container/traversal.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/copypastemove/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/copypastemove/tests/test_rename.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/dav/adapter.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/dav/ftests/test_mkcol.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/dav/tests/test_mkcol.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/debugskin/exceptions.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/decorator.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/dependable/tests.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/dtmlpage/browser.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/dtmlpage/tests/test_dtmlpageeval.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/dublincore/tests/test_creatorannotator.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/dublincore/xmlmetadata.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/dublincore/zopedublincore.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/errorservice/browser/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/errorservice/tests.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/event/dispatching.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/event/objectevent.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/event/tests/placelesssetup.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/exception/browser/tests/test_unauthorized.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/exception/browser/user.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/file/image.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/file/tests/test_image.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/exception.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/ftests/test_objectwidget.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_add.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_browserwidget.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_directives.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_editview.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_editwizardview.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_multicheckboxwidget.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_objectwidget.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_radiowidget.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_registrations.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_sequencewidget.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_vocabularyquery.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/tests/test_utility.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/tests/test_widget.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/form/utility.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/generations/browser/managers.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/generations/generations.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/http/delete.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/http/options.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/http/tests/test_delete.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/http/tests/test_put.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/http/tests/test_traversers.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/http/traversal.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/filters.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/tests/placelesssetup.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/tests/test_filters.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/tests/test_messagecatalog.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/i18nfile/browser/i18nfile.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/interface/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/introspector/tests/test_introspector.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/introspector/tests/test_introspectorview.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/locales/extract.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/location/pickling.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/location/traversing.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/mail/tests/test_directives.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/mail/tests/test_mailer.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/observable/observable.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/observable/tests.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/onlinehelp/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/onlinehelp/tests/test_onlinehelp.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/sample.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_directives.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_simpleviewclass.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_viewzpt.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_zopepythonexpr.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/testpackage/content.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/viewpagetemplatefile.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/pluggableauth/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publication/httpfactory.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publication/tests/test_browserpublication.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publication/tests/test_http.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publication/tests/test_simplecomponenttraverser.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publication/traversers.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/directoryresource.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/fileresource.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/globalbrowsermenuservice.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/i18nfileresource.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/icon.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/pagetemplateresource.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/templateclass.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_addMenuItem.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_directives.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_directoryresource.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservice.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_icondirective.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_menuaccessview.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_resource.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_resources.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/viewmeta.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/xmlrpc/tests/test_directives.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/browser/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/browser/rdb.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/tests/stubs.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/tests/test_zopedatabaseadapter.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/registration/tests/registrationstack.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/rotterdam/editingwidgets.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/rotterdam/tests/test_xmlnavigationviews.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/schema/tests/test_directives.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/security/fields.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/security/loginpassword.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/security/principallogging.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_basicauthadapter.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_directives.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_ftpauth.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_principallogging.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_principalregistry.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_protectclass.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/principalroleview.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/rolepermissionview.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/tests/rolepermissionmanager.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/tests/test_principalpermissionview.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/tests/test_principalroleview.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/principalrole.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/zopepolicy.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/server/ftp.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/server/mkzopeinstance.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/server/server.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/server/servercontrol.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/server/servertype.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/server/tests/test_mkzopeinstance.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_directives.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_service.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_services.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_toolbacklink.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tools.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/site/tests/test_servicemanager.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/site/tests/test_serviceregistration.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/size/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/size/tests.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/sqlscript/browser/sqlscript.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/sqlscript/dtml.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/sqlscript/tests/test_sqlscript.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/tests/test.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/tests/test_decorator.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/adapters.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/browser/tests.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/ftests/test_vhosting.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/namespace.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_conveniencefunctions.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_etc.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_physicallocationadapters.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_presentation.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_skin.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_traverser.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_vh.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/tree/adapters.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/tree/filters.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/tree/node.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/basetest.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/test_adapters.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/test_filters.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/test_node.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/tree/utils.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/undo/tests/test_undoview.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/utility/browser/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/utility/browser/tests/test_registered.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/utility/tests.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/browser/zptpage.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/tests/test_zptpage.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/tests/test_zptpageeval.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/zptpage.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/cachedescriptors/property.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/cachedescriptors/tests/test_property.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/component/tests/components.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/interface/_flatten.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/interface/declarations.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/interface/tests/test_odd_declarations.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/pagetemplate/pagetemplate.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/publisher/browser.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/security/checker.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/security/tests/test_checker.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/server/ftp/tests/demofs.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/server/logger/pythonlogger.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/server/tests/asyncerror.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/tales/expressions.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/tales/tales.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/adapter.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/adapter.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/adapter.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,7 +15,6 @@
 
 $Id$
 """
-__metaclass__ = type
 
 from persistent.dict import PersistentDict
 from persistent import Persistent

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/browser/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/browser/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/browser/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -23,7 +23,6 @@
 
 $Id$
 """
-__metaclass__ = type
 
 from zope.app.form.utility import setUpWidgets, getWidgetsData
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/tests.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/tests.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/tests.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -730,16 +730,16 @@
 class IR1(IR0):
     pass
 
-class R1:
+class R1(object):
     zope.interface.implements(IR1)
 
-class F0:
+class F0(object):
     zope.interface.implements(IF0)
 
-class F2:
+class F2(object):
     zope.interface.implements(IF2)
 
-class Registration:
+class Registration(object):
     name=u''
     with=()
     provided=zope.interface.Interface
@@ -768,7 +768,7 @@
 
 globalAdapterRegistry = GlobalAdapterRegistry()
 
-class TestStack:
+class TestStack(object):
     registration = None
     registrations = ()
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,6 +15,8 @@
 
 $Id$
 """
+__docformat__ = 'restructuredtext'
+
 from zope.interface import implements
 
 from zope.app import zapi
@@ -27,11 +29,11 @@
 class APIDocumentation(ReadContainerBase):
     r"""Represent the complete API Documentation.
 
-    This documentation is implemented using a simply 'IReadContainer'. The
+    This documentation is implemented using a simply `IReadContainer`. The
     items of the container are all registered utilities for
-    IDocumentationModule.
+    `IDocumentationModule`.
 
-    Demonstration::
+    Demonstration:
 
       >>> doc = APIDocumentation(None, '++apidoc++')
       >>> doc.get('ZCML').title
@@ -68,7 +70,7 @@
             utils.append((key, value))
         return utils
         
-class apidocNamespace:
+class apidocNamespace(object):
     """Used to traverse to an API Documentation."""
     def __init__(self, ob, request=None):
         self.context = ob

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/browser/apidoc.css
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/browser/apidoc.css	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/browser/apidoc.css	2004-08-12 19:45:55 UTC (rev 27079)
@@ -119,6 +119,22 @@
   margin: 0.5em 2em;
 }
 
+
+div.inline-documentation h1 {
+  font-size: 120%;
+  padding: 0;
+  margin: 0;
+  margin-bottom: 0.5em;
+}
+
+div.inline-documentation h2 {
+  font-size: 110%;
+  font-style: italic;
+  padding: 0;
+  margin: 0;
+  margin-bottom: 0.5em;
+}
+
 div.inline-documentation h3 {
   font-style: italic;
   font-weight: normal;

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/browser/apidoc.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/browser/apidoc.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/browser/apidoc.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,8 +15,10 @@
 
 $Id$
 """
-from zope.app.apidoc.utilities import stx2html
+__docformat__ = 'restructuredtext'
 
+from zope.app.apidoc.utilities import renderText
+
 class APIDocumentationView(object):
     """View for the API Documentation"""
 
@@ -38,6 +40,6 @@
         items.sort()
         return [{'name': name,
                  'title': module.title,
-                 # FIXME: Seems like stx2html() doesn't like message ids
-                 'description': stx2html(module.description)}
+                 'description': renderText(module.description,
+                                           module.__class__.__module__)}
                 for name, module in items ]

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -18,6 +18,8 @@
 
 $Id$
 """
+__docformat__ = 'restructuredtext'
+
 import os
 import sys
 import inspect
@@ -162,7 +164,7 @@
       >>> print module['browser'].getPath()
       zope.app.apidoc.browser
 
-    Now, the 'get(key, default=None)' is actually much smarter than you might
+    Now, the ``get(key, default=None)`` is actually much smarter than you might
     originally suspect, since it can actually get to more objects than it
     promises. If a key is not found in the module's children, it tries to
     import the key as a module relative to this module.
@@ -595,16 +597,16 @@
       >>> class ID(Interface):
       ...      pass
 
-      >>> class A:
+      >>> class A(object):
       ...    implements(IA)
       >>> reg['A'] = A
       >>> class B:
       ...    implements(IB)
       >>> reg['B'] = B
-      >>> class B2:
+      >>> class B2(object):
       ...    implements(IB)
       >>> reg['B2'] = B2
-      >>> class C:
+      >>> class C(object):
       ...    implements(IC)
       >>> reg['C'] = C
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/browser.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/browser.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/browser.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,6 +15,8 @@
 
 $Id$
 """
+__docformat__ = 'restructuredtext'
+
 import os
 import inspect
 
@@ -25,7 +27,7 @@
 
 from zope.app import zapi
 from zope.app.i18n import ZopeMessageIDFactory as _
-from zope.app.apidoc.utilities import getPythonPath, stx2html, columnize
+from zope.app.apidoc.utilities import getPythonPath, renderText, columnize
 from zope.app.apidoc.utilities import getPermissionIds, getFunctionSignature
 from zope.app.apidoc.utilities import getPublicAttributes
 from zope.app.apidoc.utilities import getInterfaceForAttribute
@@ -36,7 +38,7 @@
     """Menu for the Class Documentation Module.
 
     The menu allows for looking for classes by partial names. See
-    'findClasses()' for the simple search implementation.
+    `findClasses()` for the simple search implementation.
     """
 
     def findClasses(self):
@@ -113,7 +115,7 @@
     """Represents the details of the function."""
 
     def getDocString(self):
-        r"""Get the doc string of the class STX formatted.
+        r"""Get the doc string of the class in a rendered format.
 
         Example::
 
@@ -123,7 +125,8 @@
           >>> view.getDocString()
           '<p>This is the foo function.</p>\n'
         """
-        return stx2html(self.context.getDocString() or '', 3)
+        return renderText(self.context.getDocString() or '',
+                          zapi.getParent(self.context).getPath())
 
 
     def getAttributes(self):
@@ -275,14 +278,14 @@
 
           >>> methods = view.getMethods()
           >>> pprint(methods[-2:])
-          [[('doc', ''),
+          [[('doc', u''),
             ('interface',
              'zope.interface.common.mapping.IEnumerableMapping'),
             ('name', 'keys'),
             ('read_perm', None),
             ('signature', '()'),
             ('write_perm', None)],
-           [('doc', ''),
+           [('doc', u''),
             ('interface',
              'zope.interface.common.mapping.IEnumerableMapping'),
             ('name', 'values'),
@@ -295,7 +298,8 @@
         for name, attr, iface in klass.getMethods():
             entry = {'name': name,
                      'signature': getFunctionSignature(attr),
-                     'doc': stx2html(attr.__doc__ or '', 3),
+                     'doc': renderText(attr.__doc__ or '',
+                                       zapi.getParent(self.context).getPath()),
                      'interface': getPythonPath(iface)}
             entry.update(getPermissionIds(name, klass.getSecurityChecker()))
             methods.append(entry)
@@ -313,10 +317,11 @@
           >>> from tests import getClassDetailsView
           >>> view = getClassDetailsView()
 
-          >>> print view.getDoc()[:59]
-          <h3>Represent the Documentation of any possible class.</h3>
+          >>> print view.getDoc()[23:80]
+          <p>Represent the Documentation of any possible class.</p>
         """
-        return stx2html(self.context.getDocString() or '', 3)
+        return renderText(self.context.getDocString() or '',
+                          zapi.getParent(self.context).getPath())
 
 
 class ModuleDetails(object):
@@ -333,9 +338,11 @@
           >>> view = getModuleDetailsView()
 
           >>> print view.getDoc().strip()
+          <div class="document">
           <p>Class Documentation Module</p>
           <p>This module is able to take a dotted name of any class and display
           documentation for it.</p>
+          </div>
         """
         text = self.context.getDocString()
         if text is None:
@@ -343,7 +350,7 @@
         lines = text.strip().split('\n')
         # Get rid of possible CVS id.
         lines = [line for line in lines if not line.startswith('$Id')]
-        return stx2html('\n'.join(lines), 3)
+        return renderText('\n'.join(lines), self.context.getPath())
 
     def getEntries(self, columns=True):
         """Return info objects for all modules and classes in this module.

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/tests.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/tests.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/tests.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -16,18 +16,25 @@
 $Id$
 """
 import unittest
+from zope.component.interfaces import IFactory
 from zope.interface import Interface, directlyProvides
 from zope.publisher.browser import TestRequest
 from zope.testing.doctestunit import DocTestSuite
+
 from zope.app import zapi
+from zope.app.location.traversing import LocationPhysicallyLocatable
+from zope.app.renderer.rest import ReStructuredTextSourceFactory
+from zope.app.renderer.rest import IReStructuredTextSource
+from zope.app.renderer.rest import ReStructuredTextToHTMLRenderer
+from zope.app.renderer.stx import StructuredTextSourceFactory
+from zope.app.renderer.stx import IStructuredTextSource
+from zope.app.renderer.stx import StructuredTextToHTMLRenderer
 from zope.app.tests import placelesssetup, ztapi
-
 from zope.app.traversing.browser import AbsoluteURL, SiteAbsoluteURL
 from zope.app.traversing.interfaces import ITraversable, ITraverser
 from zope.app.traversing.interfaces import IPhysicallyLocatable
 from zope.app.traversing.interfaces import IContainmentRoot
 from zope.app.traversing.adapters import DefaultTraversable
-from zope.app.location.traversing import LocationPhysicallyLocatable
 from zope.app.traversing.adapters import RootPhysicallyLocatable
 from zope.app.traversing.adapters import Traverser
 
@@ -56,7 +63,17 @@
     ztapi.browserView(Interface, "absolute_url", AbsoluteURL)
     ztapi.browserView(IContainmentRoot, "absolute_url", SiteAbsoluteURL)
 
+    # Register Renderer Components
+    ztapi.provideUtility(IFactory, StructuredTextSourceFactory,
+                         'zope.source.stx')    
+    ztapi.provideUtility(IFactory, ReStructuredTextSourceFactory,
+                         'zope.source.rest')    
+    ztapi.browserView(IStructuredTextSource, '', 
+                      StructuredTextToHTMLRenderer)
+    ztapi.browserView(IReStructuredTextSource, '', 
+                      ReStructuredTextToHTMLRenderer)
 
+
 def tearDown():
     placelesssetup.tearDown()
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -20,6 +20,8 @@
 
 $Id$
 """
+__docformat__ = 'restructuredtext'
+
 from zope.app import zapi
 from zope.interface import implements
 from zope.app.apidoc.interfaces import IDocumentationModule
@@ -39,7 +41,7 @@
 class InterfaceModule(ReadContainerBase):
     r"""Represent the Documentation of all Interfaces.
 
-    This documentation is implemented using a simply 'IReadContainer'. The
+    This documentation is implemented using a simple `IReadContainer`. The
     items of the container are all the interfaces listed in the closest
     interface service and above.
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/browser.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/browser.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/browser.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,6 +15,8 @@
 
 $Id$
 """
+__docformat__ = 'restructuredtext'
+
 from types import FunctionType, MethodType, ClassType, TypeType
 from zope.component import ComponentLookupError
 from zope.interface.declarations import providedBy
@@ -24,7 +26,7 @@
 
 from zope.app import zapi
 from zope.app.i18n import ZopeMessageIDFactory as _
-from zope.app.apidoc.utilities import getPythonPath, stx2html
+from zope.app.apidoc.utilities import getPythonPath, renderText
 from zope.app.apidoc.classmodule import classRegistry
 
 def _get(iface, type):
@@ -65,7 +67,7 @@
     """Return a list of (name, value) tuples in native interface order.
 
     The type specifies whether we are looking for attributes or methods. The
-    '_itemsorter' argument provides the function that is used to order the
+    `_itemsorter` argument provides the function that is used to order the
     fields. The default function should be the correct one for 99% of your
     needs.
 
@@ -103,9 +105,9 @@
       ...     pass
       >>> class ISpecialField(IField):
       ...     pass
-      >>> class Field:
+      >>> class Field(object):
       ...     implements(IField)
-      >>> class SpecialField:
+      >>> class SpecialField(object):
       ...     implements(ISpecialField)
       >>> class ExtraField(SpecialField):
       ...     pass
@@ -143,7 +145,7 @@
 
     Examples::
 
-      >>> class Field:
+      >>> class Field(object):
       ...     required = False
 
       >>> field = Field()
@@ -197,7 +199,7 @@
           >>> details.getDoc()[:34]
           '<h1>This is the Foo interface</h1>'
         """
-        return stx2html(self.context.__doc__)
+        return renderText(self.context.__doc__, self.context.__module__)
 
     def getBases(self):
         """Get all bases of this class
@@ -267,7 +269,7 @@
             if not IMethod.providedBy(attr) and not IField.providedBy(attr):
                 attrs.append(attr)
         return [{'name': attr.getName(),
-                 'doc': stx2html(attr.getDoc() or '', 3)}
+                 'doc': renderText(attr.getDoc() or '', iface.__module__)}
                 for attr in attrs]
 
     def getMethods(self):
@@ -290,7 +292,8 @@
         """        
         return [{'name': method.getName(),
                  'signature': method.getSignatureString(),
-                 'doc': stx2html(method.getDoc() or '', 3)}
+                 'doc': renderText(method.getDoc() or '',
+                                   self.context.__module__)}
                 for method in _get(self.context, IMethod).values()]
             
     def getFields(self):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/menu.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/menu.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/menu.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -19,6 +19,8 @@
 
 $Id$
 """
+__docformat__ = 'restructuredtext'
+
 from zope.interface import implements
 from zope.proxy import removeAllProxies
 
@@ -78,7 +80,7 @@
         return items
 
 
-class InterfaceModuleChildObjects:
+class InterfaceModuleChildObjects(object):
     r"""Module Adapter for Static Tree
 
     This adapter is used when building a static tree for the browser.
@@ -134,8 +136,8 @@
     """Menu View Helper Class
 
     A class that helps building the menu. The menu_macros expects the menu view
-    class to have the getMenuTitle(node) and getMenuLink(node) methods
-    implemented. 'node' is a 'zope.app.tree.node.Node' instance.
+    class to have the `getMenuTitle(node)` and `getMenuLink(node)` methods
+    implemented. ``node`` is a ``zope.app.tree.node.Node`` instance.
 
     Examples::
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/tests.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/tests.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/ifacemodule/tests.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -16,6 +16,7 @@
 $Id$
 """
 import unittest
+
 from zope.component.interfaces import IFactory
 from zope.component.factory import Factory
 from zope.interface import implements, Interface, Attribute
@@ -23,19 +24,23 @@
 from zope.publisher.browser import TestRequest
 from zope.schema import TextLine, Text
 from zope.testing.doctestunit import DocTestSuite
+
 from zope.app import zapi
 from zope.app.component.interface import provideInterface
 from zope.app.location import LocationProxy
+from zope.app.location.traversing import LocationPhysicallyLocatable
+from zope.app.renderer.rest import ReStructuredTextSourceFactory
+from zope.app.renderer.rest import IReStructuredTextSource
+from zope.app.renderer.rest import ReStructuredTextToHTMLRenderer
+from zope.app.renderer.stx import StructuredTextSourceFactory
+from zope.app.renderer.stx import IStructuredTextSource
+from zope.app.renderer.stx import StructuredTextToHTMLRenderer
 from zope.app.tests import placelesssetup, ztapi
 from zope.app.traversing.interfaces import IContainmentRoot
-
+from zope.app.traversing.interfaces import IPhysicallyLocatable
 from zope.app.tree.interfaces import IUniqueId
 from zope.app.tree.adapters import LocationUniqueId 
 
-from zope.app.traversing.interfaces import IPhysicallyLocatable
-from zope.app.location import LocationProxy
-from zope.app.location.traversing import LocationPhysicallyLocatable
-
 from zope.app.apidoc.classmodule import classRegistry
 from zope.app.apidoc.ifacemodule import IInterfaceModule, InterfaceModule
 from zope.app.apidoc.ifacemodule.menu import IModule
@@ -43,7 +48,7 @@
 from zope.app.apidoc.interfaces import IDocumentationModule
 
 
-class Root:
+class Root(object):
     implements(IContainmentRoot)
 
     __parent__ = None
@@ -72,7 +77,7 @@
 class IBar(Interface):
     pass
 
-class Foo:
+class Foo(object):
     implements(IFoo)
 
 
@@ -95,6 +100,16 @@
     ztapi.provideAdapter(None, IPhysicallyLocatable,
                          LocationPhysicallyLocatable)
 
+    # Register Renderer Components
+    ztapi.provideUtility(IFactory, StructuredTextSourceFactory,
+                         'zope.source.stx')    
+    ztapi.provideUtility(IFactory, ReStructuredTextSourceFactory,
+                         'zope.source.rest')    
+    ztapi.browserView(IStructuredTextSource, '', 
+                      StructuredTextToHTMLRenderer)
+    ztapi.browserView(IReStructuredTextSource, '', 
+                      ReStructuredTextToHTMLRenderer)
+
     # Make IFoo adapter interesting.
 
     ztapi.provideAdapter(IBar, IFoo, object)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/utilities.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/utilities.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/utilities.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,7 +15,10 @@
 
 $Id$
 """
+__docformat__ = 'restructuredtext'
+
 import re
+import sys
 import types
 import inspect
 from os.path import dirname
@@ -23,14 +26,14 @@
 import zope
 from zope.interface import implements, implementedBy
 from zope.proxy import removeAllProxies
+from zope.publisher.browser import TestRequest
 from zope.security.checker import getCheckerForInstancesOf, Global
 from zope.security.interfaces import INameBasedChecker
+
+from zope.app import zapi
 from zope.app.i18n import ZopeMessageIDFactory as _
-
 from zope.app.container.interfaces import IReadContainer
 
-__metaclass__ = type
-
 _remove_html_overhead = re.compile(
     r'(?sm)^<html.*<body.*?>\n(.*)</body>\n</html>\n')
 
@@ -42,12 +45,12 @@
     return path.replace(BASEDIR, 'Zope3')
 
 
-class ReadContainerBase:
-    """Base for IReadContainer objects.
+class ReadContainerBase(object):
+    """Base for `IReadContainer` objects.
 
-    This is a base class that minimizes the implementation of IReadContainers
-    to two methods, get() and items(), since the other methods can be
-    implemented using these two.
+    This is a base class that minimizes the implementation of an
+    `IReadContainer` to two methods, `get()` and `items()`, since the other
+    methods can be implemented using these two.
 
     Demonstration::
 
@@ -118,7 +121,7 @@
     """Return the path of the object in standard Python notation.
 
     This method makes only sense for classes and interfaces. Instances do not
-    have a '__name__' attribute, so we would expect them to fail.
+    have a `__name__` attribute, so we would expect them to fail.
 
     Example::
 
@@ -154,30 +157,6 @@
     return '%s.%s' %(module, obj.__name__)
 
 
-def stx2html(text, level=1):
-    r"""Convert STX text to HTML.
-
-    Example::
-
-      >>> text = 'Header\n\n  Normal text goes here.'
-
-      >>> stx2html(text)
-      '<h1>Header</h1>\n<p>  Normal text goes here.</p>\n'
-
-      >>> stx2html(text, level=3)
-      '<h3>Header</h3>\n<p>  Normal text goes here.</p>\n'
-
-      >>> stx2html(text, level=6)
-      '<h6>Header</h6>\n<p>  Normal text goes here.</p>\n'
-    """
-    from zope.structuredtext.document import Document
-    from zope.structuredtext.html import HTML
-    doc = Document()(text)
-    html = HTML()(doc, level)
-    html = _remove_html_overhead.sub(r'\1', html)
-    return html
-
-
 def _evalId(id):
     id = removeAllProxies(id)
     if isinstance(id, Global):
@@ -192,8 +171,8 @@
 
     Either the klass or the checker must be specified. If the class is
     specified, then the checker for it is looked up. Furthermore, this
-    function only works with 'INameBasedChecker' checkers. If another checker
-    is found, 'None' is returned for the permissions.
+    function only works with `INameBasedChecker` checkers. If another checker
+    is found, ``None`` is returned for the permissions.
 
     Example::
 
@@ -271,7 +250,7 @@
 def getFunctionSignature(func):
     """Return the signature of a function or method.
 
-    The 'func' argument *must* be a generic function or a method of a class. 
+    The `func` argument *must* be a generic function or a method of a class. 
 
     Examples::
 
@@ -357,7 +336,7 @@
 def getPublicAttributes(obj):
     """Return a list of public attribute names.
 
-    This excludes any attribute starting with '_'. The 'obj' argument can be
+    This excludes any attribute starting with '_'. The `obj` argument can be
     either a classic class, type or instance of the previous two. Note that
     the term "attributes" here includes methods and properties.
 
@@ -372,7 +351,7 @@
       ...     def _getAttr(self):
       ...         return self.attr
       ...     attr2 = property(_getAttr)
-      >>> class Sample2:
+      >>> class Sample2(object):
       ...     attr = None
       >>> class Sample3(Sample):
       ...     attr3 = None
@@ -412,14 +391,14 @@
     This function is nice, if you have an attribute name which you retrieved
     from a class and want to know which interface requires it to be there.
 
-    Either 'interfaces' or 'klass' must be specified. If 'interfaces' is not
-    specified, the 'klass' is used to retrieve a list of
-    interfaces. 'interfaces' must be iterable.
+    Either `interfaces` or `klass` must be specified. If `interfaces` is not
+    specified, the `klass` is used to retrieve a list of
+    interfaces. `interfaces` must be iteratable.
 
-    'asPath' specifies whether the dotted name of the interface or the
+    `asPath` specifies whether the dotted name of the interface or the
     interface object is returned.
 
-    If no match is found, 'None' is returned.
+    If no match is found, ``None`` is returned.
 
     Example::
 
@@ -530,3 +509,35 @@
     if col:
         columns.append(col)
     return columns
+
+_format_dict = {
+    'plaintext': 'zope.source.plaintext',
+    'structuredtext': 'zope.source.stx',
+    'restructuredtext': 'zope.source.rest'
+    }
+    
+
+def getDocFormat(module):
+    """Convert a module's __docformat__ specification to a renderer source
+    id"""
+    format = getattr(module, '__docformat__', 'structuredtext').lower()
+    return _format_dict.get(format, 'zope.source.stx')
+
+
+def renderText(text, module=None, format=None):
+    if module is not None:
+        if isinstance(module, (str, unicode)):
+            module = sys.modules.get(module, None)
+        format = getDocFormat(module)
+
+    if format is None:
+        format = 'zope.source.stx'
+        
+    assert format in _format_dict.values()
+
+    if text:
+        source = zapi.createObject(None, format, text)
+        renderer = zapi.getView(source, '', TestRequest())
+        return renderer.render()
+    else:
+        return u''

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/utilitymodule/browser.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/utilitymodule/browser.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/utilitymodule/browser.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -90,7 +90,7 @@
           >>> class Foo(object):
           ...     pass
 
-          >>> class Bar:
+          >>> class Bar(object):
           ...     pass
 
           >>> details = UtilityDetails()

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/viewmodule/tests.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/viewmodule/tests.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/viewmodule/tests.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -31,7 +31,7 @@
 class IFoo(Interface):
     pass
 
-class FooView:
+class FooView(object):
     pass
 
 def setUp():

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/zcmlmodule/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/zcmlmodule/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/zcmlmodule/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -20,6 +20,8 @@
 
 $Id$
 """
+__docformat__ = 'restructuredtext'
+
 import os
 
 from zope.configuration import docutils, xmlconfig
@@ -64,7 +66,7 @@
     r"""Simple namespace object for the ZCML Documentation Module.
 
     The namespace manages a particular ZCML namespace. The object always
-    expects the parent to be a 'ZCMLModule' instance.
+    expects the parent to be a `ZCMLModule` instance.
 
     Demonstration::
 
@@ -157,7 +159,7 @@
 class ZCMLModule(ReadContainerBase):
     r"""Represent the Documentation of all Interfaces.
 
-    This documentation is implemented using a simply 'IReadContainer'. The
+    This documentation is implemented using a simple `IReadContainer`. The
     items of the container are all the interfaces listed in the closest
     interface service and above.
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/zcmlmodule/browser.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/zcmlmodule/browser.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/zcmlmodule/browser.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,6 +15,8 @@
 
 $Id$
 """
+__docformat__ = 'restructuredtext'
+
 from zope.proxy import removeAllProxies
 from zope.configuration.xmlconfig import ParserInfo
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/runtimeinfo.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/runtimeinfo.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/runtimeinfo.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -19,7 +19,7 @@
 
 from zope.app.i18n import ZopeMessageIDFactory as _
 
-class RuntimeInfoView:
+class RuntimeInfoView(object):
 
     def runtimeInfo(self):
         formatted = {}  # will contain formatted runtime information
@@ -31,7 +31,8 @@
             formatted['PythonPath'] = runtime_info.getPythonPath()
             formatted['SystemPlatform'] = runtime_info.getSystemPlatform()
             formatted['PreferredEncoding'] = runtime_info.getPreferredEncoding()
-            formatted['FileSystemEncoding'] = runtime_info.getFileSystemEncoding()
+            formatted['FileSystemEncoding'] = \
+                                            runtime_info.getFileSystemEncoding()
             formatted['CommandLine'] = runtime_info.getCommandLine()
             formatted['ProcessId'] = runtime_info.getProcessId()
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/servercontrol.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/servercontrol.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/servercontrol.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -20,7 +20,7 @@
 
 from zope.app.i18n import ZopeMessageIDFactory as _
 
-class ServerControlView:
+class ServerControlView(object):
 
     def serverControl(self):
         return zapi.getUtility(IServerControl)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/translationdomaincontrol.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/translationdomaincontrol.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/translationdomaincontrol.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-""" Server Control View
+"""Server Control View
 
 $Id$
 """
@@ -19,7 +19,7 @@
 from zope.app import zapi
 from zope.app.i18n import ZopeMessageIDFactory as _
 
-class TranslationDomainControlView:
+class TranslationDomainControlView(object):
 
     def getCatalogsInfo(self):
         info = []

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/zodbcontrol.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/zodbcontrol.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/browser/zodbcontrol.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -18,7 +18,7 @@
 from ZODB.FileStorage.FileStorage import FileStorageError
 from zope.app.i18n import ZopeMessageIDFactory as _
 
-class ZODBControlView:
+class ZODBControlView(object):
 
     def getName(self):
         """Get the database name."""

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/tests/test_runtimeinfo.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/tests/test_runtimeinfo.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/applicationcontrol/tests/test_runtimeinfo.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -33,7 +33,7 @@
 time_tolerance = 2
 stupid_version_string = "3085t0klvn93850voids"
 
-class TestZopeVersion:
+class TestZopeVersion(object):
     """A fallback implementation for the ZopeVersion utility."""
 
     implements(IZopeVersion)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/appsetup/appsetup.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/appsetup/appsetup.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/appsetup/appsetup.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -24,7 +24,7 @@
 
     database = zope.interface.Attribute("The main database.")
 
-class DatabaseOpened:
+class DatabaseOpened(object):
     zope.interface.implements(IDatabaseOpenedEvent)
 
     def __init__(self, database):
@@ -33,10 +33,10 @@
 class IProcessStartingEvent(zope.interface.Interface):
     """The application server process is starting."""
 
-class ProcessStarting:
+class ProcessStarting(object):
     zope.interface.implements(IProcessStartingEvent)
 
-class SystemConfigurationParticipation:
+class SystemConfigurationParticipation(object):
     zope.interface.implements(IParticipation)
 
     principal = system_user

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/appsetup/bootstrap.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/appsetup/bootstrap.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/appsetup/bootstrap.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -44,7 +44,7 @@
 from zope.app.principalannotation import PrincipalAnnotationService
 
 
-class BootstrapSubscriberBase:
+class BootstrapSubscriberBase(object):
     """A startup event subscriber base class.
 
     Ensures the root folder and the service manager are created.

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/basicskin/tests/sampleinterfaces.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/basicskin/tests/sampleinterfaces.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/basicskin/tests/sampleinterfaces.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,16 +11,15 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Fake Traverser with interfaces.
 
 $Id$
 """
-
 from zope.interface import Interface, implements
 
 from zope.app.traversing.interfaces import ITraverser
 
-class FakeTraverser:
+class FakeTraverser(object):
 
     implements(ITraverser)
 
@@ -33,8 +32,8 @@
 class I1(Interface): pass
 class I2(I1): pass
 
-class O1:
+class O1(object):
     implements(I1)
 
-class O2:
+class O2(object):
     implements(I2)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/basicskin/tests/test_standardmacros.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/basicskin/tests/test_standardmacros.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/basicskin/tests/test_standardmacros.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -25,7 +25,7 @@
 from zope.app.basicskin.standardmacros import Macros
 
 
-class ViewWithMacros:
+class ViewWithMacros(object):
     implements(IBrowserView)
 
     def __init__(self, context, request):
@@ -42,7 +42,7 @@
 
 class I(Interface): pass
 
-class C:
+class C(object):
     implements(I)
 
 class page1(ViewWithMacros):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/cache/annotationcacheable.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/cache/annotationcacheable.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/cache/annotationcacheable.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -23,7 +23,7 @@
 
 annotation_key = 'zope.app.cache.CacheManager'
 
-class AnnotationCacheable:
+class AnnotationCacheable(object):
     """Stores cache information in object's annotations."""
 
     implements(ICacheable)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/cache/ram.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/cache/ram.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/cache/ram.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -145,7 +145,7 @@
     _buildKey = staticmethod(_buildKey)
 
 
-class Storage:
+class Storage(object):
     """Storage.
 
     Storage keeps the count and does the aging and cleanup of cached

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_annotationcacheable.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_annotationcacheable.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_annotationcacheable.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -25,11 +25,11 @@
 from zope.app.cache.annotationcacheable import AnnotationCacheable
 from zope.app.cache.interfaces import ICache
 
-class ObjectStub:
+class ObjectStub(object):
     implements(IAttributeAnnotatable)
 
 
-class CacheStub:
+class CacheStub(object):
     implements(ICache)
     def __init__(self):
         self.invalidated = []

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_caching.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_caching.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_caching.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -27,10 +27,10 @@
 from zope.app.cache.caching import getCacheForObject
 from zope.app.cache.annotationcacheable import AnnotationCacheable
 
-class ObjectStub:
+class ObjectStub(object):
     implements(IAttributeAnnotatable)
 
-class CacheStub:
+class CacheStub(object):
     implements(ICache)
 
 class Test(PlacelessSetup, unittest.TestCase):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_icache.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_icache.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_icache.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,13 +15,12 @@
 
 $Id$
 """
-
 from unittest import TestSuite, main
 from zope.interface.verify import verifyObject
 from zope.app.cache.interfaces import ICache
 
 
-class BaseICacheTest:
+class BaseICacheTest(object):
     """Base class for ICache unit tests.  Subclasses should provide a
     _Test__new() method that returns a new empty cache object.
     """

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_ramcache.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_ramcache.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/cache/tests/test_ramcache.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -28,7 +28,7 @@
 from zope.app.traversing.interfaces import IPhysicallyLocatable
 from zope.app.tests.placelesssetup import PlacelessSetup
 
-class Locatable:
+class Locatable(object):
 
     __name__ = __parent__ = None
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/contentdirective.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/contentdirective.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/contentdirective.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -42,7 +42,7 @@
     method=getattr(zapi.getGlobalService(serviceName), methodName)
     method(*args, **kwargs)
 
-class ContentDirective:
+class ContentDirective(object):
 
     def __init__(self, _context, class_):
         self.__id = dottedName(class_)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/interface.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/interface.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/interface.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,11 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Interface utility functions
+
 $Id$
 """
-__metaclass__ = type
-
 from zope.component.exceptions import ComponentLookupError
 from zope.interface import directlyProvides
 from zope.interface.interfaces import IInterface

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/adapter.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/adapter.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/adapter.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -31,7 +31,7 @@
     pass
 
 
-class Adapter:
+class Adapter(object):
     def __init__(self, *args):
         self.context = args
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/exampleclass.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/exampleclass.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/exampleclass.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,9 +11,13 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
+"""Example test classes
+
+$Id$
+"""
 from zope.interface import Interface
 
-class ExampleClass:
+class ExampleClass(object):
     pass
 
 class IExample(Interface):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/factory.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/factory.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/factory.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Factory tests.
 
 $Id$
 """
@@ -25,14 +25,14 @@
 class IFoo(Interface):
     """an even more dummy interface just for testing """
 
-class X:
+class X(object):
     implements(IX)
     def __init__(self, *args, **kwargs):
         self.args=args
         self.kwargs=kwargs
 
 
-class ClassFactoryWrapper:
+class ClassFactoryWrapper(object):
     implements(IFactory)
     def __init__(self, klass):
         self.__klass=klass

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/service.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/service.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/service.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,12 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Service stub for testing
 
 $Id$
 """
-__metaclass__ = type # All classes are new style when run with Python 2.2+
-
 from zope.interface import Interface, implements
 
 class IFooService(Interface):
@@ -24,7 +22,7 @@
     def foo(): pass
     def foobar(): pass
 
-class FooService:
+class FooService(object):
 
     implements(IFooService)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_contentdirective.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_contentdirective.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_contentdirective.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -34,7 +34,7 @@
 from zope.app.component.tests.exampleclass import IExample, IExample2
 
 
-class ParticipationStub:
+class ParticipationStub(object):
 
     def __init__(self, principal):
         self.principal = principal

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_directives.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_directives.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_directives.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -44,7 +44,7 @@
 
 atre = re.compile(' at [0-9a-fA-Fx]+')
 
-class Context:
+class Context(object):
     actions = ()
     
     def action(self, discriminator, callable, args):
@@ -86,7 +86,7 @@
    %s
    </configure>"""
 
-class Ob:
+class Ob(object):
     implements(IC)
 
 def definePermissions():

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_factory.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_factory.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_factory.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -31,7 +31,7 @@
 from zope.app.component.tests.exampleclass import ExampleClass
 
 
-class ParticipationStub:
+class ParticipationStub(object):
 
     def __init__(self, principal):
         self.principal = principal

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_localservice.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_localservice.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_localservice.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,10 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Test local service code
+
 $Id$
 """
-
 import unittest
 from zope.component import getGlobalServices
 from zope.app.component.hooks import getServices_hook
@@ -30,7 +30,7 @@
 from zope.app.tests import ztapi
 from zope.app.component.hooks import setSite, getSite
 
-class ServiceManager:
+class ServiceManager(object):
     implements(ISiteManager)
 
     def __init__(self):
@@ -41,7 +41,7 @@
             return self.dummy_service
         raise ComponentLookupError(name)
 
-class Folder:
+class Folder(object):
     implements(IPossibleSite)
 
     sm = None
@@ -54,7 +54,7 @@
         sm.__parent__ = self
         directlyProvides(self, ISite, directlyProvidedBy(self))
 
-class Package:
+class Package(object):
     pass
 
 class Root(Folder):
@@ -62,7 +62,7 @@
     def getSiteManager(self):
         return getGlobalServices()
 
-class ServiceServiceStub:
+class ServiceServiceStub(object):
     implements(IServiceService)
 
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_requirepermissions.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_requirepermissions.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_requirepermissions.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -52,7 +52,7 @@
         super(Test, self).setUp()
         defineDirectives()
 
-        class B:
+        class B(object):
             def m1(self):
                 return "m1"
             def m2(self):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_servicedirective.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_servicedirective.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_servicedirective.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -30,7 +30,7 @@
 from zope.app.tests.placelesssetup import PlacelessSetup
 
 
-class ParticipationStub:
+class ParticipationStub(object):
 
     def __init__(self, principal):
         self.principal = principal

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_servicemanagercontainer.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_servicemanagercontainer.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/test_servicemanagercontainer.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -22,7 +22,7 @@
 from zope.interface.verify import verifyObject
 from zope.interface import implements
 
-class ServiceManager:
+class ServiceManager(object):
 
     implements(IServiceService)
 
@@ -41,7 +41,7 @@
     #
     ############################################################
 
-class BaseTestServiceManagerContainer:
+class BaseTestServiceManagerContainer(object):
 
     """This test is for objects that don't have service managers by
     default and that always give back the service manager they were

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/views.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/views.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/tests/views.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,11 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Views test.
 
-Revision information: $Id$
+$Id$
 """
-
 from zope.interface import Interface, implements
 
 class IR(Interface):
@@ -27,7 +26,7 @@
 
 class IC(Interface): pass
 
-class V1:
+class V1(object):
     implements(IV)
 
     def __init__(self, context, request):
@@ -44,7 +43,7 @@
     def index(self):
         return 'ZMI here'
 
-class R1:
+class R1(object):
 
     def index(self):
         return 'R1 here'

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/tests/test_adding.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/tests/test_adding.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/tests/test_adding.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -41,7 +41,7 @@
 from zope.app.container.browser.adding import Adding
 from zope.app.container.sample import SampleContainer
 
-class Root:
+class Root(object):
     implements(IContainmentRoot)
 
 class Container(SampleContainer):
@@ -53,10 +53,10 @@
         return 'been there, done that'
 
 
-class Content:
+class Content(object):
     pass
 
-class Factory:
+class Factory(object):
 
     implements(IFactory)
 
@@ -211,10 +211,10 @@
     >>> menuService.menuItem('zope.app.container.add', IAdding, '', 'item4',
     ...                      None, extra={'factory': 'f2'})
 
-    >>> class F1:
+    >>> class F1(object):
     ...     pass
 
-    >>> class F2:
+    >>> class F2(object):
     ...     pass
 
     >>> def pre(container, name, object):
@@ -232,7 +232,7 @@
     ...     __setitem__.precondition = pre
 
 
-    >>> class Container:
+    >>> class Container(object):
     ...     zope.interface.implements(IContainer)
 
     >>> from zope.component.factory import Factory
@@ -266,10 +266,10 @@
     >>> from zope.app.container.sample import SampleContainer
     >>> from zope.app.container.browser.adding import Adding
 
-    >>> class F1:
+    >>> class F1(object):
     ...     pass
 
-    >>> class F2:
+    >>> class F2(object):
     ...     pass
 
     >>> def pre(container, name, object):
@@ -335,7 +335,7 @@
 
     Class implements IContainerNamesContainer
     
-    >>> class FakeContainer:
+    >>> class FakeContainer(object):
     ...    zope.interface.implements(IContainerNamesContainer)
 
     nameAllowed returns False if the class imlements
@@ -347,7 +347,7 @@
 
     Fake class without IContainerNamesContainer
     
-    >>> class Fake:
+    >>> class Fake(object):
     ...    pass
 
     nameAllowed returns True if the class
@@ -364,7 +364,7 @@
 def test_chooseName():
     """If user don't enter name, pick one
     
-    >>> class MyContainer:
+    >>> class MyContainer(object):
     ...    zope.interface.implements(INameChooser, IContainer)
     ...    def chooseName(self, name, object):
     ...        return 'pickone'
@@ -409,10 +409,10 @@
     >>> menuService.menuItem('zope.app.container.add', IAdding, '', 'item3',
     ...                      None, extra={'factory': 'f1'})
 
-    >>> class F1:
+    >>> class F1(object):
     ...     pass
 
-    >>> class F2:
+    >>> class F2(object):
     ...     pass
 
     >>> def pre(container, name, object):
@@ -430,7 +430,7 @@
     ...     __setitem__.precondition = pre
 
 
-    >>> class Container:
+    >>> class Container(object):
     ...     zope.interface.implements(IContainer)
 
     >>> from zope.component.factory import Factory
@@ -479,10 +479,10 @@
     >>> menuService.menu('zope.app.container.add', '')
     >>> menuService.menuItem('zope.app.container.add', None, '', 'item3',
     ...                      None, extra={'factory': ''})
-    >>> class F1:
+    >>> class F1(object):
     ...     pass
 
-    >>> class F2:
+    >>> class F2(object):
     ...     pass
 
     >>> def pre(container, name, object):
@@ -500,7 +500,7 @@
     ...     __setitem__.precondition = pre
 
 
-    >>> class Container:
+    >>> class Container(object):
     ...     zope.interface.implements(IContainer)
 
     >>> from zope.component.factory import Factory
@@ -549,10 +549,10 @@
     >>> menuService.menuItem('zope.app.container.add', None, '', 'item3',
     ...                      None, extra={'factory': ''})
     
-    >>> class F1:
+    >>> class F1(object):
     ...     pass
 
-    >>> class F2:
+    >>> class F2(object):
     ...     pass
 
     >>> def pre(container, name, object):
@@ -570,7 +570,7 @@
     ...     __setitem__.precondition = pre
 
 
-    >>> class Container:
+    >>> class Container(object):
     ...     zope.interface.implements(IContainer, IContainerNamesContainer)
 
     >>> from zope.app.container.browser.adding import Adding

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/tests/test_contents.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/tests/test_contents.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/tests/test_contents.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -93,7 +93,7 @@
 
         from datetime import datetime
         from zope.app.dublincore.interfaces import IZopeDublinCore
-        class FauxDCAdapter:
+        class FauxDCAdapter(object):
             implements(IZopeDublinCore)
 
             def __init__(self, context):
@@ -146,11 +146,11 @@
 class IDocument(Interface):
     pass
 
-class Document:
+class Document(object):
     implements(IDocument)
 
 
-class Principal:
+class Principal(object):
     
     id = 'bob'
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/tests/test_directive.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/tests/test_directive.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/browser/tests/test_directive.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -26,7 +26,7 @@
 
 atre = re.compile(' at [0-9a-fA-Fx]+')
 
-class Context:
+class Context(object):
     actions = ()
     
     def action(self, discriminator, callable, args):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/constraints.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/constraints.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/constraints.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -34,7 +34,7 @@
    ...     __setitem__.precondition = preNoZ
 
    >>> from zope.app.container.interfaces import IContainer
-   >>> class C1:
+   >>> class C1(object):
    ...     zope.interface.implements(I1, IContainer)
    ...     def __repr__(self):
    ...         return 'C1'
@@ -66,7 +66,7 @@
    >>> class I2(zope.interface.Interface):
    ...     __parent__ = zope.schema.Field(constraint = con1)
 
-   >>> class O:
+   >>> class O(object):
    ...     zope.interface.implements(I2)
 
    if the constraint isn't satisfied, we'll get a validation error when we
@@ -90,7 +90,7 @@
    >>> class I2(zope.interface.Interface):
    ...     __parent__ = zope.schema.Field(constraint = con1)
 
-   >>> class O:
+   >>> class O(object):
    ...     zope.interface.implements(I2)
 
    >>> checkObject(c1, "bob", O())
@@ -106,7 +106,7 @@
    whether an object produced by a factory can be added.  To do this, we
    use checkFactory:
 
-   >>> class Factory:
+   >>> class Factory(object):
    ...     def __call__(self):
    ...         return O()
    ...     def getInterfaces(self):
@@ -230,7 +230,7 @@
         Return a boolean value.
         """
 
-class ItemTypePrecondition:
+class ItemTypePrecondition(object):
     """Specify a __setitem__ precondition that restricts item types
 
     Items must be one of the given types.  
@@ -243,11 +243,11 @@
 
     >>> precondition = ItemTypePrecondition(I1, I2)
 
-    >>> class Ob:
+    >>> class Ob(object):
     ...     pass
     >>> ob = Ob()
 
-    >>> class Factory:
+    >>> class Factory(object):
     ...     def __call__(self):
     ...         return Ob()
     ...     def getInterfaces(self):
@@ -297,14 +297,14 @@
         raise InvalidItemType(container, factory, self.types)
 
 
-class ContainerTypesConstraint:
+class ContainerTypesConstraint(object):
     """Constrain a container to be one of a number of types
 
     >>> class I1(zope.interface.Interface):
     ...     pass
     >>> class I2(zope.interface.Interface):
     ...     pass
-    >>> class Ob:
+    >>> class Ob(object):
     ...     pass
     >>> ob = Ob()
     >>> constraint = ContainerTypesConstraint(I1, I2)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/contained.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/contained.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/contained.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -95,7 +95,7 @@
        Suppose, for example, that we define some location objects.
 
 
-         >>> class L:
+         >>> class L(object):
          ...     zope.interface.implements(ILocation)
          ...     def __init__(self, name):
          ...         self.__name__ = name
@@ -182,7 +182,7 @@
 
        Obviously, this is the container values:
 
-         >>> class MyContainer:
+         >>> class MyContainer(object):
          ...     def __init__(self, **data):
          ...         self.data = data
          ...     def __iter__(self):
@@ -673,7 +673,7 @@
     object.__name__ = None
     modified(container)
 
-class NameChooser:
+class NameChooser(object):
 
     zope.interface.implements(INameChooser)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/size.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/size.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/size.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -20,10 +20,8 @@
 from zope.app.size.interfaces import ISized
 from zope.interface import implements
 
-__metaclass__ = type
+class ContainerSized(object):
 
-class ContainerSized:
-
     implements(ISized)
 
     def __init__(self, container):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/placelesssetup.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/placelesssetup.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/placelesssetup.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -19,7 +19,7 @@
 from zope.app.container.interfaces import IWriteContainer, INameChooser
 from zope.app.container.contained import NameChooser
 
-class PlacelessSetup:
+class PlacelessSetup(object):
 
     def setUp(self):
         ztapi.provideAdapter(IWriteContainer, INameChooser, NameChooser)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_containertraversable.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_containertraversable.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_containertraversable.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,11 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Container Traverser tests.
 
 $Id$
 """
-
 import unittest
 from zope.app.container.traversal import ContainerTraversable
 from zope.exceptions import NotFoundError
@@ -24,7 +23,7 @@
 from zope.interface import implements
 
 
-class Container:
+class Container(object):
 
     implements(IContainer)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_containertraverser.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_containertraverser.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_containertraverser.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -25,7 +25,7 @@
 from zope.interface import implements
 from zope.publisher.interfaces.browser import IBrowserRequest 
 
-class TestContainer:
+class TestContainer(object):
     implements(IReadContainer)
 
     def __init__(self, **kw):
@@ -36,7 +36,7 @@
         return getattr(self, name, default)
 
 
-class View:
+class View(object):
     def __init__(self, context, request):
         self.context = context
         self.request = request

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_directory.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_directory.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_directory.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,11 +15,10 @@
 
 $Id$
 """
-
 from unittest import TestCase, TestSuite, main, makeSuite
 import zope.app.container.directory
 
-class Directory:
+class Directory(object):
     pass
  
 class Test(TestCase):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_find.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_find.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_find.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,17 +11,17 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Find functionality tests
+
 $Id$
 """
-
 from unittest import TestCase, main, makeSuite
 from zope.app.container.interfaces import IReadContainer
 from zope.app.container.interfaces import IObjectFindFilter
 from zope.app.container.find import FindAdapter, SimpleIdFindFilter
 from zope.interface import implements
 
-class FakeContainer:
+class FakeContainer(object):
     implements(IReadContainer)
 
     def __init__(self, id, objects):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_objectcopier.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_objectcopier.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_objectcopier.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,12 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
-Revision information:
+"""Object Copier Tests
 
 $Id$
 """
-
 from unittest import TestCase, TestSuite, main, makeSuite
 from zope.app.traversing.api import traverse
 from zope.app.site.tests.placefulsetup import PlacefulSetup
@@ -24,7 +22,7 @@
 from zope.app.copypastemove.interfaces import IObjectCopier
 from zope.app.copypastemove import ObjectCopier
 
-class File:
+class File(object):
     pass
 
 class ObjectCopierTest(PlacefulSetup, TestCase):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_objectmover.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_objectmover.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_objectmover.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,10 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Object Mover Tests
+
 $Id$
 """
-
 from unittest import TestCase, TestSuite, main, makeSuite
 
 from zope.app.traversing.api import traverse
@@ -23,7 +23,7 @@
 from zope.app.copypastemove.interfaces import IObjectMover
 from zope.app.copypastemove import ObjectMover
 
-class File:
+class File(object):
     pass
 
 class ObjectMoverTest(PlacefulSetup, TestCase):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_size.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_size.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/tests/test_size.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,7 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Test container ISized adapter.
+
 $Id$
 """
 import unittest
@@ -20,7 +21,7 @@
 from zope.app.container.interfaces import IContainer
 from zope.interface import implements
 
-class DummyContainer:
+class DummyContainer(object):
 
     implements(IContainer)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/container/traversal.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/container/traversal.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/container/traversal.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -30,7 +30,7 @@
 # Note that the next two classes are included here because they
 # can be used for multiple view types.
 
-class ContainerTraverser:
+class ContainerTraverser(object):
     """A traverser that knows how to look up objects by name in a container."""
 
     implements(IBrowserPublisher, IXMLRPCPublisher)
@@ -79,7 +79,7 @@
 
 _marker = object()
 
-class ContainerTraversable:
+class ContainerTraversable(object):
     """Traverses containers via getattr and get."""
 
     implements(ITraversable)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/copypastemove/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/copypastemove/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/copypastemove/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -28,7 +28,7 @@
 from zope.app.container.interfaces import INameChooser
 from zope.app.container.constraints import checkObject
 
-class ObjectMover:
+class ObjectMover(object):
     """Adapter for moving objects between containers
 
     To use an object mover, pass a contained object to the class.
@@ -117,7 +117,7 @@
     ...     __setitem__.precondition = preNoZ
 
     >>> from zope.app.container.interfaces import IContainer
-    >>> class C1:
+    >>> class C1(object):
     ...     zope.interface.implements(I1, IContainer)
     ...     def __repr__(self):
     ...         return 'C1'
@@ -140,7 +140,7 @@
     >>> class I2(zope.interface.Interface):
     ...     __parent__ = zope.schema.Field(constraint = con1)
     ...
-    >>> class constrainedObject:
+    >>> class constrainedObject(object):
     ...     zope.interface.implements(I2)
     ...     def __init__(self):
     ...         self.__name__ = 'constrainedObject'
@@ -206,7 +206,7 @@
             return False
         return True
 
-class ObjectCopier:
+class ObjectCopier(object):
     """Adapter for copying objects between containers
 
     To use an object copier, pass a contained object to the class.
@@ -305,7 +305,7 @@
     ...     __setitem__.precondition = preNoZ
 
     >>> from zope.app.container.interfaces import IContainer
-    >>> class C1:
+    >>> class C1(object):
     ...     zope.interface.implements(I1, IContainer)
     ...     def __repr__(self):
     ...         return 'C1'
@@ -328,7 +328,7 @@
     >>> class I2(zope.interface.Interface):
     ...     __parent__ = zope.schema.Field(constraint = con1)
     ...
-    >>> class constrainedObject:
+    >>> class constrainedObject(object):
     ...     zope.interface.implements(I2)
     ...     def __init__(self):
     ...         self.__name__ = 'constrainedObject'
@@ -409,7 +409,7 @@
         return True
 
 
-class PrincipalClipboard:
+class PrincipalClipboard(object):
     '''Principal clipboard
 
     Clipboard information consists on tuples of

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/copypastemove/tests/test_rename.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/copypastemove/tests/test_rename.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/copypastemove/tests/test_rename.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -28,7 +28,7 @@
 from zope.app.copypastemove import ObjectMover
 from zope.app.copypastemove import rename
 
-class File:
+class File(object):
     pass
 
 class RenameTest(PlacefulSetup, TestCase):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/dav/adapter.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/dav/adapter.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/dav/adapter.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -25,7 +25,7 @@
 from zope.app.filerepresentation.interfaces import IReadDirectory
 from zope.app.size.interfaces import ISized
 
-class DAVSchemaAdapter:
+class DAVSchemaAdapter(object):
     """An adapter for all content objects that provides the basic DAV
     schema/namespace."""
     implements(IDAVSchema)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/dav/ftests/test_mkcol.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/dav/ftests/test_mkcol.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/dav/ftests/test_mkcol.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,28 +15,28 @@
 
 $Id$
 """
-
 import unittest
 
 from zope.app.dav.ftests.dav import DAVTestCase
 from transaction import get_transaction
 
-__metaclass__ = type
-
 class TestMKCOL(DAVTestCase):
 
     def test_mkcol_not_folderish(self):
         self.addPage('/bar/pt', u'<span />')
         get_transaction().commit()
-        self.verifyStatus(path='/bar/pt/foo', body='', basic='mgr:mgrpw', expected=404)
+        self.verifyStatus(path='/bar/pt/foo', body='', basic='mgr:mgrpw',
+                          expected=404)
 
     def test_mkcol_not_folderish_existing(self):
         self.addPage('/bar/pt', u'<span />')
         get_transaction().commit()
-        self.verifyStatus(path='/bar/pt', body='', basic='mgr:mgrpw', expected=405)
+        self.verifyStatus(path='/bar/pt', body='', basic='mgr:mgrpw',
+                          expected=405)
 
     def test_mkcol_not_existing(self):
-        self.verifyStatus(path='/mkcol_test', body='', basic='mgr:mgrpw', expected=201)
+        self.verifyStatus(path='/mkcol_test', body='', basic='mgr:mgrpw',
+                          expected=201)
 
     def test_mkcol_parent_not_existing(self):
         self.verifyStatus(path='/bar/mkcol_test', body='', basic='mgr:mgrpw',
@@ -49,7 +49,7 @@
                           expected=405)
 
     def test_mkcol_with_body(self):
-        self.verifyStatus(path='/mkcol_test', body='bla', basic='mgr:mgrpw', \
+        self.verifyStatus(path='/mkcol_test', body='bla', basic='mgr:mgrpw',
                           expected=415)
 
     def verifyStatus(self, path, body, basic, expected=201):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/dav/tests/test_mkcol.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/dav/tests/test_mkcol.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/dav/tests/test_mkcol.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,8 +15,6 @@
 
 $Id$
 """
-__metaclass__ = type
-
 from unittest import TestCase, TestSuite, main, makeSuite
 from zope.app.tests import ztapi
 from zope.app.traversing.api import traverse

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/debugskin/exceptions.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/debugskin/exceptions.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/debugskin/exceptions.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -20,10 +20,7 @@
 
 from zope.interface.common.interfaces import IException
 
-__metaclass__ = type
-
-
-class ExceptionDebugView:
+class ExceptionDebugView(object):
     """ Render exceptions for debugging."""
     __used_for__ = IException
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/decorator.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/decorator.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/decorator.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -45,7 +45,7 @@
     >>> class D2(Decorator):
     ...   implements(I2)
 
-    >>> class X:
+    >>> class X(object):
     ...   implements(I3)
 
     >>> x = X()

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/dependable/tests.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/dependable/tests.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/dependable/tests.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,12 +15,11 @@
 
 $Id$
 """
-
 from unittest import TestCase, TestSuite, main, makeSuite
 from zope.app.annotation.attribute import AttributeAnnotations
 from zope.app.tests.placelesssetup import PlacelessSetup
 
-class C:
+class C(object):
     pass
 
 class Test(PlacelessSetup, TestCase):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/dtmlpage/browser.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/dtmlpage/browser.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/dtmlpage/browser.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,10 +15,8 @@
 
 $Id$
 """
-__metaclass__ = type
+class DTMLPageEval(object):
 
-class DTMLPageEval:
-
     def index(self, REQUEST=None, **kw):
         """Call a Page Template"""
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/dtmlpage/tests/test_dtmlpageeval.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/dtmlpage/tests/test_dtmlpageeval.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/dtmlpage/tests/test_dtmlpageeval.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -23,7 +23,7 @@
 
     def test(self):
 
-        class Template:
+        class Template(object):
             def render(self, request, **kw):
                 self.called = request, kw
                 request.response.setHeader('content-type', self.content_type)
@@ -31,7 +31,7 @@
 
             content_type = 'text/x-test'
 
-        class Folder:
+        class Folder(object):
             name='zope'
 
         folder = Folder()

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/dublincore/tests/test_creatorannotator.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/dublincore/tests/test_creatorannotator.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/dublincore/tests/test_creatorannotator.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -30,7 +30,7 @@
 class IDummyContent(Interface):
     pass
 
-class DummyEvent:
+class DummyEvent(object):
     pass
 
 class DummyDCAdapter(object):
@@ -50,13 +50,13 @@
         self.creators = context.creators
 
 
-class DummyDublinCore:
+class DummyDublinCore(object):
 
     implements(IDummyContent)
 
     creators = ()
 
-class DummyPrincipal:
+class DummyPrincipal(object):
     implements(IPrincipal)
 
     def __init__(self, id, title, description):
@@ -64,7 +64,7 @@
         self.title = title
         self.description = description
 
-class DummyRequest:
+class DummyRequest(object):
 
     def __init__(self, principal):
         self.principal = principal

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/dublincore/xmlmetadata.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/dublincore/xmlmetadata.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/dublincore/xmlmetadata.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -37,7 +37,7 @@
     dcterms.XSI_NS:     "xsi",
     }
 
-class NamespaceTracker:
+class NamespaceTracker(object):
     def __init__(self, mapping=None):
         self._mapping = {}
         self._used = {}
@@ -135,7 +135,7 @@
     return parser, ch
 
 
-class PrefixManager:
+class PrefixManager(object):
     # We don't use this other than in the DublinCoreHandler, but it's
     # entirely general so we'll separate it out for now.
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/dublincore/zopedublincore.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/dublincore/zopedublincore.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/dublincore/zopedublincore.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,9 +15,6 @@
 
 $Id$
 """
-
-__metaclass__ = type
-
 from datetime import datetime
 
 from zope.interface import implements
@@ -25,7 +22,7 @@
 from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.datetimeutils import parseDatetimetz
 
-class SimpleProperty:
+class SimpleProperty(object):
 
     def __init__(self, name):
         self.__name__ = name
@@ -92,7 +89,7 @@
         inst._changed()
         inst._mapping[self.__name__] = value
 
-class ZopeDublinCore:
+class ZopeDublinCore(object):
     """Zope Dublin Core Mixin
 
     Subclasses should define either _changed() or _p_changed.

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/errorservice/browser/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/errorservice/browser/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/errorservice/browser/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -21,7 +21,7 @@
 from zope.app.servicenames import ErrorLogging
 from zope.app.errorservice.interfaces import ILocalErrorReportingService
 
-class EditErrorLog:
+class EditErrorLog(object):
     __used_for__ = ILocalErrorReportingService
 
     def updateProperties(self, keep_entries, copy_to_zlog=None,

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/errorservice/tests.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/errorservice/tests.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/errorservice/tests.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -23,7 +23,7 @@
 from zope.publisher.tests.httprequest import TestRequest
 
 
-class C1:
+class C1(object):
     def getAnErrorInfo(self):
         exc_info = None
         try:

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/event/dispatching.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/event/dispatching.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/event/dispatching.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -21,7 +21,7 @@
   >>> from zope.app.tests.placelesssetup import setUp, tearDown
   >>> setUp()
 
-  >>> class E1:
+  >>> class E1(object):
   ...     pass
 
   >>> class E2(E1):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/event/objectevent.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/event/objectevent.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/event/objectevent.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,9 +15,6 @@
 
 $Id$
 """
-
-__metaclass__ = type
-
 from zope.app.event.interfaces import IObjectEvent, IObjectCreatedEvent
 from zope.app.event.interfaces import IObjectModifiedEvent
 from zope.app.event.interfaces import IObjectCopiedEvent
@@ -29,7 +26,7 @@
 
 _marker = object()
 
-class ObjectEvent:
+class ObjectEvent(object):
     """Something has happened to an object"""
 
     implements(IObjectEvent)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/event/tests/placelesssetup.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/event/tests/placelesssetup.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/event/tests/placelesssetup.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,7 +15,6 @@
 
 $Id$
 """
-
 from zope.app.event.interfaces import IObjectEvent
 from zope.app.event.objectevent import objectEventNotify
 from zope.interface import implements
@@ -38,7 +37,7 @@
 def clearEvents():
     del events[:]
 
-class PlacelessSetup:
+class PlacelessSetup(object):
 
     def setUp(self):
         clearEvents()

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/exception/browser/tests/test_unauthorized.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/exception/browser/tests/test_unauthorized.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/exception/browser/tests/test_unauthorized.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -31,7 +31,7 @@
         self.request = request
 
 
-class DummyPrincipal:
+class DummyPrincipal(object):
     implements(IPrincipal)  # this is a lie
 
     def __init__(self, id):
@@ -40,14 +40,14 @@
     def getId(self):
         return self.id
 
-class DummyAuthService:
+class DummyAuthService(object):
     implements(IAuthenticationService)  # this is a lie
 
     def unauthorized(self, principal_id, request):
         self.principal_id = principal_id
         self.request = request
 
-class DummyPrincipalSource:
+class DummyPrincipalSource(object):
     pass
 
 class Test(TestCase, PlacelessSetup):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/exception/browser/user.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/exception/browser/user.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/exception/browser/user.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -13,10 +13,8 @@
 
 $Id$
 """
-__metaclass__ = type
+class UserErrorView(object):
 
-class UserErrorView:
-
     def title(self):
         return self.context.__class__.__name__
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/file/image.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/file/image.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/file/image.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -27,8 +27,6 @@
 from file import File
 from interfaces import IImage
 
-__metaclass__ = type
-
 class Image(File):
     implements(IImage)
 
@@ -50,7 +48,7 @@
 
     data = property(File._getData, _setData)
 
-class ImageSized:
+class ImageSized(object):
     implements(ISized)
 
     def __init__(self, image):
@@ -75,7 +73,7 @@
         size.mapping = mapping 
         return size
 
-class FileFactory:
+class FileFactory(object):
 
     def __init__(self, context):
         self.context = context

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/file/tests/test_image.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/file/tests/test_image.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/file/tests/test_image.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -90,7 +90,7 @@
         FileWriteFile(file).write(content)
         self.assertEqual(file.data, content)
 
-class DummyImage:
+class DummyImage(object):
 
     def __init__(self, width, height, bytes):
         self.width = width

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/exception.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/exception.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/exception.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -22,7 +22,7 @@
 from zope.app.form.interfaces import IWidgetInputError
 from zope.app.form.browser.interfaces import IWidgetInputErrorView
 
-class WidgetInputErrorView:
+class WidgetInputErrorView(object):
     """Display an input error as a snippet of text."""
     implements(IWidgetInputErrorView)
 
@@ -35,7 +35,7 @@
         """Convert a widget input error to an html snippet
 
         >>> from zope.app.form.interfaces import WidgetInputError
-        >>> class TooSmallError:
+        >>> class TooSmallError(object):
         ...     def doc(self):
         ...         return "Foo input < 1"
         >>> err = WidgetInputError("foo", "Foo", TooSmallError())

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/ftests/test_objectwidget.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/ftests/test_objectwidget.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/ftests/test_objectwidget.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,10 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Test object widget
+
 $Id$
 """
-
 import unittest, doctest
 
 from zope.interface import Interface, implements
@@ -29,7 +29,7 @@
     name = TextLine()
     email = TextLine()
     
-class TestContact:
+class TestContact(object):
     implements(ITestContact)
 
 class Test(BrowserTestCase, support.VerifyResults):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_add.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_add.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_add.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -37,7 +37,7 @@
 from zope.app.form.browser.tests.test_editview import IFoo, IBar, Foo
 from zope.app.form.browser.tests.test_editview import FooBarAdapter
 
-class Context:
+class Context(object):
 
     def action(self, discriminator, callable, args=(), kw={}):
         self.last_action = (discriminator, callable, args, kw)
@@ -53,7 +53,7 @@
     extra1 = TextLine()
     extra2 = TextLine(required=False)
 
-class C:
+class C(object):
 
     implements(I)
 
@@ -64,7 +64,7 @@
     def getfoo(self): return self._foo
     def setfoo(self, v): self._foo = v
 
-class V:
+class V(object):
     name_widget = CustomWidgetFactory(Text)
     first_widget = CustomWidgetFactory(Text)
     last_widget = CustomWidgetFactory(Text)
@@ -74,11 +74,11 @@
     extra1_widget = CustomWidgetFactory(Text)
     extra2_widget = CustomWidgetFactory(Text)
 
-class FooV:
+class FooV(object):
     bar_widget = CustomWidgetFactory(Text)
 
 
-class SampleData:
+class SampleData(object):
 
     name = u"foo"
     first = u"bar"
@@ -178,7 +178,7 @@
 
     def test_create(self):
 
-        class Adding:
+        class Adding(object):
 
             implements(IAdding)
 
@@ -211,7 +211,7 @@
 
     def test_createAndAdd(self):
 
-        class Adding:
+        class Adding(object):
 
             implements(IAdding)
 
@@ -246,7 +246,7 @@
 
     def test_createAndAdd_w_adapter(self):
 
-        class Adding:
+        class Adding(object):
 
             implements(IAdding)
 
@@ -277,7 +277,7 @@
 
     def test_hooks(self):
 
-        class Adding:
+        class Adding(object):
             implements(IAdding)
 
         adding = Adding()

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_browserwidget.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_browserwidget.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_browserwidget.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,7 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Test Browser Widget
+
 $Id$
 """
 import os

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_directives.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_directives.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_directives.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -59,7 +59,7 @@
 
 class IC(Schema): pass
 
-class Ob:
+class Ob(object):
     implements(IC)
 
 ob = Ob()

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_editview.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_editview.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_editview.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -42,7 +42,7 @@
     schema = I
     object_factories = []
 
-class C:
+class C(object):
     implements(I)
     foo = u"c foo"
     bar = u"c bar"
@@ -60,7 +60,7 @@
 class IBar(Interface):
     bar = TextLine(title=u"Bar")
 
-class Foo:
+class Foo(object):
     implements(IFoo)
 
     foo = u'Foo foo'

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_editwizardview.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_editwizardview.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_editwizardview.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -41,7 +41,7 @@
     object_factories = []
     use_session = None
 
-class C:
+class C(object):
     implements(I)
     foo = u"c foo"
     bar = u"c bar"
@@ -59,7 +59,7 @@
 class IBar(Interface):
     bar = TextLine(title=u"Bar")
 
-class Foo:
+class Foo(object):
     implements(IFoo)
 
     foo = u'Foo foo'

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_multicheckboxwidget.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_multicheckboxwidget.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_multicheckboxwidget.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -41,7 +41,7 @@
                     description=desc,
                     value_type=Choice(values=[u'foo', u'bar'])
                     )
-        class TestObject:
+        class TestObject(object):
             implements(ITestContent)
 
         self.content = TestObject()

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_objectwidget.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_objectwidget.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_objectwidget.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -31,7 +31,7 @@
     name = TextLine()
     email = TextLine()
     
-class TestContact:
+class TestContact(object):
     implements(ITestContact)
 
 class ObjectWidgetTest(BrowserWidgetTest):
@@ -55,7 +55,7 @@
                     title=title,
                     description=desc
                     )
-        class TestObject:
+        class TestObject(object):
             implements(ITestContent)
 
         self.content = TestObject()

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_radiowidget.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_radiowidget.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_radiowidget.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -48,7 +48,7 @@
                     description=desc,
                     values=(u'foo', u'bar')
                     )
-        class TestObject:
+        class TestObject(object):
             implements(ITestContent)
 
         self.content = TestObject()

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_registrations.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_registrations.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_registrations.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -38,14 +38,14 @@
 class ISampleObject(interfaces.IField):
     pass
 
-class SampleObject:
+class SampleObject(object):
     implements(ISampleObject)
 
 class ISampleVocabulary(
     interfaces.IVocabularyTokenized, interfaces.IVocabulary):
     pass
 
-class SampleVocabularyQuery:
+class SampleVocabularyQuery(object):
     implements(interfaces.IIterableVocabularyQuery)
     def __init__(self, vocabulary):
         self.vocabulary = vocabulary    
@@ -64,7 +64,7 @@
     context = xmlconfig.file("tests/registerWidgets.zcml",
                              zope.app.form.browser)
 
-class Tests:
+class Tests(object):
     """Documents and tests widgets registration for specific field types.
     
     Standard Widgets

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_sequencewidget.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_sequencewidget.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_sequencewidget.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -47,7 +47,7 @@
                     title=title,
                     description=desc,
                     )
-        class TestObject:
+        class TestObject(object):
             implements(ITestContent)
 
         self.content = TestObject()

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_vocabularyquery.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_vocabularyquery.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/browser/tests/test_vocabularyquery.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -39,7 +39,7 @@
 
 _marker = object()
 
-class SampleContent:
+class SampleContent(object):
     """Stub content object used by makeField()."""
     def __init__(self, value):
         self.f = value
@@ -56,7 +56,7 @@
     """Specialized query type."""
 
 
-class SampleVocabularyQuery:
+class SampleVocabularyQuery(object):
     """Vocabulary query object which query views can be registered for."""
 
     implements(ISampleVocabularyQuery)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/tests/test_utility.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/tests/test_utility.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/tests/test_utility.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -56,7 +56,7 @@
     foo = Foo()
     bar = Bar()
     
-class Content:
+class Content(object):
     implements(IContent)
     foo = 'Foo'
     
@@ -93,7 +93,7 @@
     except Exception, e:
         return isinstance(e, exceptionType)
        
-class TestSetUpWidget:
+class TestSetUpWidget(object):
     
     def test_typical(self):
         """Documents and tests the typical uses of setUpWidget.
@@ -130,7 +130,7 @@
         to create a widget:
            
             >>> widget = FooWidget(IContent['foo'], request)
-            >>> class Factory:
+            >>> class Factory(object):
             ...     implements(IViewFactory)
             ...     def __call__(self, request, context):
             ...         return widget
@@ -182,7 +182,7 @@
         Similarly, if a view has a widget attribute that implements 
         IViewFactory, the object created by the factory must implement IWidget.
         
-            >>> class Factory:
+            >>> class Factory(object):
             ...     implements(IViewFactory)
             ...     def __call__(self, request, context):
             ...         return 'not a widget'
@@ -398,7 +398,7 @@
         >>> tearDown()
         """
 
-class TestSetUpWidgets:
+class TestSetUpWidgets(object):
     
     def test_typical(self):
         """Tests the typical use of setUpWidgets.
@@ -528,7 +528,7 @@
         >>> tearDown()
         """
         
-class TestFormSetUp:
+class TestFormSetUp(object):
     
     def test_setUpEditWidgets(self):
         """Documents and tests setUpEditWidgets.
@@ -659,7 +659,7 @@
         >>> tearDown()
         """
         
-class TestForms:
+class TestForms(object):
     
     def test_viewHasInput(self):
         """Tests viewHasInput.
@@ -764,7 +764,7 @@
         >>> tearDown()
         """
         
-class TestGetWidgetsData:
+class TestGetWidgetsData(object):
     
     def test_typical(self):
         """Documents and tests the typical use of getWidgetsData.

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/tests/test_widget.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/tests/test_widget.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/tests/test_widget.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -27,7 +27,7 @@
 from zope.app.form.interfaces import IWidget
 from zope.app.tests.placelesssetup import setUp, tearDown
 
-class TestContext:
+class TestContext(object):
     __name__ = 'Test'
     title = 'My Test Context'
     description = 'A test context.'
@@ -38,7 +38,7 @@
 context = TestContext()
 request = TestRequest()
 
-class TestWidget:
+class TestWidget(object):
     """Tests basic widget characteristics.
 
     Widget implements IWidget:
@@ -76,7 +76,7 @@
     browser widget will render the specified value in HTML.
     """
 
-class TestInputWidget:
+class TestInputWidget(object):
     """Tests the input widget mixin.
 
     InputWidget is a simple mixin that provides default implementations for
@@ -145,7 +145,7 @@
         True
     """
 
-class TestCustomWidgetFactory:
+class TestCustomWidgetFactory(object):
     """Tests the custom widget factory.
 
     Custom widgets can be created using a custom widget factory. Factories

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/form/utility.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/form/utility.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/form/utility.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -32,8 +32,6 @@
 
 $Id$
 """
-__metaclass__ = type
-
 from zope.schema import getFieldsInOrder
 from zope.app import zapi
 from zope.app.form.interfaces import IWidget

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/generations/browser/managers.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/generations/browser/managers.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/generations/browser/managers.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,7 +15,6 @@
 
 $Id$
 """
-
 from zope.app import zapi
 from zope.app.generations.interfaces import ISchemaManager
 from zope.app.generations.generations import generations_key, Context
@@ -23,7 +22,7 @@
 
 request_key_format = "evolve-app-%s"
 
-class Managers:
+class Managers(object):
 
     def __init__(self, context, request):
         self.context = context
@@ -49,7 +48,7 @@
 
            We also need to give it a publication with a database:
 
-             >>> class Publication:
+             >>> class Publication(object):
              ...     pass
 
              >>> request.setPublication(Publication())
@@ -197,7 +196,7 @@
 
            We also need to give it a publication with a database:
 
-             >>> class Publication:
+             >>> class Publication(object):
              ...     pass
 
              >>> request.setPublication(Publication())

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/generations/generations.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/generations/generations.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/generations/generations.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -98,7 +98,7 @@
 
         evolver.evolve(context)
 
-class Context:
+class Context(object):
     pass
 
 def findManagers():
@@ -120,7 +120,7 @@
     Here's an example (silly) schema manager:
 
       >>> from zope.app.generations.interfaces import ISchemaManager
-      >>> class FauxApp:
+      >>> class FauxApp(object):
       ...     zope.interface.implements(ISchemaManager)
       ...
       ...     erron = None # Raise an error is asked to evolve to this

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/http/delete.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/http/delete.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/http/delete.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -13,11 +13,9 @@
 
 $Id$
 """
-__metaclass__ = type
-
 from zope.app.filerepresentation.interfaces import IWriteDirectory
 
-class DELETE:
+class DELETE(object):
     """Delete handler for all objects
     """
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/http/options.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/http/options.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/http/options.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -13,8 +13,6 @@
 
 $Id$
 """
-__metaclass__ = type
-
 _allowed_methods = ['PUT', 'DELETE', 'CONNECT', \
            'OPTIONS', 'PATCH', 'PROPFIND', 'PROPPATCH', 'MKCOL', \
            'COPY', 'MOVE', 'LOCK', 'UNLOCK', 'TRACE']
@@ -22,7 +20,7 @@
 
 from zope.component import queryView
 
-class OPTIONS:
+class OPTIONS(object):
     """OPTIONS handler for all objects
     """
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/http/tests/test_delete.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/http/tests/test_delete.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/http/tests/test_delete.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,8 +15,6 @@
 
 $Id$
 """
-__metaclass__ = type
-
 from unittest import TestCase, TestSuite, makeSuite
 import zope.app.http.delete
 from zope.publisher.browser import TestRequest
@@ -25,7 +23,7 @@
 from zope.interface import implements
 from zope.app.container.contained import contained
 
-class Container:
+class Container(object):
 
     implements(IWriteDirectory, IFileFactory)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/http/tests/test_put.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/http/tests/test_put.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/http/tests/test_put.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,8 +15,6 @@
 
 $Id$
 """
-__metaclass__ = type
-
 from unittest import TestCase, TestSuite, makeSuite
 from StringIO import StringIO
 import zope.app.http.put
@@ -26,7 +24,7 @@
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.interface import implements
 
-class File:
+class File(object):
 
     implements(IWriteFile)
 
@@ -38,7 +36,7 @@
     def write(self, data):
         self.data = data
 
-class Container:
+class Container(object):
 
     implements(IWriteDirectory, IFileFactory)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/http/tests/test_traversers.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/http/tests/test_traversers.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/http/tests/test_traversers.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,18 +11,17 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Test HTTP-specific object traversers
+
 $Id$
 """
-__metaclass__ = type
-
 from unittest import TestCase, TestSuite, main, makeSuite
 from zope.exceptions import NotFoundError
 from zope.app.http.traversal import ContainerTraverser, ItemTraverser
 from zope.publisher.browser import TestRequest
 from zope.app.http.put import NullResource
 
-class Items:
+class Items(object):
 
     def __init__(self, data):
         self.data = data

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/http/traversal.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/http/traversal.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/http/traversal.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -16,15 +16,13 @@
 
 $Id$
 """
-__metaclass__ = type
-
 from zope.publisher.interfaces.http import IHTTPPublisher
 from zope.app.container.interfaces import ISimpleReadContainer, IItemContainer
 from zope.app.http.put import NullResource
 from zope.exceptions import NotFoundError
 from zope.interface import implements
 
-class ContainerTraverser:
+class ContainerTraverser(object):
     implements(IHTTPPublisher)
     __used_for__ = ISimpleReadContainer
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/filters.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/filters.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/filters.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -33,7 +33,7 @@
         return "state %s, line %s" % (self.state, self.lineno)
 
 
-class GettextExportFilter:
+class GettextExportFilter(object):
 
     implements(IMessageExportFilter)
     __used_for__ = ILocalTranslationDomain
@@ -70,7 +70,7 @@
 
 
 
-class GettextImportFilter:
+class GettextImportFilter(object):
 
     implements(IMessageImportFilter)
     __used_for__ = ILocalTranslationDomain

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/tests/placelesssetup.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/tests/placelesssetup.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/tests/placelesssetup.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -21,7 +21,7 @@
 from zope.publisher.browser import BrowserLanguages
 from zope.publisher.http import HTTPCharsets, IHTTPRequest
 
-class PlacelessSetup:
+class PlacelessSetup(object):
 
     def setUp(self):
         ztapi.provideAdapter(IHTTPRequest, IUserPreferredCharsets,

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/tests/test_filters.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/tests/test_filters.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/tests/test_filters.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -34,7 +34,7 @@
 from zope.app.i18n.filters import GettextImportFilter, GettextExportFilter
 
 
-class Environment:
+class Environment(object):
 
     implements(IUserPreferredLanguages)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/tests/test_messagecatalog.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/tests/test_messagecatalog.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/tests/test_messagecatalog.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -24,7 +24,7 @@
 
 
 # This is a mixin class -- don't add it to the suite
-class TestILocalMessageCatalog:
+class TestILocalMessageCatalog(object):
 
     # This should be overwritten by every class that inherits this test
     def _getMessageCatalog(self):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/i18nfile/browser/i18nfile.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/i18nfile/browser/i18nfile.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/i18nfile/browser/i18nfile.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,15 +15,12 @@
 
 $Id$
 """
-
 from urllib import quote
 from zope.i18n.negotiator import negotiator
 from zope.app.i18n import ZopeMessageIDFactory as _
 
-__metaclass__ = type
+class I18nFileView(object):
 
-class I18nFileView:
-
     def __call__(self):
         """Call the File
         """
@@ -41,7 +38,7 @@
         return self.context.getData(language)
 
 
-class I18nFileEdit:
+class I18nFileEdit(object):
 
     name = 'editForm'
     title = _('Edit Form')

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/interface/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/interface/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/interface/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -31,9 +31,9 @@
     >>> class J(Interface):
     ...     pass
     >>> directlyProvides(I, IContentType)
-    >>> class C:
+    >>> class C(object):
     ...     implements(I)
-    >>> class D:
+    >>> class D(object):
     ...     implements(J,I)
     >>> obj = C()
     >>> c1_ctype = queryType(obj, IContentType)
@@ -45,20 +45,20 @@
     ...     pass
     >>> class I3(Interface):
     ...     pass
-    >>> class C1:
+    >>> class C1(object):
     ...     implements(I1)
     >>> obj1 = C1()
     >>> c1_ctype = queryType(obj1, IContentType)
     >>> c1_ctype.__name__
     'I'
-    >>> class C2:
+    >>> class C2(object):
     ...     implements(I2)
     >>> obj2 = C2()
     >>> c2_ctype = queryType(obj2, IContentType)
     >>> c2_ctype.__name__
     'I'
 
-    >>> class C3:
+    >>> class C3(object):
     ...     implements(I3)
     >>> obj3 = C3()
 
@@ -71,7 +71,7 @@
     >>> class I4(I):
     ...     pass
     >>> directlyProvides(I4, IContentType)
-    >>> class C4:
+    >>> class C4(object):
     ...     implements(I4)
     >>> obj4 = C4()
     >>> c4_ctype = queryType(obj4, IContentType)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/introspector/tests/test_introspector.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/introspector/tests/test_introspector.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/introspector/tests/test_introspector.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -29,7 +29,7 @@
     def drool():
         """...drool..."""
 
-class BaseTestClass:
+class BaseTestClass(object):
     """This is stupid base class"""
     pass
 
@@ -57,7 +57,7 @@
     def two(param1, param2):
         """method two"""
 
-class WeirdClass:
+class WeirdClass(object):
     def namesAndDescriptions(self):
         return "indeed"
 
@@ -185,7 +185,7 @@
 
 class M4(I4): pass
 
-class Content:
+class Content(object):
     implements(I3)
 
     def one(self, a): pass

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/introspector/tests/test_introspectorview.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/introspector/tests/test_introspectorview.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/introspector/tests/test_introspectorview.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -65,7 +65,7 @@
     def test_update(self):
         from zope.app.introspector.browser import IntrospectorView
 
-        class Context:
+        class Context(object):
             implements(Interface)
 
         context = Context()

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/locales/extract.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/locales/extract.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/locales/extract.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -17,7 +17,6 @@
 
 $Id$
 """
-
 import os, sys, fnmatch
 import time
 import tokenize
@@ -27,15 +26,13 @@
 from interfaces import IPOTEntry, IPOTMaker, ITokenEater
 from zope.interface import implements
 
-__metaclass__ = type
-
 DEFAULT_CHARSET = 'UTF-8'
 DEFAULT_ENCODING = '8bit'
 
 pot_header = '''\
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003-2004 Zope Corporation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -60,7 +57,7 @@
 
 '''
 
-class POTEntry:
+class POTEntry(object):
     """This class represents a single message entry in the POT file.
     """
     implements(IPOTEntry)
@@ -89,7 +86,7 @@
     def __cmp__(self, other):
         return cmp(self.comments, other.comments)
 
-class POTMaker:
+class POTMaker(object):
     """This class inserts sets of strings into a POT file.
     """
     implements(IPOTMaker)
@@ -137,7 +134,7 @@
             
         file.close()
 
-class TokenEater:
+class TokenEater(object):
     """This is almost 100% taken from pygettext.py, except that I
     removed all option handling and output a dictionary.
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/location/pickling.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/location/pickling.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/location/pickling.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -81,7 +81,7 @@
 
     return unpickler.load()
 
-class CopyPersistent:
+class CopyPersistent(object):
     """Persistence hooks for copying locations
 
     See locationCopy above.
@@ -156,7 +156,7 @@
         return None
 
 
-class PathPersistent:
+class PathPersistent(object):
     """Persistence hooks for pickling locations
 
     See locationCopy above.

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/location/traversing.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/location/traversing.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/location/traversing.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -24,7 +24,7 @@
 from zope.app.location.location import Location
 
 
-class LocationPhysicallyLocatable:
+class LocationPhysicallyLocatable(object):
     """Provide location information for location objects
     """
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/mail/tests/test_directives.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/mail/tests/test_directives.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/mail/tests/test_directives.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -35,7 +35,7 @@
 import zope.app.mail.tests
 
 
-class MaildirStub:
+class MaildirStub(object):
 
     def __init__(self, path, create=False):
         self.path = path
@@ -47,7 +47,7 @@
     def newMessage(self):
         return None
 
-class Mailer:
+class Mailer(object):
     implements(IMailer)
 
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/mail/tests/test_mailer.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/mail/tests/test_mailer.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/mail/tests/test_mailer.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -57,7 +57,7 @@
     def setUp(self, port=None):
         from zope.app.mail.mailer import SMTPMailer
 
-        class SMTP:
+        class SMTP(object):
 
             def __init__(myself, h, p):
                 myself.hostname = h

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/observable/observable.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/observable/observable.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/observable/observable.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -22,7 +22,7 @@
 
 key = 'zope.app.observable'
 
-class ObservableAdapter:
+class ObservableAdapter(object):
 
     implements(IObservable)
     

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/observable/tests.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/observable/tests.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/observable/tests.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -31,7 +31,7 @@
     implements(IAnnotations)
 
 
-class DummyEvent:
+class DummyEvent(object):
     implements(IObjectAddedEvent)
     
 def test_handle():
@@ -111,7 +111,7 @@
 
     """
 
-class DummyObservable:
+class DummyObservable(object):
     implements(IObservable)
 
     def __init__(self):
@@ -120,7 +120,7 @@
     def notify(self, event):
         self.flag = True
 
-class DummyNotObservable:
+class DummyNotObservable(object):
     
     def __init__(self):
         self.flag = False
@@ -128,13 +128,13 @@
     def notify(self, event):
         self.flag = True
 
-class DummyObservableEvent:
+class DummyObservableEvent(object):
     implements(IObjectRemovedEvent, IObservable)
 
     def __init__(self):
         self.object = DummyObservable()
 
-class DummyNotObservableEvent:
+class DummyNotObservableEvent(object):
     implements(IObjectRemovedEvent)
     
     def __init__(self):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/onlinehelp/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/onlinehelp/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/onlinehelp/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -34,7 +34,7 @@
 help = OnlineHelp('Online Help', path)
 
 
-class helpNamespace:
+class helpNamespace(object):
     """ help namespace handler """
 
     def __init__(self, context, request=None):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/onlinehelp/tests/test_onlinehelp.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/onlinehelp/tests/test_onlinehelp.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/onlinehelp/tests/test_onlinehelp.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -30,10 +30,10 @@
 class I1(Interface):
     pass
 
-class Dummy1:
+class Dummy1(object):
     implements(I1)
 
-class Dummy2:
+class Dummy2(object):
     pass
 
 def testdir():

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/sample.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/sample.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/sample.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -17,5 +17,5 @@
 """
 from zope.app.pagetemplate import ViewPageTemplateFile
 
-class C:
+class C(object):
     index = ViewPageTemplateFile('test.pt')

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_directives.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_directives.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_directives.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,7 +15,6 @@
 
 $Id$
 """
-
 import unittest
 from cStringIO import StringIO
 
@@ -36,7 +35,7 @@
    </configure>"""
 
 
-class Handler:
+class Handler(object):
     pass
 
 class Test(PlacelessSetup, unittest.TestCase):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_simpleviewclass.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_simpleviewclass.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_simpleviewclass.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -17,7 +17,7 @@
 """
 import unittest
 
-class data: pass
+class data(object): pass
 
 class SimpleViewTestCase(unittest.TestCase):
 
@@ -37,7 +37,7 @@
     def test_WBases(self):
         from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
 
-        class C: pass
+        class C(object): pass
 
         SimpleTestView = SimpleViewClass('testsimpleviewclass.pt', bases=(C, ))
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_viewzpt.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_viewzpt.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_viewzpt.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -27,14 +27,14 @@
 class I1(Interface):
     pass
 
-class C1:
+class C1(object):
     implements(I1)
 
-class InstanceWithContext:
+class InstanceWithContext(object):
     def __init__(self, context):
         self.context = context
 
-class InstanceWithoutContext:
+class InstanceWithoutContext(object):
     pass
 
 
@@ -72,7 +72,7 @@
             type=IPresentationRequest,
             maker=ViewMaker)
 
-        class MyRequest:
+        class MyRequest(object):
             implements(IPresentationRequest)
             def getPresentationSkin(self):
                 return '' # default

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_zopepythonexpr.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_zopepythonexpr.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/test_zopepythonexpr.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -18,12 +18,12 @@
 from unittest import TestCase, main, makeSuite
 from zope.testing.cleanup import CleanUp
 
-class Engine:
+class Engine(object):
 
     def getTypes(self):
         return {}
 
-class Context:
+class Context(object):
 
     _engine = Engine()
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/testpackage/content.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/testpackage/content.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/tests/testpackage/content.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -17,7 +17,7 @@
 """
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 
-class Content:
+class Content(object):
     def getSomething(self):
         return 42
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/viewpagetemplatefile.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/viewpagetemplatefile.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/pagetemplate/viewpagetemplatefile.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,13 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
-See ViewPageTemplateFile
+"""File-based page templates that can be used as methods on views.
 
 $Id$
 """
-__metaclass__ = type # All classes are new style when run with Python 2.2+
-
 from zope.pagetemplate.pagetemplatefile import PageTemplateFile
 from zope.component import getView
 from zope.app.pagetemplate.engine import TrustedAppPT
@@ -50,7 +47,7 @@
     def __get__(self, instance, type):
         return BoundPageTemplate(self, instance)
 
-class ViewMapper:
+class ViewMapper(object):
     def __init__(self, ob, request):
         self.ob = ob
         self.request = request
@@ -59,7 +56,7 @@
         return getView(self.ob, name, self.request)
 
 
-class BoundPageTemplate:
+class BoundPageTemplate(object):
     def __init__(self, pt, ob):
         object.__setattr__(self, 'im_func', pt)
         object.__setattr__(self, 'im_self', ob)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/pluggableauth/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/pluggableauth/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/pluggableauth/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -193,7 +193,7 @@
     Define a stub for PluggableAuthenticationService
 
     >>> from zope.app.traversing.interfaces import IPhysicallyLocatable
-    >>> class PluggableAuthStub:
+    >>> class PluggableAuthStub(object):
     ...     implements(IPhysicallyLocatable)
     ...     def __init__(self, earmark=None):
     ...         self.earmark = earmark
@@ -570,7 +570,7 @@
         """
         return test_password == self.password
 
-class PrincipalAuthenticationView:
+class PrincipalAuthenticationView(object):
     """Simple basic authentication view
 
     This only handles requests which have basic auth credentials

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publication/httpfactory.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publication/httpfactory.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publication/httpfactory.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -26,11 +26,9 @@
 from zope.app.publication.browser import BrowserPublication
 from zope.app.publication.xmlrpc import XMLRPCPublication
 
-__metaclass__ = type
-
 _browser_methods = 'GET', 'POST', 'HEAD'
 
-class HTTPPublicationRequestFactory:
+class HTTPPublicationRequestFactory(object):
     implements(IPublicationRequestFactory)
 
     def __init__(self, db):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publication/tests/test_browserpublication.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publication/tests/test_browserpublication.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publication/tests/test_browserpublication.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -45,7 +45,7 @@
     "I am an otherwise empty docstring."
     return '<html><body>hello base fans</body></html>'
 
-class DummyPublished:
+class DummyPublished(object):
     implements(IBrowserPublisher)
 
     def publishTraverse(self, request, name):
@@ -70,7 +70,7 @@
         request.setPublication(publication)
         return request
 
-class SimpleObject:
+class SimpleObject(object):
     def __init__(self, v):
         self.v = v
 
@@ -160,7 +160,7 @@
 
     def testAdaptedTraverseNameWrapping(self):
 
-        class Adapter:
+        class Adapter(object):
             " "
             implements(IBrowserPublisher)
             def __init__(self, context, request):
@@ -182,7 +182,7 @@
 
     def testAdaptedTraverseDefaultWrapping(self):
         # Test default content and make sure that it's wrapped.
-        class Adapter:
+        class Adapter(object):
             implements(IBrowserPublisher)
             def __init__(self, context, request):
                 self.context = context
@@ -200,30 +200,9 @@
         self.assertRaises(ForbiddenAttribute, getattr, ob2, 'v')
         self.assertEqual(removeAllProxies(ob2).v, 'bruce')
 
-    # XXX we no longer support path parameters! (At least for now)
-    def XXXtestTraverseSkinExtraction(self):
-        class I1(Interface): pass
-        class C:
-            implements(I1)
-        class BobView(DummyView): pass
-
-        pub = self.klass(self.db)
-        ob = C()
-        ztapi.browserView(I1, 'edit', BobView)
-
-        r = self._createRequest('/@@edit;skin=zmi',pub)
-        ob2 = pub.traverseName(r , ob, '@@edit;skin=zmi')
-        self.assertEqual(r.getPresentationSkin(), 'zmi')
-        self.assertEqual(ob2.__class__ , BobView)
-
-        r = self._createRequest('/@@edit;skin=zmi',pub)
-        ob2 = pub.traverseName(r , ob, '@@edit;skin=zmi')
-        self.assertEqual(r.getPresentationSkin(), 'zmi')
-        self.assertEqual(ob2.__class__ , BobView)
-
     def testTraverseName(self):
         pub = self.klass(self.db)
-        class C:
+        class C(object):
             x = SimpleObject(1)
         ob = C()
         r = self._createRequest('/x',pub)
@@ -235,10 +214,10 @@
     def testTraverseNameView(self):
         pub = self.klass(self.db)
         class I(Interface): pass
-        class C:
+        class C(object):
             implements(I)
         ob = C()
-        class V:
+        class V(object):
             def __init__(self, context, request): pass
         r = self._createRequest('/@@spam',pub)
         ztapi.browserView(I, 'spam', V)
@@ -247,7 +226,7 @@
 
     def testTraverseNameServices(self):
         pub = self.klass(self.db)
-        class C:
+        class C(object):
             def getSiteManager(self):
                 return SimpleObject(1)
         ob = C()
@@ -272,7 +251,7 @@
     def testHEADFuxup(self):
         pub = self.klass(None)
 
-        class User:
+        class User(object):
             id = 'bob'
 
         # With a normal request, we should get a body:

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publication/tests/test_http.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publication/tests/test_http.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publication/tests/test_http.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,10 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Test HTTP Publication
+
 $Id$
 """
-
 from unittest import TestCase, TestSuite, main, makeSuite
 from zope.app import zapi
 import zope.app.publication.http
@@ -25,11 +25,11 @@
 from zope.publisher.interfaces.http import IHTTPRequest
 
 class I(Interface): pass
-class C:
+class C(object):
     spammed = 0
     implements(I)
 
-class V:
+class V(object):
 
     def __init__(self, context, request):
         self.context = context

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publication/tests/test_simplecomponenttraverser.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publication/tests/test_simplecomponenttraverser.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publication/tests/test_simplecomponenttraverser.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Sample Component Traverser Test
 
 $Id$
 """
@@ -28,7 +28,7 @@
     pass
 
 
-class Container:
+class Container(object):
     def __init__(self, **kw):
         for k in kw:
             setattr(self, k , kw[k])
@@ -42,7 +42,7 @@
         return ''
 
 
-class View:
+class View(object):
     def __init__(self, comp, request):
         self._comp = comp
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publication/traversers.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publication/traversers.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publication/traversers.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,19 +11,17 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Generic object traversers
+
 $Id$
 """
-
-__metaclass__ = type
-
 from zope.interface import providedBy, implements
 from zope.publisher.interfaces import Unauthorized, NotFound
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.publisher.interfaces.xmlrpc import IXMLRPCPublisher
 from zope.component import queryView, getView, getDefaultViewName
 
-class SimpleComponentTraverser:
+class SimpleComponentTraverser(object):
     """Browser traverser for simple components that can only traverse to views
     """
     implements(IBrowserPublisher, IXMLRPCPublisher)
@@ -67,7 +65,7 @@
 
         return view, path
 
-class TestTraverser:
+class TestTraverser(object):
     """Bobo-style traverser, mostly useful for testing"""
     implements(IBrowserPublisher)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/directoryresource.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/directoryresource.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/directoryresource.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -41,7 +41,7 @@
 _marker = object()
 
 # we only need this class a context for DirectoryResource
-class Directory:
+class Directory(object):
 
     def __init__(self, path, checker, name):
         self.path = path
@@ -92,7 +92,7 @@
         resource.__parent__ = self
         return resource
 
-class DirectoryResourceFactory:
+class DirectoryResourceFactory(object):
 
     def __init__(self, path, checker, name):
         self.__dir = Directory(path, checker, name)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/fileresource.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/fileresource.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/fileresource.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,12 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""File-based browser resources.
 
 $Id$
 """
-__metaclass__ = type # All classes are new style when run with Python 2.2+
-
 from zope.exceptions import NotFoundError
 
 from zope.app.publisher.browser import BrowserView
@@ -110,7 +108,7 @@
         return ''
 
 
-class FileResourceFactory:
+class FileResourceFactory(object):
 
     def __init__(self, path, checker, name):
         self.__file = File(path, name)
@@ -123,7 +121,7 @@
         resource.__name__ = self.__name
         return resource
 
-class ImageResourceFactory:
+class ImageResourceFactory(object):
 
     def __init__(self, path, checker, name):
         self.__file = Image(path, name)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/globalbrowsermenuservice.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/globalbrowsermenuservice.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/globalbrowsermenuservice.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,8 +15,6 @@
 
 $Id$
 """
-__metaclass__ = type 
-
 import sys
 from zope.exceptions import DuplicationError
 from zope.security.interfaces import Unauthorized, Forbidden
@@ -43,7 +41,7 @@
 from zope.interface.interfaces import IInterface
 from zope.interface import providedBy
 import types
-class TypeRegistry:
+class TypeRegistry(object):
 
     def __init__(self):
         self._reg = {}
@@ -81,7 +79,7 @@
         return browser_menu_service.getMenu(menu_id, self.context, self.request)
 
 
-class Menu:
+class Menu(object):
     """Browser menu"""
 
     implements(IBrowserMenu)
@@ -103,7 +101,7 @@
         return results
 
 
-class MenuItem:
+class MenuItem(object):
     """Browser menu item"""
 
     def __init__(self, action, title, description, filter, permission,
@@ -123,7 +121,7 @@
         yield self.filter
         yield self.permission
 
-class BaseBrowserMenuService:
+class BaseBrowserMenuService(object):
     """Global Browser Menu Service"""
 
     implements(IBrowserMenuService)
@@ -289,7 +287,7 @@
         _context, action, title, description, filter, permission, extra)
 
 
-class menuItemsDirective:
+class menuItemsDirective(object):
 
     def __init__(self, _context, menu, for_):
         self.interface = for_

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/i18nfileresource.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/i18nfileresource.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/i18nfileresource.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,13 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
-Internationalized file resource.
+"""Internationalized file resource.
 
 $Id$
 """
-__metaclass__ = type # All classes are new style when run with Python 2.2+
-
 from zope.publisher.interfaces.browser import IBrowserPublisher
 
 from zope.app.publisher.browser.fileresource import FileResource
@@ -82,7 +79,7 @@
     ############################################################
 
 
-class I18nFileResourceFactory:
+class I18nFileResourceFactory(object):
 
     def __init__(self, data, defaultLanguage):
         self.__data = data

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/icon.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/icon.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/icon.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -26,11 +26,9 @@
 from zope.configuration.exceptions import ConfigurationError
 from zope.app.component.interface import provideInterface
 
-__metaclass__ = type
-
 IName = re.compile('I[A-Z][a-z]')
 
-class IconView:
+class IconView(object):
 
     def __init__(self, context, request, rname, alt):
         self.context = context
@@ -52,7 +50,7 @@
         src = resource()
         return src
 
-class IconViewFactory:
+class IconViewFactory(object):
 
     def __init__(self, rname, alt):
         self.rname = rname

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/pagetemplateresource.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/pagetemplateresource.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/pagetemplateresource.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -41,7 +41,7 @@
         pt = self.context
         return pt(self.request)
 
-class PageTemplateResourceFactory:
+class PageTemplateResourceFactory(object):
 
     def __init__(self, path, checker, name):
         self.__pt = PageTemplate(path)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/templateclass.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/templateclass.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/templateclass.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,5 +11,9 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-class templateclass:
+"""Template test class
+
+$Id$
+"""
+class templateclass(object):
     def data(self): return 42

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_addMenuItem.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_addMenuItem.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_addMenuItem.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -57,10 +57,10 @@
 
 atre = re.compile(' at [0-9a-fA-Fx]+')
 
-class X:
+class X(object):
     pass
 
-class Context:
+class Context(object):
     actions = ()
     
     def action(self, discriminator, callable, args):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_directives.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_directives.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_directives.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -72,7 +72,7 @@
         except:
             return super(VT, self).publishTraverse(request, name)
 
-class Ob:
+class Ob(object):
     implements(IC)
 
 ob = Ob()

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_directoryresource.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_directoryresource.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_directoryresource.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,10 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Directory-based resources test
+
 $Id$
 """
-
 import os
 from unittest import TestCase, main, makeSuite
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservice.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservice.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservice.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -39,7 +39,7 @@
 class C1(object):
     implements(I1)
             
-class TestObject:
+class TestObject(object):
     implements(IBrowserPublisher, I111)
 
     def f(self):
@@ -65,7 +65,7 @@
             }
 
 
-class ParticipationStub:
+class ParticipationStub(object):
 
     def __init__(self, principal):
         self.principal = principal

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_icondirective.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_icondirective.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_icondirective.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -49,7 +49,7 @@
 
 request = TestRequest()
 
-class Ob:
+class Ob(object):
     implements(IC)
 
 ob = Ob()

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_menuaccessview.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_menuaccessview.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_menuaccessview.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -40,7 +40,7 @@
 def d(title, action):
     return {'action': action, 'title': title, 'description': ''}
 
-class Service:
+class Service(object):
     implements(IBrowserMenuService, ISimpleService)
 
     def getMenu(self, name, ob, req):
@@ -49,7 +49,7 @@
                 d('l3', '@@a3'),]
 
 class I(Interface): pass
-class C:
+class C(object):
     implements(I)
 
     def __call__(self):
@@ -62,7 +62,7 @@
 ob.abad = C()
 ob.abad.bad = 1
 
-class V:
+class V(object):
     implements(IBrowserView)
 
     def __init__(self, context, request):
@@ -72,7 +72,7 @@
     def __call__(self):
         pass
 
-class ParticipationStub:
+class ParticipationStub(object):
 
     def __init__(self, principal):
         self.principal = principal

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_resource.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_resource.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_resource.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -23,7 +23,6 @@
 from zope.app.publisher.browser.tests import support
 from zope.app.tests.placelesssetup import PlacelessSetup
 
-
 class TestResource(support.SiteHandler, PlacelessSetup, unittest.TestCase):
 
     def testGlobal(self):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_resources.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_resources.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/tests/test_resources.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -40,7 +40,7 @@
         from zope.app.publisher.browser.resources import Resources
         request = TestRequest()
 
-        class Resource:
+        class Resource(object):
             def __init__(self, request): pass
             def __call__(self): return 42
 
@@ -53,7 +53,7 @@
         from zope.app.publisher.browser.resources import Resources
         request = TestRequest()
 
-        class Resource:
+        class Resource(object):
             def __init__(self, request): pass
             def __call__(self): return 42
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/viewmeta.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/viewmeta.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/browser/viewmeta.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -211,7 +211,7 @@
 # This is a different case. We actually build a class with attributes
 # for all of the given pages.
 
-class view:
+class view(object):
 
     default = None
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/xmlrpc/tests/test_directives.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/xmlrpc/tests/test_directives.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/publisher/xmlrpc/tests/test_directives.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -34,7 +34,7 @@
 
 request = Request(IXMLRPCRequest)
 
-class Ob:
+class Ob(object):
     implements(IC)
 
 ob = Ob()

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -19,8 +19,6 @@
 
 $Id$
 """
-__metaclass__ = type
-
 import types, string
 from types import StringTypes
 
@@ -240,7 +238,7 @@
     return result
 
 
-class ZopeCursor:
+class ZopeCursor(object):
     implements(IZopeCursor)
 
     def __init__(self, cursor, connection):
@@ -290,7 +288,7 @@
 
         return map(convertRow, results)
 
-class ZopeConnection:
+class ZopeConnection(object):
 
     implements(IZopeConnection)
 
@@ -352,7 +350,7 @@
     return ResultSet(columns, results)
 
 
-class ZopeDBTransactionManager:
+class ZopeDBTransactionManager(object):
 
     implements(IDataManager)
 
@@ -425,7 +423,7 @@
                 return c
         return 0
 
-class InstanceOnlyDescriptor:
+class InstanceOnlyDescriptor(object):
     __marker = object()
     def __init__(self, value=__marker):
         if value is not self.__marker:

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/browser/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/browser/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/browser/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -20,7 +20,7 @@
 from zope.app.rdb.interfaces import IZopeDatabaseAdapter
 from zope.app.rdb import queryForResults
 
-class TestSQL:
+class TestSQL(object):
 
     __used_for__ = IZopeDatabaseAdapter
 
@@ -31,7 +31,7 @@
         return result
 
 
-class Connection:
+class Connection(object):
     __used_for__ = IZopeDatabaseAdapter
 
     def edit(self, dsn):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/browser/rdb.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/browser/rdb.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/browser/rdb.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -20,7 +20,7 @@
 from zope.app.rdb.interfaces import IZopeDatabaseAdapter
 from zope.app.rdb import queryForResults
 
-class TestSQL:
+class TestSQL(object):
 
     __used_for__ = IZopeDatabaseAdapter
 
@@ -31,7 +31,7 @@
         return result
 
 
-class Connection:
+class Connection(object):
     __used_for__ = IZopeDatabaseAdapter
 
     def edit(self, dsn):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/tests/stubs.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/tests/stubs.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/tests/stubs.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -16,7 +16,7 @@
 $Id$
 """
 
-class ConnectionStub:
+class ConnectionStub(object):
 
     def __init__(self):
         self._called={}
@@ -36,11 +36,11 @@
         v+=1
         self._called['rollback']=v
 
-class CursorStub:
+class CursorStub(object):
     def execute(*args, **kw):
         pass
 
-class TypeInfoStub:
+class TypeInfoStub(object):
     paramstyle = 'pyformat'
     threadsafety = 0
     def getConverter(self, type):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/tests/test_zopedatabaseadapter.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/tests/test_zopedatabaseadapter.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/rdb/tests/test_zopedatabaseadapter.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,14 +11,15 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Database adapter stubs for testing.
+
 $Id$
 """
 import unittest
 from zope.app.rdb import ZopeDatabaseAdapter
 from zope.app.rdb import ZopeConnection
 
-class ConnectionStub:
+class ConnectionStub(object):
 
     def close(self):
         pass

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/registration/tests/registrationstack.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/registration/tests/registrationstack.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/registration/tests/registrationstack.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -20,8 +20,6 @@
 from zope.app.traversing.interfaces import IPhysicallyLocatable
 import zope.interface
 
-__metaclass__ = type
-
 class TestingRegistration(Contained):
     zope.interface.implements(IPhysicallyLocatable)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/rotterdam/editingwidgets.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/rotterdam/editingwidgets.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/rotterdam/editingwidgets.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,11 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Custom Widgets for the rotterdam layer.
+
 $Id$
 """
-__metaclass__ = type
-
 from zope.interface import implements
 from zope.app.form.interfaces import IInputWidget
 from zope.app.form.browser import TextAreaWidget

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/rotterdam/tests/test_xmlnavigationviews.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/rotterdam/tests/test_xmlnavigationviews.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/rotterdam/tests/test_xmlnavigationviews.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -31,7 +31,7 @@
 
 from zope.app.site.tests.placefulsetup import PlacefulSetup
 
-class File:
+class File(object):
     pass
 
 class TestXmlObject(PlacefulSetup, TestCase):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/schema/tests/test_directives.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/schema/tests/test_directives.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/schema/tests/test_directives.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -24,7 +24,7 @@
 import zope.app.schema
 
 
-class MyFactory:
+class MyFactory(object):
     def __init__(self, context, **kw):
         self.ob = context
         self.kw = kw

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/fields.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/fields.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/fields.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -25,7 +25,7 @@
 
     Let's look at an example:
 
-    >>> class FauxContext:
+    >>> class FauxContext(object):
     ...     permission_mapping = {'zope.ManageCode':'zope.private'}
     ...     _actions = []
     ...     def action(self, **kws):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/loginpassword.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/loginpassword.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/loginpassword.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -18,7 +18,7 @@
 from zope.interface import implements
 from interfaces import ILoginPassword
 
-class LoginPassword:
+class LoginPassword(object):
 
     implements(ILoginPassword)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/principallogging.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/principallogging.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/principallogging.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -18,7 +18,7 @@
 from zope.interface import implements
 from zope.publisher.interfaces.logginginfo import ILoggingInfo
 
-class PrincipalLogging:
+class PrincipalLogging(object):
 
     implements(ILoggingInfo)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_basicauthadapter.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_basicauthadapter.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_basicauthadapter.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,11 +11,15 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
+"""Test Basic Authentication Adapter
+
+$Id$
+"""
 import unittest
 
 from zope.app.security.basicauthadapter import BasicAuthAdapter
 
-class Request:
+class Request(object):
 
     def __init__(self, lpw):
         self.lpw = lpw

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_directives.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_directives.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_directives.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -81,7 +81,7 @@
     The allow directive creates actions for each named defined
     directly, or via interface:
 
-    >>> class Context:
+    >>> class Context(object):
     ...     def __init__(self):
     ...         self.actions = []
     ...
@@ -139,7 +139,7 @@
     The allow directive creates actions for each named defined
     directly, or via interface:
 
-    >>> class Context:
+    >>> class Context(object):
     ...     def __init__(self):
     ...         self.actions = []
     ...

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_ftpauth.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_ftpauth.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_ftpauth.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,16 +11,16 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""FTP Authentication Test
+
 $Id$
 """
-
 from unittest import TestCase, TestSuite, main, makeSuite
 from zope.publisher.interfaces.ftp import IFTPCredentials
 from zope.app.security.ftpauth import FTPAuth
 from zope.interface import implements
 
-class FTPCredentials:
+class FTPCredentials(object):
     __doc__ = IFTPCredentials.__doc__
 
     implements(IFTPCredentials)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_principallogging.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_principallogging.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_principallogging.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -18,7 +18,7 @@
 import unittest
 from zope.interface.verify import verifyObject
 
-class PrincipalStub:
+class PrincipalStub(object):
 
     id = 42
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_principalregistry.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_principalregistry.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_principalregistry.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -31,7 +31,7 @@
 from zope.app.security.principalregistry import DuplicateLogin, DuplicateId
 
 
-class Request:
+class Request(object):
 
     implements(IHTTPCredentials)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_protectclass.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_protectclass.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/tests/test_protectclass.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-""" Test handler for 'protectClass' directive
+"""Test handler for 'protectClass' directive
 
 $Id$
 """
@@ -40,7 +40,7 @@
         ztapi.provideUtility(IPermission, Permission(P1), P1)
         ztapi.provideUtility(IPermission, Permission(P2), P2)
 
-        class B:
+        class B(object):
             def m1(self):
                 return "m1"
             def m2(self):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/principalroleview.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/principalroleview.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/principalroleview.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -27,7 +27,7 @@
 from zope.app.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.app.securitypolicy.interfaces import IPrincipalRoleMap
 
-class PrincipalRoleView:
+class PrincipalRoleView(object):
 
     def getAllPrincipals(self):
         principals = getattr(self, '_principals', None)
@@ -94,7 +94,7 @@
 
         return status
 
-class PrincipalRoleGrid:
+class PrincipalRoleGrid(object):
 
     def __init__(self, principals, roles, context):
         self._principals = principals

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/rolepermissionview.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/rolepermissionview.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/rolepermissionview.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -27,7 +27,7 @@
 from zope.app.security.interfaces import IPermission
 from zope.app.securitypolicy.interfaces import IRole, IRolePermissionManager
 
-class RolePermissionView:
+class RolePermissionView(object):
 
     def roles(self):
         roles = getattr(self, '_roles', None)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/tests/rolepermissionmanager.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/tests/rolepermissionmanager.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/tests/rolepermissionmanager.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -21,7 +21,7 @@
 from zope.app.securitypolicy.securitymap import SecurityMap
 from zope.app.security.settings import Allow, Deny, Unset
 
-class RolePermissionManager:
+class RolePermissionManager(object):
     """
     provide adapter that manages role permission data in an object attribute
     """

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/tests/test_principalpermissionview.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/tests/test_principalpermissionview.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/tests/test_principalpermissionview.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -35,11 +35,11 @@
 from zope.app.securitypolicy.browser.principalpermissionview \
      import PrincipalPermissionView
 
-class DummyContext:
+class DummyContext(object):
     implements(IAttributeAnnotatable)
 
 
-class DummyAuthenticationService:
+class DummyAuthenticationService(object):
     implements(IAuthenticationService, ISimpleService)
 
     def __init__(self, principals):
@@ -52,7 +52,7 @@
         return self.principals[principal_id]
 
 
-class DummyPrincipal:
+class DummyPrincipal(object):
     implements(IPrincipal)
 
     def __init__(self, id, title):
@@ -60,7 +60,7 @@
         self.title = title
 
 
-class DummyAdapter:
+class DummyAdapter(object):
     implements(IPrincipalPermissionManager, IPrincipalPermissionMap)
 
     def __init__(self, context):
@@ -110,7 +110,7 @@
         except KeyError:
             return []
 
-class DummyPermission:
+class DummyPermission(object):
     implements(IPermission)
     
     def __init__(self, id, title):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/tests/test_principalroleview.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/tests/test_principalroleview.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/browser/tests/test_principalroleview.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -39,20 +39,20 @@
 class PrincipalRoleView(PrincipalRoleView, BrowserView):
     """Adding BrowserView to Utilities; this is usually done by ZCML."""
 
-class DummySetting:
+class DummySetting(object):
     def __init__(self, name):
         self._name = name
     def getName(self):
         return self._name
 
-class DummyManager:
+class DummyManager(object):
 
     implements(IPrincipalRoleManager)
 
     def getSetting(self, role, principal):
         return DummySetting('%r:%r' % (role, principal))
 
-class DummyAuthenticationService:
+class DummyAuthenticationService(object):
 
     implements(IAuthenticationService, ISimpleService)
 
@@ -62,7 +62,7 @@
     def getPrincipals(self, name):
         return self._principals
 
-class DummyPrincipal:
+class DummyPrincipal(object):
     implements(IPrincipal)
 
     def __init__(self, id, title):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/principalrole.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/principalrole.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/principalrole.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,9 +15,6 @@
 
 $Id$
 """
-
-__metaclass__ = type
-
 from zope.interface import implements
 
 from zope.app.securitypolicy.interfaces import IPrincipalRoleManager

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -31,7 +31,7 @@
 from zope.app.securitypolicy.principalpermission \
     import AnnotationPrincipalPermissionManager
 
-class Manageable:
+class Manageable(object):
     implements(IAttributeAnnotatable)
 
 class Test(PlacelessSetup, unittest.TestCase):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -30,7 +30,7 @@
 from zope.app.securitypolicy.interfaces import IRole
 from zope.app.securitypolicy.principalrole import AnnotationPrincipalRoleManager
 
-class Manageable:
+class Manageable(object):
     implements(IAttributeAnnotatable)
 
 def defineRole(id, title=None, description=None):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -31,7 +31,7 @@
 from zope.app.securitypolicy.rolepermission \
      import AnnotationRolePermissionManager
 
-class Manageable:
+class Manageable(object):
     implements(IAttributeAnnotatable)
 
 class Test(PlacefulSetup, unittest.TestCase):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/zopepolicy.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/zopepolicy.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/securitypolicy/zopepolicy.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-""" Define Zope\'s default security policy
+"""Define Zope's default security policy
 
 $Id$
 """

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/server/ftp.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/server/ftp.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/server/ftp.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,7 +15,6 @@
 
 $Id$
 """
-
 from zope.app.publication.ftp import FTPPublication
 from zope.app.publication.interfaces import IPublicationRequestFactory
 from zope.publisher.ftp import FTPRequest
@@ -24,7 +23,7 @@
 from zope.app.server.servertype import ServerType
 import zope.interface
 
-class FTPRequestFactory:
+class FTPRequestFactory(object):
     """FTP Request factory
 
     FTP request factories for a given database create FTP requets with

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/server/mkzopeinstance.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/server/mkzopeinstance.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/server/mkzopeinstance.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -52,7 +52,7 @@
         return e.code
 
 
-class Application:
+class Application(object):
 
     def __init__(self, options):
         self.options = options

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/server/server.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/server/server.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/server/server.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,19 +11,16 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-
 """Datatype for a <server> section in a Zope 3 configuration file.
 
 This is called by the ZConfig machinery while processing a configuration.
 
 $Id$
 """
-
-
 from zope.app import zapi
 from zope.app.server.servertype import IServerType
 
-class ServerFactory:
+class ServerFactory(object):
     """Factory for server objects.
 
     The factories are part of the configuration data returned by

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/server/servercontrol.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/server/servercontrol.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/server/servercontrol.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -19,7 +19,7 @@
 from zope.app.applicationcontrol.interfaces import IServerControl
 from zope.interface import implements
 
-class ServerControl:
+class ServerControl(object):
 
     implements(IServerControl)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/server/servertype.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/server/servertype.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/server/servertype.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,9 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""e.py,v 1.1.2.2 2002/04/02 02:20:40 srichter Exp $
+"""Server Type
+
+$Id$
 """
-
 from zope.interface import Interface, implements
 
 
@@ -26,7 +27,7 @@
         """Create the server knowing the port, task dispatcher and the ZODB.
         """
 
-class ServerType:
+class ServerType(object):
 
     implements(IServerType)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/server/tests/test_mkzopeinstance.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/server/tests/test_mkzopeinstance.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/server/tests/test_mkzopeinstance.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -273,7 +273,7 @@
         return not self.__input
 
 
-class Options:
+class Options(object):
 
     username = "[test-username]"
     password = "[test-password]"

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -439,7 +439,7 @@
         >>> from zope.app.traversing.interfaces import IContainmentRoot
         >>> from zope.interface import implements
 
-        >>> class PossibleSite:
+        >>> class PossibleSite(object):
         ...     implements(IContainmentRoot)
         ...     def setSiteManager(self, sm):
         ...         from zope.interface import directlyProvides
@@ -490,7 +490,7 @@
             "++etc++site/@@SelectedManagementView.html")
 
 
-class Interfaces:
+class Interfaces(object):
     """Interface service view
 
     >>> from zope.interface import Interface
@@ -501,7 +501,7 @@
     ...     This is a multi-line doc string.
     ...     '''
     ... 
-    >>> class DummyInterface:
+    >>> class DummyInterface(object):
     ...     def items(self):
     ...         return [('DCInterface', DCInterface)]
     ...
@@ -531,7 +531,7 @@
         L.sort()
         return [{"id": id, "name": name, "doc": doc} for name, id, doc in L]
 
-class Detail:
+class Detail(object):
     """Interface Details
 
     >>> from zope.schema import TextLine
@@ -546,7 +546,7 @@
     ...     def testMethod():
     ...         'Returns test name'
     ...
-    >>> class TestClass:
+    >>> class TestClass(object):
     ...     def getInterface(self, id=None):
     ...         return TestInterface
     ...
@@ -623,7 +623,7 @@
                         yield {"name": name, "registrations": regs}
             
 
-class MethodDetail:
+class MethodDetail(object):
     """Interface Method Details
 
     >>> from zope.interface import Interface
@@ -634,7 +634,7 @@
     ...     def testMethod():
     ...         'Returns test name'
     ...
-    >>> class TestClass:
+    >>> class TestClass(object):
     ...     def getInterface(self, id=None):
     ...         return TestInterface
     ...

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_directives.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_directives.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_directives.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -21,7 +21,7 @@
 
 from zope.app.tests.placelesssetup import setUp, tearDown
 
-class FauxContext:
+class FauxContext(object):
     def __init__(self):
         self.actions = []
         self.info = 'info'

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_service.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_service.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_service.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -25,7 +25,7 @@
 class IFoo(Interface):
     pass
 
-class Foo:
+class Foo(object):
     implements(IFoo)
     def __init__(self, url='some_url'):
         self.url = url
@@ -35,7 +35,7 @@
     def test_nextURL(self):
         from zope.app.site.browser import ComponentAdding
 
-        class AU:
+        class AU(object):
             def __init__(self, context, request):
                 self.context = context
             def __str__(self):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_services.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_services.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_services.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -22,7 +22,7 @@
 from zope.app.site.interfaces import ILocalService
 from zope.interface import implements
 
-class ServiceStub:
+class ServiceStub(object):
     __parent__ = None
     __name__ = None
     next = None

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_toolbacklink.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_toolbacklink.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tests/test_toolbacklink.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -32,10 +32,10 @@
 class IDummyUtility(Interface):
     pass
 
-class DummyUtility:
+class DummyUtility(object):
     implements(IDummyUtility, ILocalUtility)
 
-class Locatable:
+class Locatable(object):
     def __init__(self, context):
         pass
     

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tools.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tools.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/site/browser/tools.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -55,7 +55,7 @@
     interface = Attribute("Interface the utility provides.")
 
 
-class ToolsOverview:
+class ToolsOverview(object):
     def getTools(self):
         tools = []
         for n, iface in zapi.getUtilitiesFor(IToolType):
@@ -68,7 +68,7 @@
         tools.sort(lambda x, y: cmp(x['title'], y['title']))
         return tools
 
-class ToolsBacklink:
+class ToolsBacklink(object):
     def getLink(self):
         service = zapi.getService(Services)
         iface = zapi.queryType(self.context, IToolType)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/site/tests/test_servicemanager.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/site/tests/test_servicemanager.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/site/tests/test_servicemanager.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -33,7 +33,7 @@
 class ITestService(Interface):
     pass
 
-class TestService:
+class TestService(object):
     implements(ITestService, IAttributeAnnotatable)
 
 class ServiceManagerTests(PlacefulSetup, TestCase):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/site/tests/test_serviceregistration.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/site/tests/test_serviceregistration.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/site/tests/test_serviceregistration.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -35,7 +35,7 @@
 class ITestService(Interface):
     pass
 
-class TestServiceBase:
+class TestServiceBase(object):
     __name__ = __parent__ = None
     implements(ITestService, IBindingAware, IDependable)
     

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/size/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/size/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/size/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -19,9 +19,7 @@
 from zope.app.size.interfaces import ISized
 from zope.interface import implements
 
-__metaclass__ = type
-
-class DefaultSized:
+class DefaultSized(object):
     implements(ISized)
 
     def __init__(self, obj):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/size/tests.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/size/tests.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/size/tests.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,11 +11,15 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
+"""Test ISized Adapter
+
+$Id$
+"""
 import unittest
 
 from zope.app.size.interfaces import ISized
 
-class DummyObject:
+class DummyObject(object):
 
     def __init__(self, size):
         self._size = size

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/sqlscript/browser/sqlscript.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/sqlscript/browser/sqlscript.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/sqlscript/browser/sqlscript.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -24,9 +24,7 @@
 from zope.app.sqlscript.sqlscript import SQLScript
 from zope.app.sqlscript.interfaces import ISQLScript
 
-__metaclass__ = type
-
-class SQLScriptTest:
+class SQLScriptTest(object):
     """Test the SQL inside the SQL Script
     """
 
@@ -60,7 +58,7 @@
     def getRenderedSQL(self):
         return self.context.getTemplate()(**self.getArguments())
 
-class SQLScriptAdd:
+class SQLScriptAdd(object):
     """Provide interface to add SQL Script
     """
 
@@ -135,7 +133,7 @@
         else:
             return super(SQLScriptAdd, self).nextURL()
 
-class SQLScriptEdit:
+class SQLScriptEdit(object):
     """Provide interface to Edit and Test  SQL Script
     """        
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/sqlscript/dtml.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/sqlscript/dtml.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/sqlscript/dtml.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -23,14 +23,12 @@
 
 from interfaces import MissingInput
 
-__metaclass__ = type
-
 valid_type = {'int':    True,
               'float':  True,
               'string': True,
               'nb':     True}.has_key
 
-class SQLTest:
+class SQLTest(object):
     name = 'sqltest'
     optional = multiple = None
 
@@ -140,7 +138,7 @@
                          'gt': '>', 'ge': '>=', 'gte': '>=' }
 
 
-class SQLGroup:
+class SQLGroup(object):
     blockContinuations = 'and', 'or'
     name = 'sqlgroup'
     required = None
@@ -186,7 +184,7 @@
     __call__ = render
 
 
-class SQLVar:
+class SQLVar(object):
     name = 'sqlvar'
 
     # Some defaults

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/sqlscript/tests/test_sqlscript.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/sqlscript/tests/test_sqlscript.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/sqlscript/tests/test_sqlscript.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -44,7 +44,7 @@
 def getLocalServices(context):
     return sm
 
-class CursorStub:
+class CursorStub(object):
 
     implements(IZopeCursor)
 
@@ -66,14 +66,14 @@
 
 
 
-class ConnectionStub:
+class ConnectionStub(object):
     implements(IZopeConnection)
 
     def cursor(self):
         return CursorStub()
 
 
-class ConnectionUtilityStub:
+class ConnectionUtilityStub(object):
     implements(IZopeDatabaseAdapter)
 
     def __init__(self):
@@ -82,14 +82,14 @@
     def __call__(self):
         return  self.connection
 
-class ConnectionServiceStub:
+class ConnectionServiceStub(object):
     implements(IConnectionService, ISimpleService)
 
     def getConnection(self, name):
         return ConnectionStub()
 
 
-class CacheStub:
+class CacheStub(object):
     implements(ICache)
     def __init__(self):
         self.cache = {}
@@ -109,7 +109,7 @@
         return self.cache.get((obj, keywords), default)
 
 
-class LocatableStub:
+class LocatableStub(object):
 
     implements(IPhysicallyLocatable)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/tests/test.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/tests/test.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/tests/test.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -446,7 +446,7 @@
         return unittest.TextTestRunner.run(self, test)
 
 # setup list of directories to put on the path
-class PathInit:
+class PathInit(object):
     def __init__(self, build, build_inplace, libdir=None):
         self.inplace = None
         # Figure out if we should test in-place or test in-build.  If the -b
@@ -495,7 +495,7 @@
             return True
     return False
 
-class TestFileFinder:
+class TestFileFinder(object):
 
     EMPTY_FILE_LISTS = ([], ["{arch}"], ["CVS"], ["_darcs"], [".svn"])
 
@@ -602,7 +602,7 @@
     __import__(modname)
     return sys.modules[modname]
 
-class PseudoTestCase:
+class PseudoTestCase(object):
     """Minimal test case objects to create error reports.
 
     If test.py finds something that looks like it should be a test but
@@ -664,7 +664,7 @@
     minimal = (GUI == "minimal")
     unittestgui.main(suites, minimal)
 
-class TrackRefs:
+class TrackRefs(object):
     """Object to track reference counts across test runs."""
 
     def __init__(self):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/tests/test_decorator.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/tests/test_decorator.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/tests/test_decorator.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -67,7 +67,7 @@
 
 def test_providedBy_iter_w_classic_class():
     """
-    >>> class X:
+    >>> class X(object):
     ...   implements(I3)
 
     >>> x = X()
@@ -84,7 +84,7 @@
     """
 
 
-class Thing:
+class Thing(object):
     pass
 
 def test_SecurityCheckerDescriptor():
@@ -95,7 +95,7 @@
     >>> class MyDecorator(Decorator):
     ...     __Security_checker__ = DecoratedSecurityCheckerDescriptor()
 
-    >>> class Foo:
+    >>> class Foo(object):
     ...     a = 1
     ...     b = 2
     ...     c = 3

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/adapters.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/adapters.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/adapters.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,7 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Adapters for the traversing mechanism
+
 $Id$
 """
 from types import StringTypes, MethodType
@@ -27,10 +28,9 @@
 from zope.app.traversing.namespace import UnexpectedParameters
 from zope.app.traversing.namespace import nsParse
 
-__metaclass__ = type
 _marker = object()  # opaque marker that doesn't get security proxied
 
-class DefaultTraversable:
+class DefaultTraversable(object):
     """Traverses objects via attribute and item lookup"""
 
     implements(ITraversable)
@@ -51,7 +51,7 @@
         else:
             raise NotFoundError(subject, name)
 
-class RootPhysicallyLocatable:
+class RootPhysicallyLocatable(object):
     __doc__ = IPhysicallyLocatable.__doc__
 
     implements(IPhysicallyLocatable)
@@ -78,7 +78,7 @@
         return self
 
 
-class Traverser:
+class Traverser(object):
     """Provide traverse features"""
 
     implements(ITraverser)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/browser/tests.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/browser/tests.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/browser/tests.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,7 +15,6 @@
 
 $Id$
 """
-
 from unittest import TestCase, main, makeSuite
 from zope.app.container.contained import contained
 from zope.app.tests import ztapi
@@ -32,7 +31,7 @@
 class IRoot(Interface):
     pass
 
-class Root:
+class Root(object):
     implements(IRoot)
 
 class TrivialContent(object):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/ftests/test_vhosting.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/ftests/test_vhosting.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/ftests/test_vhosting.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,7 +15,6 @@
 
 $Id$
 """
-
 import unittest
 from zope.app.tests import ztapi
 from zope.app.tests.functional import BrowserTestCase
@@ -27,8 +26,6 @@
 from zope.app.container.contained import Contained
 from zope.app.zptpage.zptpage import ZPTPage
 
-__metaclass__ = type
-
 class MyObj(Contained):
     def __getitem__(self, key):
         return traverse(self, '/foo/bar/' + key)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/namespace.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/namespace.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/namespace.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -44,12 +44,12 @@
 
          >>> class I(zope.interface.Interface):
          ...     'Test interface'
-         >>> class C:
+         >>> class C(object):
          ...     zope.interface.implements(I)
 
        We'll register a simple testing adapter:
 
-         >>> class Adapter:
+         >>> class Adapter(object):
          ...     def __init__(self, context):
          ...         self.context = context
          ...     def traverse(self, name, remaining):
@@ -82,7 +82,7 @@
 
        We need to provide a view:
 
-         >>> class View:
+         >>> class View(object):
          ...     def __init__(self, context, request):
          ...         pass
          ...     def traverse(self, name, remaining):
@@ -201,7 +201,7 @@
 
            Let's set up some example data:
 
-             >>> class testcontent:
+             >>> class testcontent(object):
              ...     zope.interface.implements(ITraversable)
              ...     def traverse(self, name, remaining):
              ...         v = getattr(self, name, None)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_conveniencefunctions.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_conveniencefunctions.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_conveniencefunctions.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Test traversal convenience functions.
 
 $Id$
 """
@@ -35,7 +35,7 @@
 from zope.exceptions import NotFoundError
 from zope.app.container.contained import contained
 
-class C:
+class C(object):
     __parent__ = None
     __name__ = None
     def __init__(self, name):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_etc.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_etc.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_etc.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,12 +11,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""
+"""Test 'etc' namespace
 
-Revision information:
 $Id$
 """
-
 from unittest import TestCase, main, makeSuite
 from zope.testing.cleanup import CleanUp # Base class w registry cleanup
 
@@ -33,7 +31,7 @@
 
     def testServices(self):
         from zope.app.traversing.namespace import etc
-        class C:
+        class C(object):
             def getSiteManager(self): return 42
 
         self.assertEqual(etc(C()).traverse('site', ()), 42)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_physicallocationadapters.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_physicallocationadapters.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_physicallocationadapters.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -29,17 +29,17 @@
 from zope.app.site.servicecontainer import ServiceManagerContainer
 
 
-class Root:
+class Root(object):
     implements(IContainmentRoot)
 
     __parent__ = None
 
 
-class C:
+class C(object):
     pass
 
 
-class SiteManager:
+class SiteManager(object):
 
     implements(IServiceService)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_presentation.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_presentation.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_presentation.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -27,15 +27,15 @@
 class IContent(Interface):
     pass
 
-class Content:
+class Content(object):
     implements(IContent)
 
-class Resource:
+class Resource(object):
 
     def __init__(self, request):
         pass
 
-class View:
+class View(object):
 
     def __init__(self, content, request):
         self.content = content

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_skin.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_skin.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_skin.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,12 +11,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""
+"""Test skin traversal.
 
-Revision information:
 $Id$
 """
-
 from unittest import TestCase, main, makeSuite
 
 class Test(TestCase):
@@ -24,7 +22,7 @@
     def test(self):
         from zope.app.traversing.namespace import skin
 
-        class FauxRequest:
+        class FauxRequest(object):
             def shiftNameToApplication(self):
                 self.shifted = 1
             skin = ''

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_traverser.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_traverser.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_traverser.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,11 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Traverser Adapter tests.
 
 $Id$
 """
-
 import unittest
 
 from zope.app.tests import ztapi
@@ -42,7 +41,7 @@
 from zope.security.management import newInteraction, endInteraction
 from zope.app.container.contained import Contained, contained
 
-class ParticipationStub:
+class ParticipationStub(object):
 
     def __init__(self, principal):
         self.principal = principal

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_vh.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_vh.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/tests/test_vh.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,13 +15,10 @@
 
 $Id$
 """
-
 import unittest
 
-__metaclass__ = type
+class TestRequest(object):
 
-class TestRequest:
-
     def __init__(self, names=None, stack=None):
         self._traversal_stack = stack
         self._traversed_names = names

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/tree/adapters.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/tree/adapters.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/tree/adapters.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -20,7 +20,6 @@
 
 $Id$
 """
-
 from zope.interface import Interface, implements
 from zope.component.exceptions import ComponentLookupError
 
@@ -31,9 +30,7 @@
 
 from zope.app.tree.interfaces import IUniqueId, IChildObjects
 
-__metaclass__ = type
-
-class StubUniqueId:
+class StubUniqueId(object):
     implements(IUniqueId)
     __used_for__ = Interface
 
@@ -44,7 +41,7 @@
         # this does not work for persistent objects
         return str(id(self.context))
 
-class StubChildObjects:
+class StubChildObjects(object):
     implements(IChildObjects)
     __used_for__ = Interface
 
@@ -57,7 +54,7 @@
     def getChildObjects(self):
         return ()
 
-class LocationUniqueId:
+class LocationUniqueId(object):
     implements(IUniqueId)
     __used_for__ = ILocation
 
@@ -74,7 +71,7 @@
                     if parent.__name__]
         return '\\'.join(parents)
 
-class ContainerChildObjects:
+class ContainerChildObjects(object):
     implements(IChildObjects)
     __used_for__ = IReadContainer
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/tree/filters.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/tree/filters.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/tree/filters.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -24,13 +24,10 @@
 
 $Id$
 """
-
 from zope.interface import implements
 from zope.app.container.interfaces import IObjectFindFilter
 
-__metaclass__ = type
-
-class OnlyInterfacesFilter:
+class OnlyInterfacesFilter(object):
     """Only match objects that implement one of the given interfaces.
     """
     implements(IObjectFindFilter)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/tree/node.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/tree/node.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/tree/node.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,19 +11,16 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""A node in the treee
+"""A node in the tree
 
 $Id$
 """
-
 from zope.interface import implements
 from zope.app import zapi
 from zope.app.tree.interfaces import INode, IUniqueId, IChildObjects
 from zope.app.tree.interfaces import ITreeStateEncoder
 
-__metaclass__ = type
-
-class Node:
+class Node(object):
     """A tree node
 
     This object represents a node in the tree. It wraps the actual

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/basetest.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/basetest.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/basetest.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,10 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Base Test Case for Tree Tests
+
 $Id$
 """
-
 import unittest
 from zope.interface import implements, Interface, Attribute
 from zope.app.tests.placelesssetup import PlacelessSetup
@@ -25,22 +25,20 @@
 from zope.app.tree.node import Node
 from zope.app.tree.utils import TreeStateEncoder
 
-__metaclass__ = type
-
 class IItem(Interface):
     """Simple object that can have an id and a set of children
     """
     id = Attribute("id")
     children = Attribute("children")
 
-class Item:
+class Item(object):
     implements(IItem)
 
     def __init__(self, id, children=[]):
         self.id = id
         self.children = children
 
-class ItemUniqueId:
+class ItemUniqueId(object):
     """Simplistic adapter from IItem to IUniqueId
     """
     implements(IUniqueId)
@@ -51,7 +49,7 @@
     def getId(self):
         return self.id
 
-class ItemChildObjects:
+class ItemChildObjects(object):
     """Simplistic adapter from IItem to IChildObjects
     """
     implements(IChildObjects)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/test_adapters.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/test_adapters.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/test_adapters.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,10 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Tree adapter tests
+
 $Id$
 """
-
 import unittest
 
 from zope.interface import implements, directlyProvides
@@ -37,9 +37,7 @@
 from zope.app.tree.adapters import StubUniqueId, StubChildObjects, \
      LocationUniqueId, ContainerChildObjects, ContainerSiteChildObjects
 
-__metaclass__ = type
-
-class SampleContent:
+class SampleContent(object):
     pass
 
 class SampleSite(SampleContainer):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/test_filters.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/test_filters.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/test_filters.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,10 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Test tree item filters.
+
 $Id$
 """
-
 import unittest
 
 from zope.interface import implements, directlyProvides
@@ -25,8 +25,6 @@
 
 from test_adapters import SampleContent
 
-__metaclass__ = type
-
 IRobot = InterfaceClass('IRobot', (), {})
 IHuman = InterfaceClass('IHuman', (), {})
 IAlien = InterfaceClass('IAlien', (), {})
@@ -67,16 +65,20 @@
 
     def test_only_interfaces_filter(self):
         filter = OnlyInterfacesFilter(IHuman)
-        self.assert_(self.filterAndCompare(filter, ('fry', 'farnesworth', 'zapp')))
+        self.assert_(self.filterAndCompare(filter,
+                                           ('fry', 'farnesworth', 'zapp')))
 
         # even if we add delivery boy to it, the list shouldn't change
         filter = OnlyInterfacesFilter(IHuman, IDeliveryBoy)
-        self.assert_(self.filterAndCompare(filter, ('fry', 'farnesworth', 'zapp')))
+        self.assert_(self.filterAndCompare(filter,
+                                           ('fry', 'farnesworth', 'zapp')))
 
         # Lur from Omicron Persei 8 is a starship captain too
         # (he also likes to eating hippies and destroying earth)
         filter = OnlyInterfacesFilter(IHuman, ISpaceShipCaptain)
-        self.assert_(self.filterAndCompare(filter, ('fry', 'farnesworth', 'zapp', 'lur')))
+        self.assert_(
+            self.filterAndCompare(filter,
+                                  ('fry', 'farnesworth', 'zapp', 'lur')))
 
     def test_all_but_interfaces_filter(self):
         # "death to all humans!"

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/test_node.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/test_node.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/tree/tests/test_node.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,19 +11,17 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Test tree node code.
+
 $Id$
 """
-
 import unittest
 from basetest import BaseTestCase
 from zope.interface import implements
 from zope.app.container.interfaces import IObjectFindFilter
 from zope.app.tree.node import Node
 
-__metaclass__ = type
-
-class FilterByObject:
+class FilterByObject(object):
     """Simple filter that filters out any objects that wasn't passed
     in as a valid object before
     """

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/tree/utils.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/tree/utils.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/tree/utils.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,13 +15,12 @@
 
 $Id$
 """
-
 import zlib
 
 from zope.interface import implements
 from zope.app.tree.interfaces import ITreeStateEncoder
 
-class TreeStateEncoder:
+class TreeStateEncoder(object):
     """Encodes tree state
 
     >>> expanded_nodes = ['a', 'c', 'foobar']

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/undo/tests/test_undoview.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/undo/tests/test_undoview.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/undo/tests/test_undoview.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -27,7 +27,7 @@
 from zope.app.undo.browser import UndoView
 from zope.app.security.principalregistry import principalRegistry
 
-class TestIUndoManager:
+class TestIUndoManager(object):
     implements(IUndoManager)
 
     def __init__(self):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/utility/browser/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/utility/browser/__init__.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/utility/browser/__init__.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -170,7 +170,7 @@
         return [d for ifname, name, d in L]
 
 
-class ConfigureUtility:
+class ConfigureUtility(object):
     def update(self):
         folder = zapi.getParent(self.context)
         iface = folder.resolve(self.request['interface'])

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/utility/browser/tests/test_registered.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/utility/browser/tests/test_registered.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/utility/browser/tests/test_registered.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -38,7 +38,7 @@
 class IStub(Interface):
     """Interface used to bind an absolute_url view to stub objects."""
 
-class Stub:
+class Stub(object):
     # Does triple duty as a stub for a registration, ay registration
     # stack, and a component!
 
@@ -71,7 +71,7 @@
     def __str__(self):
         return self.context.url
 
-class StubLocalUtilityService:
+class StubLocalUtilityService(object):
     def registrations(self, localOnly=False):
         return iter([
             Stub('', IFoo, "1"),

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/utility/tests.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/utility/tests.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/utility/tests.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -41,7 +41,7 @@
 class IBar(Interface): pass
 
 
-class Foo:
+class Foo(object):
     # We implement IRegistered and IDependable directly to
     # depend as little  as possible on other infrastructure.
     __name__ = __parent__ = None

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/browser/zptpage.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/browser/zptpage.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/browser/zptpage.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,7 +15,7 @@
 
 $Id$
 """
-class ZPTPageEval:
+class ZPTPageEval(object):
 
     def index(self, **kw):
         """Call a Page Template"""

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/tests/test_zptpage.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/tests/test_zptpage.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/tests/test_zptpage.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -114,7 +114,7 @@
         self.assertEquals(page.render(request), 'zpt\n')
 
 
-class DummyZPT:
+class DummyZPT(object):
 
     def __init__(self, source):
         self.source = source

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/tests/test_zptpageeval.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/tests/test_zptpageeval.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/tests/test_zptpageeval.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -24,14 +24,14 @@
 
     def testTemplateRendering(self):
 
-        class Template:
+        class Template(object):
             def render(self, request, **kw):
                 self.called = request, kw
                 return 42
 
             content_type = 'text/x-test'
 
-        class Folder:
+        class Folder(object):
             name='zope'
         folder = Folder()
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/zptpage.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/zptpage.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/zptpage/zptpage.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -31,8 +31,6 @@
 
 from interfaces import IZPTPage, IRenderZPTPage
 
-__metaclass__ = type
-
 class ZPTPage(AppPT, PageTemplate, Persistent, Contained):
 
     implements(IZPTPage, IRenderZPTPage)
@@ -86,7 +84,7 @@
         return self.pt_render(namespace)
 
 
-class Sized:
+class Sized(object):
 
     implements(ISized)
 
@@ -107,7 +105,7 @@
 
 # File-system access adapters
 
-class ZPTReadFile:
+class ZPTReadFile(object):
 
     implements(IReadFile)
 
@@ -120,7 +118,7 @@
     def size(self):
         return len(self.read())
 
-class ZPTWriteFile:
+class ZPTWriteFile(object):
 
     implements(IWriteFile)
 
@@ -132,7 +130,7 @@
         # so use it.
         self.context.setSource(data.decode('UTF-8'), None)
 
-class ZPTFactory:
+class ZPTFactory(object):
 
     implements(IFileFactory)
 
@@ -147,7 +145,7 @@
         page.setSource(data.decode('UTF-8'), content_type or 'text/html')
         return page
 
-class ZPTSourceView:
+class ZPTSourceView(object):
 
     def __init__(self, context, request):
         self.context = context

Modified: Zope3/branches/ZopeX3-3.0/src/zope/cachedescriptors/property.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/cachedescriptors/property.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/cachedescriptors/property.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,11 +15,9 @@
 
 $Id$
 """
-__metaclass__ = type
-
 ncaches = 0l
 
-class CachedProperty:
+class CachedProperty(object):
     """Cached Properties
 
     Cached properties are computed properties that cache their computed

Modified: Zope3/branches/ZopeX3-3.0/src/zope/cachedescriptors/tests/test_property.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/cachedescriptors/tests/test_property.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/cachedescriptors/tests/test_property.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -15,12 +15,10 @@
 
 $Id$
 """
-__metaclass__ = type
-
 from unittest import TestCase, TestSuite, main, makeSuite
 from zope.cachedescriptors.property import CachedProperty
 
-class C:
+class C(object):
 
     called0 = called1 = called2 = 0
     state1 = state2 = 0

Modified: Zope3/branches/ZopeX3-3.0/src/zope/component/tests/components.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/component/tests/components.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/component/tests/components.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,15 +11,13 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Components for testing
 
 $Id$
 """
-__metaclass__ = type # All classes are new style when run with Python 2.2+
-
 from zope.interface import Interface, Attribute, implements
 
-class RecordingAdapter:
+class RecordingAdapter(object):
 
     def __init__(self):
         self.record = []
@@ -48,10 +46,10 @@
 
 class IContent(Interface): pass
 
-class Content:
+class Content(object):
     implements(IContent)
 
-class Comp:
+class Comp(object):
     __used_for__ = IContent
     implements(IApp)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/interface/_flatten.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/interface/_flatten.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/interface/_flatten.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -17,8 +17,6 @@
 
 $Id$
 """
-__metaclass__ = type # All classes are new style when run with Python 2.2+
-
 from zope.interface import Declaration
 
 def _flatten(implements, include_None=0):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/interface/declarations.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/interface/declarations.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/interface/declarations.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -26,7 +26,6 @@
 
 $Id$
 """
-
 import sys
 import weakref
 from zope.interface.interface import InterfaceClass, Specification
@@ -38,9 +37,6 @@
 # Registry of class-implementation specifications 
 BuiltinImplementationSpecifications = {}
 
-
-__metaclass__ = type
-
 class Declaration(Specification):
     """Interface declarations
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/interface/tests/test_odd_declarations.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/interface/tests/test_odd_declarations.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/interface/tests/test_odd_declarations.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -18,7 +18,6 @@
 
 $Id$
 """
-
 import unittest, odd
 from zope.interface import Interface, implements, implementsOnly
 from zope.interface import directlyProvides, providedBy, directlyProvidedBy

Modified: Zope3/branches/ZopeX3-3.0/src/zope/pagetemplate/pagetemplate.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/pagetemplate/pagetemplate.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/pagetemplate/pagetemplate.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -17,8 +17,6 @@
 
 $Id$
 """
-__metaclass__ = type # All classes are new style when run with Python 2.2+
-
 import sys
 from zope.tal.talparser import TALParser
 from zope.tal.htmltalparser import HTMLTALParser
@@ -32,7 +30,7 @@
 import zope.interface
 
 
-class MacroCollection:
+class MacroCollection(object):
     def __get__(self, parent, type=None):
         parent._cook_check()
         return parent._v_macros
@@ -41,7 +39,7 @@
 _default_options = {}
 _error_start = '<!-- Page Template Diagnostics'
 
-class PageTemplate:
+class PageTemplate(object):
     """Page Templates using TAL, TALES, and METAL.
 
     Subclassing
@@ -206,7 +204,7 @@
         self._v_cooked = 1
 
 
-class TemplateUsage:
+class TemplateUsage(object):
     def __init__(self, value):
         if not isinstance(value, unicode):
             raise TypeError('TemplateUsage should be initialized with a '
@@ -233,7 +231,7 @@
     pass
 
 
-class PageTemplateTracebackSupplement:
+class PageTemplateTracebackSupplement(object):
     #implements(ITracebackSupplement)
 
     def __init__(self, pt, namespace):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/publisher/browser.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/publisher/browser.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/publisher/browser.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -33,8 +33,6 @@
 from zope.publisher.http import HTTPRequest, HTTPResponse
 from zope.publisher.base import BaseRequest
 
-__metaclass__ = type # All classes are new style when run with Python 2.2+
-
 __ArrayTypes = (ListType, TupleType)
 
 start_of_header_search=re.compile('(<head[^>]*>)', re.I).search
@@ -177,7 +175,7 @@
     }.has_key
 
 
-class Record:
+class Record(object):
 
     def __getattr__(self, key, default=None):
         if key in ('get', 'keys', 'items', 'values', 'copy',

Modified: Zope3/branches/ZopeX3-3.0/src/zope/security/checker.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/security/checker.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/security/checker.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -44,8 +44,6 @@
 from zope.security.management import thread_local
 from zope.security._proxy import _Proxy as Proxy, getChecker
 
-__metaclass__ = type
-
 if os.environ.get('ZOPE_WATCH_CHECKERS'):
     try:
         WATCH_CHECKERS = int(os.environ.get('ZOPE_WATCH_CHECKERS'))
@@ -173,7 +171,7 @@
 
 
 # Helper class for __traceback_supplement__
-class TracebackSupplement:
+class TracebackSupplement(object):
 
     def __init__(self, obj):
         self.obj = obj
@@ -427,7 +425,7 @@
             except ForbiddenAttribute:
                 raise unauthorized_exception
 
-class CheckerLoggingMixin:
+class CheckerLoggingMixin(object):
     """Debugging mixin for checkers.
 
     Prints verbose debugging information about every performed check to

Modified: Zope3/branches/ZopeX3-3.0/src/zope/security/tests/test_checker.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/security/tests/test_checker.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/security/tests/test_checker.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,10 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Security Checker tests
+
 $Id$
 """
-
 from unittest import TestCase, TestSuite, main, makeSuite
 from zope.interface import implements
 from zope.interface.verify import verifyObject
@@ -31,16 +31,14 @@
 from zope.security.proxy import Proxy
 import types, pickle
 
-__metaclass__ = type
-
-class SecurityPolicy:
+class SecurityPolicy(object):
     implements(ISecurityPolicy)
 
     def checkPermission(self, permission, object):
         'See ISecurityPolicy'
         return permission == 'test_allowed'
 
-class RecordedSecurityPolicy:
+class RecordedSecurityPolicy(object):
     implements(ISecurityPolicy)
 
     def __init__(self):
@@ -57,7 +55,7 @@
         self._checked = []
         return res
 
-class TransparentProxy:
+class TransparentProxy(object):
     def __init__(self, ob):
         self._ob = ob
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/server/ftp/tests/demofs.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/server/ftp/tests/demofs.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/server/ftp/tests/demofs.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -13,8 +13,6 @@
 
 $Id$
 """
-__metaclass__ = type
-
 import posixpath
 from zope.security.interfaces import Unauthorized
 from zope.server.interfaces.ftp import IFileSystem
@@ -25,7 +23,7 @@
 read = 2
 write = 4
 
-class File:
+class File(object):
     type = 'f'
     modified=None
 
@@ -70,7 +68,7 @@
     def __iter__(self):
         return iter(self.files)
 
-class DemoFileSystem:
+class DemoFileSystem(object):
     __doc__ = IFileSystem.__doc__
 
     implements(IFileSystem)
@@ -286,7 +284,7 @@
         f = d[name]
         return f.type == 'f' and f.accessable(self.user, write)
 
-class DemoFileSystemAccess:
+class DemoFileSystemAccess(object):
     __doc__ = IFileSystemAccess.__doc__
 
     implements(IFileSystemAccess)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/server/logger/pythonlogger.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/server/logger/pythonlogger.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/server/logger/pythonlogger.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
+"""Proxy between the server's and Python's logger interfaces.
 
 $Id$
 """
@@ -20,12 +20,8 @@
 from zope.server.interfaces.logger import IMessageLogger
 from zope.interface import implements
 
-__metaclass__ = type
-
-
 class PythonLogger:
-    """Proxy for Python's logging module
-    """
+    """Proxy for Python's logging module"""
 
     implements(IMessageLogger)
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/server/tests/asyncerror.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/server/tests/asyncerror.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/server/tests/asyncerror.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -22,14 +22,11 @@
 
 $Id$
 """
-
-__metaclass__ = type
-
 import asyncore
 import sys
 import traceback
 
-class AsyncoreErrorHook:
+class AsyncoreErrorHook(object):
     """Convert asyncore errors into unittest failures.
 
     Call hook_asyncore_error in setUp() and unhook_asyncore_error() in

Modified: Zope3/branches/ZopeX3-3.0/src/zope/tales/expressions.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/tales/expressions.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/tales/expressions.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -21,8 +21,6 @@
 from zope.tales.tales import _valid_name, _parse_expr, NAME_RE, Undefined
 from zope.tales.interfaces import ITALESExpression, ITALESFunctionNamespace
 
-__metaclass__ = type
-
 Undefs = (Undefined, AttributeError, KeyError, TypeError, IndexError)
 
 _marker = object()
@@ -43,7 +41,7 @@
     return object
 
 
-class SubPathExpr:
+class SubPathExpr(object):
 
     def __init__(self, path, traverser, engine):
         self._traverser = traverser
@@ -144,7 +142,7 @@
 
 
 
-class PathExpr:
+class PathExpr(object):
     """One or more subpath expressions, separated by '|'."""
     implements(ITALESExpression)
 
@@ -218,7 +216,7 @@
 
 _interp = re.compile(r'\$(%(n)s)|\${(%(n)s(?:/[^}]*)*)}' % {'n': NAME_RE})
 
-class StringExpr:
+class StringExpr(object):
     implements(ITALESExpression)
 
     def __init__(self, name, expr, engine):
@@ -261,7 +259,7 @@
         return '<StringExpr %s>' % `self._s`
 
 
-class NotExpr:
+class NotExpr(object):
     implements(ITALESExpression)
 
     def __init__(self, name, expr, engine):
@@ -275,7 +273,7 @@
         return '<NotExpr %s>' % `self._s`
 
 
-class DeferWrapper:
+class DeferWrapper(object):
     def __init__(self, expr, econtext):
         self._expr = expr
         self._econtext = econtext
@@ -287,7 +285,7 @@
         return self._expr(self._econtext)
 
 
-class DeferExpr:
+class DeferExpr(object):
     implements(ITALESExpression)
 
     def __init__(self, name, expr, compiler):
@@ -301,7 +299,7 @@
         return '<DeferExpr %s>' % `self._s`
 
 
-class SimpleModuleImporter:
+class SimpleModuleImporter(object):
     """Minimal module importer with no security."""
 
     def __getitem__(self, module):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/tales/tales.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/tales/tales.py	2004-08-12 19:44:26 UTC (rev 27078)
+++ Zope3/branches/ZopeX3-3.0/src/zope/tales/tales.py	2004-08-12 19:45:55 UTC (rev 27079)
@@ -17,8 +17,6 @@
 
 $Id$
 """
-__metaclass__ = type # All classes are new style when run with Python 2.2+
-
 import re
 
 from zope.interface import implements
@@ -488,7 +486,7 @@
         return len(self._seq)
 
 
-class ErrorInfo:
+class ErrorInfo(object):
     """Information about an exception passed to an on-error handler."""
     if tal:
         implements(ITALExpressionErrorInfo)
@@ -504,7 +502,7 @@
         self.offset = position[1]
 
 
-class ExpressionEngine:
+class ExpressionEngine(object):
     '''Expression Engine
 
     An instance of this class keeps a mutable collection of expression
@@ -613,7 +611,7 @@
         return CompilerError
 
 
-class Context:
+class Context(object):
     '''Expression Context
 
     An instance of this class holds context information that it can
@@ -732,7 +730,7 @@
         self.position = position
 
 
-class TALESTracebackSupplement:
+class TALESTracebackSupplement(object):
     """Implementation of zope.exceptions.ITracebackSupplement"""
 
     def __init__(self, context, expression):



More information about the Zope3-Checkins mailing list