[Zope3-checkins] SVN: Zope3/trunk/src/zope/ Converted as many
classes as possible to new style classes.
Stephan Richter
srichter at cosmos.phy.tufts.edu
Thu Jul 15 17:22:33 EDT 2004
Log message for revision 26559:
Converted as many classes as possible to new style classes.
Changed:
U Zope3/trunk/src/zope/app/annotation/tests/test_attributeannotations.py
U Zope3/trunk/src/zope/app/event/tests/test_objectevent.py
U Zope3/trunk/src/zope/app/locales/extract.py
U Zope3/trunk/src/zope/app/locales/pygettext.py
U Zope3/trunk/src/zope/app/principalannotation/tests.py
U Zope3/trunk/src/zope/app/publication/interfaces.py
U Zope3/trunk/src/zope/app/publication/tests/test_xmlrpcpublication.py
U Zope3/trunk/src/zope/app/publication/tests/test_zopepublication.py
U Zope3/trunk/src/zope/app/publication/xmlrpc.py
U Zope3/trunk/src/zope/app/registration/browser/__init__.py
U Zope3/trunk/src/zope/app/registration/browser/tests/test_registrationview.py
U Zope3/trunk/src/zope/app/registration/tests/iregistry.py
U Zope3/trunk/src/zope/app/registration/tests/test_registrations.py
U Zope3/trunk/src/zope/app/registration/tests/test_registrationstack.py
U Zope3/trunk/src/zope/app/registration/tests/test_registrationstatusproperty.py
U Zope3/trunk/src/zope/app/uniqueid/__init__.py
U Zope3/trunk/src/zope/app/uniqueid/browser/__init__.py
U Zope3/trunk/src/zope/app/uniqueid/interfaces.py
U Zope3/trunk/src/zope/app/uniqueid/tests.py
U Zope3/trunk/src/zope/component/presentation.py
U Zope3/trunk/src/zope/component/tests/request.py
U Zope3/trunk/src/zope/component/tests/test_api.py
U Zope3/trunk/src/zope/component/tests/test_presentation.py
U Zope3/trunk/src/zope/component/tests/test_utilityservice.py
U Zope3/trunk/src/zope/configuration/config.py
U Zope3/trunk/src/zope/configuration/fields.py
U Zope3/trunk/src/zope/configuration/tests/directives.py
U Zope3/trunk/src/zope/configuration/tests/samplepackage/foo.py
U Zope3/trunk/src/zope/configuration/tests/test_simple.py
U Zope3/trunk/src/zope/configuration/tests/test_xmlconfig.py
U Zope3/trunk/src/zope/configuration/xmlconfig.py
U Zope3/trunk/src/zope/dependencytool/finddeps.py
U Zope3/trunk/src/zope/dependencytool/importfinder.py
U Zope3/trunk/src/zope/dependencytool/tests/pkg/module.py
U Zope3/trunk/src/zope/documenttemplate/tests/dtmltestbase.py
U Zope3/trunk/src/zope/documenttemplate/tests/testdt_var.py
U Zope3/trunk/src/zope/documenttemplate/tests/testdt_with.py
U Zope3/trunk/src/zope/exceptions/exceptionformatter.py
U Zope3/trunk/src/zope/exceptions/tests/test_exceptionformatter.py
U Zope3/trunk/src/zope/fssync/command.py
U Zope3/trunk/src/zope/fssync/copier.py
U Zope3/trunk/src/zope/fssync/metadata.py
U Zope3/trunk/src/zope/fssync/server/syncer.py
U Zope3/trunk/src/zope/fssync/server/tests/test_syncer.py
U Zope3/trunk/src/zope/fssync/tests/test_passwd.py
U Zope3/trunk/src/zope/i18n/gettextmessagecatalog.py
U Zope3/trunk/src/zope/i18n/locales/xmlfactory.py
U Zope3/trunk/src/zope/i18n/negotiator.py
U Zope3/trunk/src/zope/i18n/simpletranslationdomain.py
U Zope3/trunk/src/zope/i18n/tests/test_formats.py
U Zope3/trunk/src/zope/i18n/tests/test_imessagecatalog.py
U Zope3/trunk/src/zope/i18n/tests/test_itranslationdomain.py
U Zope3/trunk/src/zope/i18n/tests/test_negotiator.py
U Zope3/trunk/src/zope/i18n/tests/testi18nawareobject.py
U Zope3/trunk/src/zope/i18nmessageid/messageid.py
U Zope3/trunk/src/zope/importtool/app.py
U Zope3/trunk/src/zope/importtool/hook.py
U Zope3/trunk/src/zope/importtool/reporter.py
U Zope3/trunk/src/zope/index/text/htmlsplitter.py
U Zope3/trunk/src/zope/index/text/lexicon.py
U Zope3/trunk/src/zope/index/text/nbest.py
U Zope3/trunk/src/zope/index/text/parsetree.py
U Zope3/trunk/src/zope/index/text/pipelinefactory.py
U Zope3/trunk/src/zope/index/text/queryparser.py
U Zope3/trunk/src/zope/index/text/ricecode.py
U Zope3/trunk/src/zope/index/text/tests/indexhtml.py
U Zope3/trunk/src/zope/index/text/tests/mhindex.py
U Zope3/trunk/src/zope/index/text/tests/test_lexicon.py
U Zope3/trunk/src/zope/index/text/tests/test_pipelinefactory.py
U Zope3/trunk/src/zope/index/text/tests/test_queryengine.py
U Zope3/trunk/src/zope/index/text/tests/test_queryparser.py
U Zope3/trunk/src/zope/index/topic/filter.py
U Zope3/trunk/src/zope/index/topic/tests/test_topicindex.py
U Zope3/trunk/src/zope/interface/common/tests/basemapping.py
U Zope3/trunk/src/zope/interface/declarations.py
U Zope3/trunk/src/zope/interface/interface.py
U Zope3/trunk/src/zope/interface/tests/odd.py
U Zope3/trunk/src/zope/interface/tests/test_advice.py
U Zope3/trunk/src/zope/interface/tests/test_declarations.py
U Zope3/trunk/src/zope/interface/tests/test_odd_declarations.py
U Zope3/trunk/src/zope/interface/tests/test_verify.py
U Zope3/trunk/src/zope/interface/tests/unitfixtures.py
U Zope3/trunk/src/zope/pagetemplate/tests/batch.py
U Zope3/trunk/src/zope/pagetemplate/tests/test_htmltests.py
U Zope3/trunk/src/zope/pagetemplate/tests/testpackage/content.py
U Zope3/trunk/src/zope/pagetemplate/tests/util.py
U Zope3/trunk/src/zope/proxy/tests/test_proxy.py
U Zope3/trunk/src/zope/publisher/browser.py
U Zope3/trunk/src/zope/publisher/http.py
U Zope3/trunk/src/zope/publisher/tests/basetestipublicationrequest.py
U Zope3/trunk/src/zope/publisher/tests/basetestipublisherrequest.py
U Zope3/trunk/src/zope/publisher/tests/publication.py
U Zope3/trunk/src/zope/publisher/tests/test_browserrequest.py
U Zope3/trunk/src/zope/publisher/tests/test_http.py
U Zope3/trunk/src/zope/publisher/tests/test_ipublication.py
U Zope3/trunk/src/zope/publisher/tests/test_mapply.py
U Zope3/trunk/src/zope/publisher/tests/test_publisher.py
U Zope3/trunk/src/zope/publisher/tests/test_xmlrpcmethodpublisher.py
U Zope3/trunk/src/zope/publisher/tests/test_xmlrpcrequest.py
U Zope3/trunk/src/zope/publisher/tests/views.py
U Zope3/trunk/src/zope/publisher/tests/xmlrpcviews.py
U Zope3/trunk/src/zope/schema/tests/states.py
U Zope3/trunk/src/zope/schema/tests/tabcomplete.py
U Zope3/trunk/src/zope/schema/tests/test_accessors.py
U Zope3/trunk/src/zope/schema/tests/test_listfield.py
U Zope3/trunk/src/zope/schema/tests/test_setfield.py
U Zope3/trunk/src/zope/schema/tests/test_tuplefield.py
U Zope3/trunk/src/zope/schema/tests/test_vocabulary.py
U Zope3/trunk/src/zope/security/examples/sandbox.py
U Zope3/trunk/src/zope/security/examples/sandbox_security.py
U Zope3/trunk/src/zope/security/interpreter.py
U Zope3/trunk/src/zope/security/simplepolicies.py
U Zope3/trunk/src/zope/security/tests/test_checker.py
U Zope3/trunk/src/zope/security/tests/test_management.py
U Zope3/trunk/src/zope/security/tests/test_proxy.py
U Zope3/trunk/src/zope/security/tests/test_simpleinteraction.py
U Zope3/trunk/src/zope/security/tests/test_standard_checkers.py
U Zope3/trunk/src/zope/server/adjustments.py
U Zope3/trunk/src/zope/server/buffers.py
U Zope3/trunk/src/zope/server/fixedstreamreceiver.py
U Zope3/trunk/src/zope/server/ftp/logger.py
U Zope3/trunk/src/zope/server/ftp/publisher.py
U Zope3/trunk/src/zope/server/ftp/server.py
U Zope3/trunk/src/zope/server/ftp/tests/fstests.py
U Zope3/trunk/src/zope/server/ftp/tests/test_publisher.py
U Zope3/trunk/src/zope/server/http/chunking.py
U Zope3/trunk/src/zope/server/http/commonaccesslogger.py
U Zope3/trunk/src/zope/server/http/httprequestparser.py
U Zope3/trunk/src/zope/server/http/httptask.py
U Zope3/trunk/src/zope/server/http/tests/test_httpserver.py
U Zope3/trunk/src/zope/server/http/tests/test_publisherserver.py
U Zope3/trunk/src/zope/server/linereceiver/linecommandparser.py
U Zope3/trunk/src/zope/server/linereceiver/linetask.py
U Zope3/trunk/src/zope/server/logger/filelogger.py
U Zope3/trunk/src/zope/server/logger/m_syslog.py
U Zope3/trunk/src/zope/server/logger/pythonlogger.py
U Zope3/trunk/src/zope/server/logger/resolvinglogger.py
U Zope3/trunk/src/zope/server/logger/taillogger.py
U Zope3/trunk/src/zope/server/logger/unresolvinglogger.py
U Zope3/trunk/src/zope/server/taskthreads.py
U Zope3/trunk/src/zope/tal/dummyengine.py
U Zope3/trunk/src/zope/tal/ndiff.py
U Zope3/trunk/src/zope/tal/taldefs.py
U Zope3/trunk/src/zope/tal/talgenerator.py
U Zope3/trunk/src/zope/tal/talgettext.py
U Zope3/trunk/src/zope/tal/talinterpreter.py
U Zope3/trunk/src/zope/tal/tests/test_xmlparser.py
U Zope3/trunk/src/zope/tal/translationcontext.py
U Zope3/trunk/src/zope/tal/xmlparser.py
U Zope3/trunk/src/zope/tales/pythonexpr.py
U Zope3/trunk/src/zope/tales/tales.py
U Zope3/trunk/src/zope/tales/tests/simpleexpr.py
U Zope3/trunk/src/zope/tales/tests/test_expressions.py
U Zope3/trunk/src/zope/tales/tests/test_tales.py
U Zope3/trunk/src/zope/testing/doctest.py
U Zope3/trunk/src/zope/xmlpickle/ppml.py
U Zope3/trunk/src/zope/xmlpickle/tests/test_xmlpickle.py
-=-
Modified: Zope3/trunk/src/zope/app/annotation/tests/test_attributeannotations.py
===================================================================
--- Zope3/trunk/src/zope/app/annotation/tests/test_attributeannotations.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/annotation/tests/test_attributeannotations.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -22,7 +22,7 @@
from zope.app.annotation.interfaces import IAttributeAnnotatable
from zope.interface import implements
-class Dummy:
+class Dummy(object):
implements(IAttributeAnnotatable)
class AttributeAnnotationsTest(IAnnotationsTest, CleanUp):
Modified: Zope3/trunk/src/zope/app/event/tests/test_objectevent.py
===================================================================
--- Zope3/trunk/src/zope/app/event/tests/test_objectevent.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/event/tests/test_objectevent.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,12 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Object Event Tests
-Revision information:
$Id$
"""
-
import unittest
import doctest
Modified: Zope3/trunk/src/zope/app/locales/extract.py
===================================================================
--- Zope3/trunk/src/zope/app/locales/extract.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/locales/extract.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -326,7 +326,7 @@
from zope.tal.htmltalparser import HTMLTALParser
engine = POEngine()
- class Devnull:
+ class Devnull(object):
def write(self, s):
pass
Modified: Zope3/trunk/src/zope/app/locales/pygettext.py
===================================================================
--- Zope3/trunk/src/zope/app/locales/pygettext.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/locales/pygettext.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -159,7 +159,7 @@
EMPTYSTRING = ''
-
+
# The normal pot-file header. msgmerge and Emacs's po-mode work better if it's
# there.
pot_header = _('''\
@@ -181,7 +181,7 @@
''')
-
+
def usage(code, msg=''):
print >> sys.stderr, _(__doc__) % globals()
if msg:
@@ -189,7 +189,6 @@
sys.exit(code)
-
escapes = []
def make_escapes(pass_iso8859):
@@ -242,8 +241,7 @@
return s
-
-class TokenEater:
+class TokenEater(object):
def __init__(self, options):
self.__options = options
self.__messages = {}
@@ -384,7 +382,7 @@
print >> fp, 'msgstr ""\n'
-
+
def main():
global default_keywords
try:
@@ -401,7 +399,7 @@
usage(1, msg)
# for holding option values
- class Options:
+ class Options(object):
# constants
GNU = 1
SOLARIS = 2
Modified: Zope3/trunk/src/zope/app/principalannotation/tests.py
===================================================================
--- Zope3/trunk/src/zope/app/principalannotation/tests.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/principalannotation/tests.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -27,7 +27,7 @@
from zope.interface import implements
from zope.app import zapi
-class Principal:
+class Principal(object):
implements(IPrincipal)
Modified: Zope3/trunk/src/zope/app/publication/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/publication/interfaces.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/publication/interfaces.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Publication Interfaces
$Id$
"""
@@ -31,7 +31,7 @@
"""An event which gets sent on publication traverse"""
-class BeforeTraverseEvent:
+class BeforeTraverseEvent(object):
"""An event which gets sent on publication traverse"""
implements(IBeforeTraverseEvent)
def __init__(self, ob, request):
@@ -43,7 +43,7 @@
"""An event which gets sent when the publication is ended"""
-class EndRequestEvent:
+class EndRequestEvent(object):
"""An event which gets sent when the publication is ended"""
implements(IEndRequestEvent)
def __init__(self, ob, request):
Modified: Zope3/trunk/src/zope/app/publication/tests/test_xmlrpcpublication.py
===================================================================
--- Zope3/trunk/src/zope/app/publication/tests/test_xmlrpcpublication.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/publication/tests/test_xmlrpcpublication.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -32,7 +32,7 @@
from zope.publisher.xmlrpc import TestRequest
-class SimpleObject:
+class SimpleObject(object):
def __init__(self, v):
self.v = v
@@ -48,7 +48,7 @@
def testTraverseName(self):
pub = self.klass(self.db)
- class C:
+ class C(object):
x = SimpleObject(1)
ob = C()
r = self._createRequest('/x', pub)
@@ -63,13 +63,13 @@
class I(Interface):
pass
- class C:
+ class C(object):
implements(I)
def foo(self):
return 'bar'
- class V:
+ class V(object):
def __init__(self, context, request):
pass
implements(IXMLRPCPresentation)
@@ -89,12 +89,12 @@
class I(Interface):
pass
- class C:
+ class C(object):
implements(I)
ob = C()
- class V:
+ class V(object):
def __init__(self, context, request):
pass
implements(IXMLRPCPresentation)
@@ -115,12 +115,12 @@
class I(Interface):
pass
- class C:
+ class C(object):
implements(I)
ob = C()
- class V:
+ class V(object):
implements(IXMLRPCPresentation)
def __init__(self, context, request):
@@ -144,7 +144,7 @@
def testTraverseNameServices(self):
pub = self.klass(self.db)
- class C:
+ class C(object):
def getSiteManager(self):
return SimpleObject(1)
ob = C()
Modified: Zope3/trunk/src/zope/app/publication/tests/test_zopepublication.py
===================================================================
--- Zope3/trunk/src/zope/app/publication/tests/test_zopepublication.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/publication/tests/test_zopepublication.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -51,7 +51,7 @@
from zope.app.folder import Folder, rootFolder
from zope.app.location import Location
-class Principal:
+class Principal(object):
implements(IPrincipal)
def __init__(self, id):
self.id = id
@@ -61,7 +61,7 @@
class UnauthenticatedPrincipal(Principal):
implements(IUnauthenticatedPrincipal)
-class AuthService1:
+class AuthService1(object):
def authenticate(self, request):
return None
@@ -83,7 +83,7 @@
def getPrincipal(self, id):
return Principal(id)
-class ErrorLoggingService:
+class ErrorLoggingService(object):
implements(IErrorReportingService)
def __init__(self):
@@ -92,7 +92,7 @@
def raising(self, info, request=None):
self.exceptions.append([info, request])
-class ServiceManager:
+class ServiceManager(object):
implements(IServiceService) # a dirty lie
def __init__(self, auth):
@@ -234,7 +234,7 @@
def testExceptionSideEffects(self):
from zope.publisher.interfaces import IExceptionSideEffects
- class SideEffects:
+ class SideEffects(object):
implements(IExceptionSideEffects)
def __init__(self, exception):
self.exception = exception
Modified: Zope3/trunk/src/zope/app/publication/xmlrpc.py
===================================================================
--- Zope3/trunk/src/zope/app/publication/xmlrpc.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/publication/xmlrpc.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -77,7 +77,7 @@
return super(XMLRPCPublication, self).traverseName(request, ob, name)
# For now, have a factory that returns a singleton
-class XMLRPCPublicationFactory:
+class XMLRPCPublicationFactory(object):
def __init__(self, db):
self.__pub = XMLRPCPublication(db)
Modified: Zope3/trunk/src/zope/app/registration/browser/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/registration/browser/__init__.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/registration/browser/__init__.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -67,7 +67,7 @@
return self.registrations[0]
-class Registered:
+class Registered(object):
def __init__(self, context, request):
self.context = context
Modified: Zope3/trunk/src/zope/app/registration/browser/tests/test_registrationview.py
===================================================================
--- Zope3/trunk/src/zope/app/registration/browser/tests/test_registrationview.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/registration/browser/tests/test_registrationview.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -138,11 +138,10 @@
>>> view.update()
>>> request.response.getStatus()
302
-
"""
-class FakeRegisterable:
+class FakeRegisterable(object):
implements(IRegistered)
def __init__(self, usages):
@@ -151,7 +150,7 @@
def registrations(self):
return self._usages
-class FakeRegistration:
+class FakeRegistration(object):
def __init__(self, status):
self.status = status
Modified: Zope3/trunk/src/zope/app/registration/tests/iregistry.py
===================================================================
--- Zope3/trunk/src/zope/app/registration/tests/iregistry.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/registration/tests/iregistry.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -19,7 +19,7 @@
from zope.interface.verify import verifyObject
from zope.app.location import inside
-class TestingIRegistry:
+class TestingIRegistry(object):
"""Base class for testing implementors of IRegistry
Subclasses must implement:
Modified: Zope3/trunk/src/zope/app/registration/tests/test_registrations.py
===================================================================
--- Zope3/trunk/src/zope/app/registration/tests/test_registrations.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/registration/tests/test_registrations.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -167,7 +167,7 @@
self.assertEquals(result, component)
self.failUnless(type(result) is Proxy)
-class TestComponentRegistrationEvents:
+class TestComponentRegistrationEvents(object):
def test_addNotify(self):
"""
First we create a dummy registration
@@ -210,7 +210,7 @@
"""
-class TestRegisterableEvents:
+class TestRegisterableEvents(object):
"""Tests handling of registered component rename.
>>> sm = PlacefulSetup().setUp(site=True)
@@ -264,7 +264,7 @@
>>> PlacefulSetup().tearDown()
"""
-class TestRegisterableCopier:
+class TestRegisterableCopier(object):
"""Tests the copier for registerable components.
>>> sm = PlacefulSetup().setUp(site=True)
Modified: Zope3/trunk/src/zope/app/registration/tests/test_registrationstack.py
===================================================================
--- Zope3/trunk/src/zope/app/registration/tests/test_registrationstack.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/registration/tests/test_registrationstack.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -20,7 +20,7 @@
from zope.app.registration.registration import RegistrationStack
from zope.app.traversing.api import traverse
-class Registration:
+class Registration(object):
active = 0
registry = None
Modified: Zope3/trunk/src/zope/app/registration/tests/test_registrationstatusproperty.py
===================================================================
--- Zope3/trunk/src/zope/app/registration/tests/test_registrationstatusproperty.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/registration/tests/test_registrationstatusproperty.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -40,7 +40,7 @@
serviceType = "Utilities"
-class TestingServiceManager:
+class TestingServiceManager(object):
implements(IServiceService) # I lied
Modified: Zope3/trunk/src/zope/app/uniqueid/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/uniqueid/__init__.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/uniqueid/__init__.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,8 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-Unique id utility.
+"""Unique id utility.
This utility assigns unique integer ids to objects and allows lookups
by object and by id.
@@ -32,7 +31,7 @@
from zope.security.proxy import trustedRemoveSecurityProxy
from zope.event import notify
-class UniqueIdUtility:
+class UniqueIdUtility(object):
"""This utility provides a two way mapping between objects and
integer ids.
@@ -95,7 +94,7 @@
del self.ids[ref]
-class ReferenceToPersistent:
+class ReferenceToPersistent(object):
"""An IReference for persistent object which is comparable.
These references compare by _p_oids of the objects they reference.
Modified: Zope3/trunk/src/zope/app/uniqueid/browser/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/uniqueid/browser/__init__.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/uniqueid/browser/__init__.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,16 +11,14 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-Unique id utility views.
+"""Unique id utility views.
$Id$
"""
-
from zope.security.proxy import trustedRemoveSecurityProxy
from zope.app import zapi
-class UniqueIdUtilityView:
+class UniqueIdUtilityView(object):
def len(self):
return len(trustedRemoveSecurityProxy(self.context).refs)
Modified: Zope3/trunk/src/zope/app/uniqueid/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/uniqueid/interfaces.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/uniqueid/interfaces.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -70,7 +70,7 @@
"""The IObjectRemoveEvent related to this event""")
-class UniqueIdRemovedEvent:
+class UniqueIdRemovedEvent(object):
"""The event which get published before the unique id is removed
from the utility so that the catalogs can unindex the object.
"""
Modified: Zope3/trunk/src/zope/app/uniqueid/tests.py
===================================================================
--- Zope3/trunk/src/zope/app/uniqueid/tests.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/app/uniqueid/tests.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,8 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-Tests for the unique id utility.
+"""Tests for the unique id utility.
$Id$
"""
@@ -34,7 +33,7 @@
implements(ILocation)
-class ConnectionStub:
+class ConnectionStub(object):
next = 1
def add(self, ob):
ob._p_jar = self
@@ -42,7 +41,7 @@
self.next += 1
-class ReferenceSetupMixin:
+class ReferenceSetupMixin(object):
"""Registers adapters ILocation->IConnection and IPersistent->IReference"""
def setUp(self):
from zope.app.uniqueid import connectionOfPersistent
Modified: Zope3/trunk/src/zope/component/presentation.py
===================================================================
--- Zope3/trunk/src/zope/component/presentation.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/component/presentation.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -97,7 +97,7 @@
>>> class IRequest(zope.interface.Interface):
... "Demonstration request type"
- >>> class Request:
+ >>> class Request(object):
... zope.interface.implements(IRequest)
... def getPresentationSkin(self):
... return getattr(self, 'skin', None)
@@ -108,7 +108,7 @@
With this in place, we can start registering resources. A resource
is just a request adapter.
- >>> class MyResource:
+ >>> class MyResource(object):
... def __init__(self, request):
... self.request = request
@@ -145,7 +145,7 @@
>>> class IContact(zope.interface.Interface):
... "Demonstration content type"
- >>> class MyView:
+ >>> class MyView(object):
... def __init__(self, context, request):
... self.context, self.request = context, request
@@ -155,7 +155,7 @@
When defining views, we provide one or more (typically 1) context
interfaces, corresponding to the contexts of the view.
- >>> class Contact:
+ >>> class Contact(object):
... zope.interface.implements(IContact)
>>> c = Contact()
@@ -177,7 +177,7 @@
>>> class ITraverse(zope.interface.Interface):
... "Sample traversal interface (imagine interesting methods :)"
- >>> class Traverser:
+ >>> class Traverser(object):
... zope.interface.implements(ITraverse)
... def __init__(self, context, request):
... self.context, self.request = context, request
Modified: Zope3/trunk/src/zope/component/tests/request.py
===================================================================
--- Zope3/trunk/src/zope/component/tests/request.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/component/tests/request.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,14 +11,13 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Request for tests
$Id$
"""
-
import zope.interface
-class Request:
+class Request(object):
def __init__(self, type, skin=''):
self._skin = skin
Modified: Zope3/trunk/src/zope/component/tests/test_api.py
===================================================================
--- Zope3/trunk/src/zope/component/tests/test_api.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/component/tests/test_api.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -39,17 +39,17 @@
class I3(Interface):
pass
-class Comp:
+class Comp(object):
implements(I2)
def __init__(self, context, request=None): self.context = context
-class Comp2:
+class Comp2(object):
implements(I3)
def __init__(self, context, request=None): self.context = context
comp = Comp(1)
-class Ob:
+class Ob(object):
implements(I1)
def __conform__(self, i):
if i is IServiceService:
@@ -64,7 +64,7 @@
else:
return Ob.__conform__(self, i)
-class StubServiceService:
+class StubServiceService(object):
implements(IServiceService) # This is a lie.
def __init__(self):
@@ -80,7 +80,7 @@
raise ComponentLookupError, name
-class ConformsToIServiceService:
+class ConformsToIServiceService(object):
def __init__(self, serviceservice):
self.serviceservice = serviceservice
@@ -156,7 +156,7 @@
pass
class I2(Interface):
pass
- class C:
+ class C(object):
implements(I1)
def __conform__(self, iface, default=None):
if iface == I2:
@@ -168,7 +168,7 @@
context = ConformsToIServiceService(servicemanager)
class I3(Interface):
pass
- class StubAdapterService:
+ class StubAdapterService(object):
def queryAdapter(self, ob, iface, name, default=None):
if iface is I3:
return 43
@@ -238,12 +238,12 @@
def testQueryMultiAdapter(self):
# Adapting a combination of 2 objects to an interface
- class DoubleAdapter:
+ class DoubleAdapter(object):
implements(I3)
def __init__(self, first, second):
self.first = first
self.second = second
- class Ob2:
+ class Ob2(object):
implements(I2)
ob2 = Ob2()
context = None
@@ -372,7 +372,7 @@
from zope.component import queryMultiView, getService
from zope.component.exceptions import ComponentLookupError
- class Ob2:
+ class Ob2(object):
implements(I2)
ob2 = Ob2()
@@ -382,7 +382,7 @@
request = Request(IRequest)
- class MV:
+ class MV(object):
implements(I3)
def __init__(self, context, other, request):
self.context, self.other, self.request = context, other, request
Modified: Zope3/trunk/src/zope/component/tests/test_presentation.py
===================================================================
--- Zope3/trunk/src/zope/component/tests/test_presentation.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/component/tests/test_presentation.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""XXX short summary goes here.
+"""Presentation Serivce tests
$Id$
"""
@@ -23,7 +23,7 @@
class IRequest(zope.interface.Interface):
"Demonstration request type"
-class Request:
+class Request(object):
zope.interface.implements(IRequest)
def getPresentationSkin(self):
return getattr(self, 'skin', None)
@@ -31,10 +31,10 @@
class IContact(zope.interface.Interface):
"Demonstration content type"
-class Contact:
+class Contact(object):
zope.interface.implements(IContact)
-class MyView:
+class MyView(object):
def __init__(self, context, request):
self.context, self.request = context, request
@@ -61,7 +61,7 @@
class ICompany(zope.interface.Interface):
"Demonstration content type"
-class Company:
+class Company(object):
zope.interface.implements(ICompany)
class ContactInCompanyView:
@@ -71,10 +71,10 @@
class IFamily(zope.interface.Interface):
"Demonstration content type"
-class Family:
+class Family(object):
zope.interface.implements(IFamily)
-class ContactInFamilyView:
+class ContactInFamilyView(object):
def __init__(self, contact, family, request):
self.contact, self.family, self.request = contact, family, request
@@ -223,7 +223,7 @@
>>> request = Request()
- >>> class MyResource:
+ >>> class MyResource(object):
... def __init__(self, request):
... self.request = request
>>> s.provideAdapter(IRequest, MyResource, name='foo', layer='custom')
Modified: Zope3/trunk/src/zope/component/tests/test_utilityservice.py
===================================================================
--- Zope3/trunk/src/zope/component/tests/test_utilityservice.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/component/tests/test_utilityservice.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -31,18 +31,18 @@
class IDummerUtility(IDummyUtility):
pass
-class DummyUtility:
+class DummyUtility(object):
__name__ = 'DummyUtility'
implements(IDummyUtility)
-class DummyUtility2:
+class DummyUtility2(object):
implements(IDummyUtility)
__name__ = 'DummyUtility2'
def __len__(self):
return 0
-class DummerUtility:
+class DummerUtility(object):
__name__ = 'DummerUtility'
implements(IDummerUtility)
Modified: Zope3/trunk/src/zope/configuration/config.py
===================================================================
--- Zope3/trunk/src/zope/configuration/config.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/configuration/config.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -848,7 +848,7 @@
We need a handler for the complex directive. This is a class
with a method for each subdirective:
- >>> class Handler:
+ >>> class Handler(object):
... def __init__(self, context, x, y):
... self.context, self.x, self.y = context, x, y
... context.action('init', f)
Modified: Zope3/trunk/src/zope/configuration/fields.py
===================================================================
--- Zope3/trunk/src/zope/configuration/fields.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/configuration/fields.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -31,7 +31,7 @@
Let's look at an example:
- >>> class FauxContext:
+ >>> class FauxContext(object):
... pass
>>> context = FauxContext()
>>> field = PythonIdentifier().bind(context)
@@ -214,7 +214,7 @@
We'll be careful to do this in an os-independent fashion.
- >>> class FauxContext:
+ >>> class FauxContext(object):
... def path(self, p):
... return os.path.join(os.sep, 'faux', 'context', p)
@@ -286,11 +286,11 @@
When a string is converted to a message ID, it is also
recorded in the context.
- >>> class Info:
+ >>> class Info(object):
... file = 'file location'
... line = 8
- >>> class FauxContext:
+ >>> class FauxContext(object):
... i18n_strings = {}
... info = Info()
Modified: Zope3/trunk/src/zope/configuration/tests/directives.py
===================================================================
--- Zope3/trunk/src/zope/configuration/tests/directives.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/configuration/tests/directives.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -15,7 +15,6 @@
$Id$
"""
-
from zope.interface import Interface, implements
from zope.schema import Text, BytesLine
from zope.configuration.config import GroupingContextDecorator
@@ -23,7 +22,7 @@
from zope.configuration.fields import GlobalObject
-class F:
+class F(object):
def __repr__(self):
return 'f'
def __call__(self, *a, **k):
@@ -63,7 +62,7 @@
def factory(context, factory):
context.action(('factory', 1,2), factory)
-class Complex:
+class Complex(object):
def __init__(self, context, a, c, b=u"xxx"):
self.a, self.b, self.c = a, b, c
Modified: Zope3/trunk/src/zope/configuration/tests/samplepackage/foo.py
===================================================================
--- Zope3/trunk/src/zope/configuration/tests/samplepackage/foo.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/configuration/tests/samplepackage/foo.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -24,7 +24,7 @@
x = schema.BytesLine()
y = schema.Int()
-class stuff:
+class stuff(object):
def __init__(self, args, info, basepath, package, includepath):
(self.args, self.info, self.basepath, self.package, self.includepath
) = args, info, basepath, package, includepath
Modified: Zope3/trunk/src/zope/configuration/tests/test_simple.py
===================================================================
--- Zope3/trunk/src/zope/configuration/tests/test_simple.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/configuration/tests/test_simple.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -188,7 +188,7 @@
required = False
)
-class FileInfo:
+class FileInfo(object):
def __init__(self, path, title, description, info):
(self.path, self.title, self.description, self.info
Modified: Zope3/trunk/src/zope/configuration/tests/test_xmlconfig.py
===================================================================
--- Zope3/trunk/src/zope/configuration/tests/test_xmlconfig.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/configuration/tests/test_xmlconfig.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -15,7 +15,6 @@
$Id$
"""
-
import unittest
import os
from zope.testing.doctestunit import DocTestSuite
@@ -24,7 +23,7 @@
from pprint import PrettyPrinter, pprint
-class FauxLocator:
+class FauxLocator(object):
def __init__(self, file, line, column):
self.file, self.line, self.column = file, line, column
def getSystemId(self):
@@ -34,7 +33,7 @@
def getColumnNumber(self):
return self.column
-class FauxContext:
+class FauxContext(object):
def setInfo(self, info):
self.info = info
Modified: Zope3/trunk/src/zope/configuration/xmlconfig.py
===================================================================
--- Zope3/trunk/src/zope/configuration/xmlconfig.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/configuration/xmlconfig.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -79,7 +79,7 @@
else:
return str(v)
-class ParserInfo:
+class ParserInfo(object):
"""Information about a directive based on parser data
This includes the directive location, as well as text data
@@ -472,7 +472,7 @@
addCleanUp(_clearContext)
return _context
-class XMLConfig:
+class XMLConfig(object):
"""Provide high-level handling of configuration files.
See examples in tests/text_xmlconfig.py
Modified: Zope3/trunk/src/zope/dependencytool/finddeps.py
===================================================================
--- Zope3/trunk/src/zope/dependencytool/finddeps.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/dependencytool/finddeps.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -274,7 +274,7 @@
print
-class DependencyOptions:
+class DependencyOptions(object):
all = False
long = False
Modified: Zope3/trunk/src/zope/dependencytool/importfinder.py
===================================================================
--- Zope3/trunk/src/zope/dependencytool/importfinder.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/dependencytool/importfinder.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -15,7 +15,6 @@
$Id$
"""
-
import sys
import token
import tokenize
@@ -39,7 +38,7 @@
dotjoin = ".".join
-class ImportFinder:
+class ImportFinder(object):
def __init__(self, packages=False):
"""Initialize the import finder.
Modified: Zope3/trunk/src/zope/dependencytool/tests/pkg/module.py
===================================================================
--- Zope3/trunk/src/zope/dependencytool/tests/pkg/module.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/dependencytool/tests/pkg/module.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -16,5 +16,5 @@
$Id$
"""
-class SomeClass:
+class SomeClass(object):
"""Simple class with little to offer."""
Modified: Zope3/trunk/src/zope/documenttemplate/tests/dtmltestbase.py
===================================================================
--- Zope3/trunk/src/zope/documenttemplate/tests/dtmltestbase.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/documenttemplate/tests/dtmltestbase.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -32,7 +32,7 @@
return res
-class ObjectStub:
+class ObjectStub(object):
def __init__(self, **kw):
for k, v in kw.items():
self.__dict__[k]=v
Modified: Zope3/trunk/src/zope/documenttemplate/tests/testdt_var.py
===================================================================
--- Zope3/trunk/src/zope/documenttemplate/tests/testdt_var.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/documenttemplate/tests/testdt_var.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -93,7 +93,7 @@
def testRender(self):
# Test automatic rendering of callable objects
- class C:
+ class C(object):
x = 1
def y(self): return self.x * 2
h = self.doc_class(u"The h method, <dtml-var x> <dtml-var y>")
Modified: Zope3/trunk/src/zope/documenttemplate/tests/testdt_with.py
===================================================================
--- Zope3/trunk/src/zope/documenttemplate/tests/testdt_with.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/documenttemplate/tests/testdt_with.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -14,14 +14,13 @@
$Id$
"""
-
import unittest
from zope.documenttemplate.tests.dtmltestbase import DTMLTestBase
class TestDT_With(DTMLTestBase):
def testBasic(self):
- class person:
+ class person(object):
name=u'Jim'
height_inches=73
Modified: Zope3/trunk/src/zope/exceptions/exceptionformatter.py
===================================================================
--- Zope3/trunk/src/zope/exceptions/exceptionformatter.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/exceptions/exceptionformatter.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -22,7 +22,7 @@
DEBUG_EXCEPTION_FORMATTER = 1
-class TextExceptionFormatter:
+class TextExceptionFormatter(object):
line_sep = '\n'
show_revisions = 0
Modified: Zope3/trunk/src/zope/exceptions/tests/test_exceptionformatter.py
===================================================================
--- Zope3/trunk/src/zope/exceptions/tests/test_exceptionformatter.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/exceptions/tests/test_exceptionformatter.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -38,7 +38,7 @@
-class TestingTracebackSupplement:
+class TestingTracebackSupplement(object):
source_url = '/somepath'
line = 634
@@ -127,7 +127,7 @@
self.fail('no exception occurred')
def testQuoteLastLine(self):
- class C: pass
+ class C(object): pass
try: raise TypeError, C()
except:
s = tb(1)
Modified: Zope3/trunk/src/zope/fssync/command.py
===================================================================
--- Zope3/trunk/src/zope/fssync/command.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/fssync/command.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -18,7 +18,6 @@
$Id$
"""
-
import getopt
import os.path
import sys
@@ -34,7 +33,7 @@
"""
-class Command:
+class Command(object):
def __init__(self, name=None, usage=None):
if name is None:
Modified: Zope3/trunk/src/zope/fssync/copier.py
===================================================================
--- Zope3/trunk/src/zope/fssync/copier.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/fssync/copier.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -15,14 +15,13 @@
$Id$
"""
-
import os
import shutil
from zope.fssync import fsutil
-class FileCopier:
+class FileCopier(object):
"""Copy from a normal file tree into an fssync checkout."""
def __init__(self, sync):
Modified: Zope3/trunk/src/zope/fssync/metadata.py
===================================================================
--- Zope3/trunk/src/zope/fssync/metadata.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/fssync/metadata.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -84,7 +84,7 @@
raise IOError, tuple(errors)
-class DirectoryManager:
+class DirectoryManager(object):
def __init__(self, dir):
self.zdir = join(dir, "@@Zope")
self.efile = join(self.zdir, "Entries.xml")
Modified: Zope3/trunk/src/zope/fssync/server/syncer.py
===================================================================
--- Zope3/trunk/src/zope/fssync/server/syncer.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/fssync/server/syncer.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,8 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Basic server-side synchronizer."""
+"""Basic server-side synchronizer.
+$Id$
+"""
import os
from zope.fssync import metadata
@@ -27,7 +29,7 @@
f.close()
-class Syncer:
+class Syncer(object):
def __init__(self, getObjectId, getSerializer,
getAnnotations=lambda obj: None):
Modified: Zope3/trunk/src/zope/fssync/server/tests/test_syncer.py
===================================================================
--- Zope3/trunk/src/zope/fssync/server/tests/test_syncer.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/fssync/server/tests/test_syncer.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,8 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Tests for the general synchronizer."""
+"""Tests for the general synchronizer.
+$Id$
+"""
import os
import shutil
import tempfile
@@ -26,7 +28,7 @@
pass
-class MySerializer:
+class MySerializer(object):
implements(interfaces.IObjectDirectory)
Modified: Zope3/trunk/src/zope/fssync/tests/test_passwd.py
===================================================================
--- Zope3/trunk/src/zope/fssync/tests/test_passwd.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/fssync/tests/test_passwd.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -15,7 +15,6 @@
$Id$
"""
-
import os
import tempfile
import unittest
@@ -23,7 +22,7 @@
from zope.fssync import passwd
-class PasswordGetter:
+class PasswordGetter(object):
"""PasswordManager.getPassword() replacement to use in the tests."""
def __call__(self, user, host_port):
Modified: Zope3/trunk/src/zope/i18n/gettextmessagecatalog.py
===================================================================
--- Zope3/trunk/src/zope/i18n/gettextmessagecatalog.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/i18n/gettextmessagecatalog.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -20,12 +20,12 @@
from zope.interface import implements
-class _KeyErrorRaisingFallback:
+class _KeyErrorRaisingFallback(object):
def ugettext(self, message):
raise KeyError, message
-class GettextMessageCatalog:
+class GettextMessageCatalog(object):
"""A message catalog based on GNU gettext and Python's gettext module."""
implements(IGlobalMessageCatalog)
Modified: Zope3/trunk/src/zope/i18n/locales/xmlfactory.py
===================================================================
--- Zope3/trunk/src/zope/i18n/locales/xmlfactory.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/i18n/locales/xmlfactory.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -23,7 +23,7 @@
from zope.i18n.locales import LocaleFormat, LocaleFormatLength, dayMapping
from zope.i18n.locales.inheritance import InheritingDictionary
-class LocaleFactory:
+class LocaleFactory(object):
"""This class creates a Locale object from an ICU XML file."""
def __init__(self, path):
Modified: Zope3/trunk/src/zope/i18n/negotiator.py
===================================================================
--- Zope3/trunk/src/zope/i18n/negotiator.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/i18n/negotiator.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -33,7 +33,7 @@
n_langs[normalize_lang(l)] = l
return n_langs
-class Negotiator:
+class Negotiator(object):
implements(INegotiator)
def getLanguage(self, langs, env):
Modified: Zope3/trunk/src/zope/i18n/simpletranslationdomain.py
===================================================================
--- Zope3/trunk/src/zope/i18n/simpletranslationdomain.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/i18n/simpletranslationdomain.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -20,7 +20,7 @@
from zope.i18n.interfaces import ITranslationDomain, INegotiator
from zope.i18n import interpolate
-class SimpleTranslationDomain:
+class SimpleTranslationDomain(object):
"""This is the simplest implementation of the ITranslationDomain I
could come up with.
Modified: Zope3/trunk/src/zope/i18n/tests/test_formats.py
===================================================================
--- Zope3/trunk/src/zope/i18n/tests/test_formats.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/i18n/tests/test_formats.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -28,10 +28,10 @@
from zope.i18n.format import NumberFormat
from zope.i18n.format import parseNumberPattern
-class LocaleStub:
+class LocaleStub(object):
pass
-class LocaleCalendarStub:
+class LocaleCalendarStub(object):
type = u'gregorian'
Modified: Zope3/trunk/src/zope/i18n/tests/test_imessagecatalog.py
===================================================================
--- Zope3/trunk/src/zope/i18n/tests/test_imessagecatalog.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/i18n/tests/test_imessagecatalog.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -20,7 +20,7 @@
from zope.i18n.interfaces import IMessageCatalog
-class TestIMessageCatalog:
+class TestIMessageCatalog(object):
# This should be overwritten by every class that inherits this test
Modified: Zope3/trunk/src/zope/i18n/tests/test_itranslationdomain.py
===================================================================
--- Zope3/trunk/src/zope/i18n/tests/test_itranslationdomain.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/i18n/tests/test_itranslationdomain.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -27,7 +27,7 @@
from zope.i18n.interfaces import INegotiator, IUserPreferredLanguages
from zope.i18n.interfaces import ITranslationDomain
-class Environment:
+class Environment(object):
implements(IUserPreferredLanguages)
Modified: Zope3/trunk/src/zope/i18n/tests/test_negotiator.py
===================================================================
--- Zope3/trunk/src/zope/i18n/tests/test_negotiator.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/i18n/tests/test_negotiator.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -22,7 +22,7 @@
from zope.component.tests.placelesssetup import PlacelessSetup
from zope.interface import implements
-class Env:
+class Env(object):
implements(IUserPreferredLanguages)
def __init__(self, langs=()):
Modified: Zope3/trunk/src/zope/i18n/tests/testi18nawareobject.py
===================================================================
--- Zope3/trunk/src/zope/i18n/tests/testi18nawareobject.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/i18n/tests/testi18nawareobject.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -22,7 +22,7 @@
from zope.interface import implements
-class I18nAwareContentObject:
+class I18nAwareContentObject(object):
implements(II18nAware)
Modified: Zope3/trunk/src/zope/i18nmessageid/messageid.py
===================================================================
--- Zope3/trunk/src/zope/i18nmessageid/messageid.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/i18nmessageid/messageid.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -93,7 +93,7 @@
self.mapping = mapping
-class MessageIDFactory:
+class MessageIDFactory(object):
"""Factory for creating MessageIDs."""
def __init__(self, domain):
Modified: Zope3/trunk/src/zope/importtool/app.py
===================================================================
--- Zope3/trunk/src/zope/importtool/app.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/importtool/app.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -48,7 +48,7 @@
options.reporter.display_report()
-class Options:
+class Options(object):
known_options = ["--first-import", "--cyclic-imports"]
Modified: Zope3/trunk/src/zope/importtool/hook.py
===================================================================
--- Zope3/trunk/src/zope/importtool/hook.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/importtool/hook.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -27,12 +27,11 @@
$Id$
"""
-
import __builtin__
import sys
-class ReportingHook:
+class ReportingHook(object):
def __init__(self, reporter):
self.reporter = reporter
Modified: Zope3/trunk/src/zope/importtool/reporter.py
===================================================================
--- Zope3/trunk/src/zope/importtool/reporter.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/importtool/reporter.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,12 +11,12 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Import Reporter
$Id$
"""
-class Reporter:
+class Reporter(object):
"""Trivial implementation of the reporter interface."""
def request(self, importer, name, fromlist):
Modified: Zope3/trunk/src/zope/index/text/htmlsplitter.py
===================================================================
--- Zope3/trunk/src/zope/index/text/htmlsplitter.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/text/htmlsplitter.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,7 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""HTML Splitter
+$Id$
+"""
import re
from zope.interface import implements
@@ -20,7 +23,7 @@
from zope.index.text.pipelinefactory import element_factory
-class HTMLWordSplitter:
+class HTMLWordSplitter(object):
implements(ISplitter)
Modified: Zope3/trunk/src/zope/index/text/lexicon.py
===================================================================
--- Zope3/trunk/src/zope/index/text/lexicon.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/text/lexicon.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -155,7 +155,7 @@
# Sample pipeline elements
-class Splitter:
+class Splitter(object):
rx = re.compile(r"(?u)\w+")
rxGlob = re.compile(r"(?u)\w+[\w*?]*") # See globToWordIds() above
@@ -176,7 +176,7 @@
'Whitespace splitter',
Splitter)
-class CaseNormalizer:
+class CaseNormalizer(object):
def process(self, lst):
return [w.lower() for w in lst]
@@ -189,7 +189,7 @@
' Don\'t remove stop words',
None)
-class StopWordRemover:
+class StopWordRemover(object):
dict = get_stopdict().copy()
Modified: Zope3/trunk/src/zope/index/text/nbest.py
===================================================================
--- Zope3/trunk/src/zope/index/text/nbest.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/text/nbest.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -23,7 +23,7 @@
from zope.index.interfaces.nbest import INBest
from zope.interface import implements
-class NBest:
+class NBest(object):
implements(INBest)
def __init__(self, N):
Modified: Zope3/trunk/src/zope/index/text/parsetree.py
===================================================================
--- Zope3/trunk/src/zope/index/text/parsetree.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/text/parsetree.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,9 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""Generic parser support: exception and parse tree nodes.
-"""Generic parser support: exception and parse tree nodes."""
-
+$Id$
+"""
from BTrees.IIBTree import difference
from zope.index.interfaces.queryparsetree import IQueryParseTree
@@ -27,7 +28,7 @@
class ParseError(Exception):
pass
-class ParseTreeNode:
+class ParseTreeNode(object):
implements(IQueryParseTree)
Modified: Zope3/trunk/src/zope/index/text/pipelinefactory.py
===================================================================
--- Zope3/trunk/src/zope/index/text/pipelinefactory.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/text/pipelinefactory.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,11 +11,14 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
+"""Pipeline Element Factory
+$Id$
+"""
from zope.index.interfaces.pipelineelementfactory import IPipelineElementFactory
from zope.interface import implements
-class PipelineElementFactory:
+class PipelineElementFactory(object):
implements(IPipelineElementFactory)
Modified: Zope3/trunk/src/zope/index/text/queryparser.py
===================================================================
--- Zope3/trunk/src/zope/index/text/queryparser.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/text/queryparser.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,7 +11,6 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-
"""Query Parser.
This particular parser recognizes the following syntax:
@@ -53,6 +52,8 @@
- a leading hyphen implies NOT, e.g. ``foo -bar''
- these can be combined, e.g. ``foo -"foo bar"'' or ``foo -foo-bar''
- * and ? are used for globbing (i.e. prefix search), e.g. ``foo*''
+
+$Id$
"""
import re
@@ -94,7 +95,7 @@
)
""", re.VERBOSE)
-class QueryParser:
+class QueryParser(object):
implements(IQueryParser)
Modified: Zope3/trunk/src/zope/index/text/ricecode.py
===================================================================
--- Zope3/trunk/src/zope/index/text/ricecode.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/text/ricecode.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,7 +11,6 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-
"""Rice coding (a variation of Golomb coding)
Based on a Java implementation by Glen McCluskey described in a Usenix
@@ -33,11 +32,13 @@
Emit q 1 bits followed by a 0 bit.
Emit the lower m bits of x-1, treating x-1 as a binary value.
+
+$Id$
"""
import array
-class BitArray:
+class BitArray(object):
def __init__(self, buf=None):
self.bytes = array.array('B')
@@ -81,7 +82,7 @@
self.nbits = nbits
self.bitsleft = bitsleft
-class RiceCode:
+class RiceCode(object):
def __init__(self, m):
"""Constructor a RiceCode for m-bit values."""
if not (0 <= m <= 16):
Modified: Zope3/trunk/src/zope/index/text/tests/indexhtml.py
===================================================================
--- Zope3/trunk/src/zope/index/text/tests/indexhtml.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/text/tests/indexhtml.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -32,7 +32,7 @@
def make_zc_index():
# there's an elaborate dance necessary to construct an index
- class Struct:
+ class Struct(object):
pass
extra = Struct()
extra.doc_attr = "read"
@@ -46,7 +46,7 @@
# Splitter(string, stop_words, encoding,
# singlechar, indexnumbers, casefolding)
-class MySplitter:
+class MySplitter(object):
def __init__(self):
self._v_splitter = HTMLWordSplitter()
def __call__(self, text, stopdict, *args, **kwargs):
Modified: Zope3/trunk/src/zope/index/text/tests/mhindex.py
===================================================================
--- Zope3/trunk/src/zope/index/text/tests/mhindex.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/text/tests/mhindex.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -1,5 +1,4 @@
-#! /usr/bin/env python2.2
-
+#! /usr/bin/env python2.3
##############################################################################
#
# Copyright (c) 2003 Zope Corporation and Contributors.
@@ -41,8 +40,9 @@
Querying options:
-m N -- show at most N matching lines from the message (default 3)
-n N -- show the N best matching messages (default 3)
+
+$Id$
"""
-
import os
import re
import sys
@@ -146,7 +146,7 @@
if pack:
ix.pack()
-class Indexer:
+class Indexer(object):
filestorage = database = connection = root = None
Modified: Zope3/trunk/src/zope/index/text/tests/test_lexicon.py
===================================================================
--- Zope3/trunk/src/zope/index/text/tests/test_lexicon.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/text/tests/test_lexicon.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,14 +11,17 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
+"""Lexicon tests
+$Id$
+"""
import sys
from unittest import TestCase, main, makeSuite
from zope.index.text.lexicon import Lexicon
from zope.index.text.lexicon import Splitter, CaseNormalizer
-class StupidPipelineElement:
+class StupidPipelineElement(object):
def __init__(self, fromword, toword):
self.__fromword = fromword
self.__toword = toword
@@ -32,7 +35,7 @@
res.append(term)
return res
-class WackyReversePipelineElement:
+class WackyReversePipelineElement(object):
def __init__(self, revword):
self.__revword = revword
@@ -47,7 +50,7 @@
res.append(term)
return res
-class StopWordPipelineElement:
+class StopWordPipelineElement(object):
def __init__(self, stopdict={}):
self.__stopdict = stopdict
Modified: Zope3/trunk/src/zope/index/text/tests/test_pipelinefactory.py
===================================================================
--- Zope3/trunk/src/zope/index/text/tests/test_pipelinefactory.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/text/tests/test_pipelinefactory.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,13 +11,16 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
+"""Pipeline Factory tests
+$Id$
+"""
from unittest import TestCase, main, makeSuite
from zope.index.interfaces.pipelineelement import IPipelineElement
from zope.index.text.pipelinefactory import PipelineElementFactory
from zope.interface import implements
-class NullPipelineElement:
+class NullPipelineElement(object):
implements(IPipelineElement)
def process(source):
Modified: Zope3/trunk/src/zope/index/text/tests/test_queryengine.py
===================================================================
--- Zope3/trunk/src/zope/index/text/tests/test_queryengine.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/text/tests/test_queryengine.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,7 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""Query Engine tests
+$Id$
+"""
import unittest
from BTrees.IIBTree import IIBucket
@@ -20,7 +23,7 @@
from zope.index.text.parsetree import QueryError
from zope.index.text.lexicon import Lexicon, Splitter
-class FauxIndex:
+class FauxIndex(object):
def search(self, term):
b = IIBucket()
Modified: Zope3/trunk/src/zope/index/text/tests/test_queryparser.py
===================================================================
--- Zope3/trunk/src/zope/index/text/tests/test_queryparser.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/text/tests/test_queryparser.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,7 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""Query Parser
+$Id$
+"""
from unittest import TestCase, TestSuite, main, makeSuite
from zope.interface.verify import verifyClass
@@ -280,7 +283,7 @@
self.failure('stop AND NOT foo')
-class FakeStopWordRemover:
+class FakeStopWordRemover(object):
def process(self, list):
return [word for word in list if word != "stop"]
Modified: Zope3/trunk/src/zope/index/topic/filter.py
===================================================================
--- Zope3/trunk/src/zope/index/topic/filter.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/topic/filter.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,14 +11,15 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
+"""Filters for TopicIndexes
-"""Filters for TopicIndexes"""
-
+$Id$
+"""
from BTrees.IIBTree import IISet
from zope.index.interfaces import ITopicFilteredSet
from zope.interface import implements
-class FilteredSetBase:
+class FilteredSetBase(object):
""" Base class for all filtered sets.
A filtered set is a collection of documents represented
Modified: Zope3/trunk/src/zope/index/topic/tests/test_topicindex.py
===================================================================
--- Zope3/trunk/src/zope/index/topic/tests/test_topicindex.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/index/topic/tests/test_topicindex.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,7 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""Topic Index tests
+$Id$
+"""
from unittest import TestCase, TestSuite, main, makeSuite
from zope.index.topic.index import TopicIndex
@@ -19,7 +22,7 @@
from zope.interface.verify import verifyClass
from zope.interface.interface import implementedBy
-class O:
+class O(object):
""" a dummy class """
def __init__(self, meta_type):
@@ -29,9 +32,12 @@
def setUp(self):
self.index = TopicIndex()
- self.index.addFilter(PythonFilteredSet('doc1', "context.meta_type == 'doc1'"))
- self.index.addFilter(PythonFilteredSet('doc2', "context.meta_type == 'doc2'"))
- self.index.addFilter(PythonFilteredSet('doc3', "context.meta_type == 'doc3'"))
+ self.index.addFilter(PythonFilteredSet('doc1',
+ "context.meta_type == 'doc1'"))
+ self.index.addFilter(PythonFilteredSet('doc2',
+ "context.meta_type == 'doc2'"))
+ self.index.addFilter(PythonFilteredSet('doc3',
+ "context.meta_type == 'doc3'"))
self.index.index_doc(0 , O('doc0'))
self.index.index_doc(1 , O('doc1'))
Modified: Zope3/trunk/src/zope/interface/common/tests/basemapping.py
===================================================================
--- Zope3/trunk/src/zope/interface/common/tests/basemapping.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/interface/common/tests/basemapping.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -67,7 +67,7 @@
test___len__(self, inst, state)
-class BaseTestIReadMapping:
+class BaseTestIReadMapping(object):
def testIReadMapping(self):
inst = self._IReadMapping__sample()
state = self._IReadMapping__stateDict()
Modified: Zope3/trunk/src/zope/interface/declarations.py
===================================================================
--- Zope3/trunk/src/zope/interface/declarations.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/interface/declarations.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -350,7 +350,7 @@
...
>>> class I4(I3): pass
...
- >>> class C1:
+ >>> class C1(object):
... implements(I2)
>>> class C2(C1):
... implements(I3)
@@ -456,9 +456,9 @@
...
>>> class I4(Interface): pass
...
- >>> class A:
+ >>> class A(object):
... implements(I3)
- >>> class B:
+ >>> class B(object):
... implements(I4)
>>> class C(A, B):
... pass
@@ -500,9 +500,9 @@
...
>>> class I5(Interface): pass
...
- >>> class A:
+ >>> class A(object):
... implements(I3)
- >>> class B:
+ >>> class B(object):
... implements(I4)
>>> class C(A, B):
... pass
@@ -597,9 +597,9 @@
...
>>> class IC(Interface): pass
...
- >>> class A: implements(IA1, IA2)
+ >>> class A(object): implements(IA1, IA2)
...
- >>> class B: implements(IB)
+ >>> class B(object): implements(IB)
...
>>> class C(A, B):
@@ -654,9 +654,9 @@
...
>>> class IC(Interface): pass
...
- >>> class A: implements(IA1, IA2)
+ >>> class A(object): implements(IA1, IA2)
...
- >>> class B: implements(IB)
+ >>> class B(object): implements(IB)
...
>>> class C(A, B):
@@ -708,7 +708,7 @@
>>> class IFooFactory(Interface): pass
...
- >>> class C:
+ >>> class C(object):
... pass
>>> C.__provides__ = ProvidesClass(C, IFooFactory)
@@ -757,7 +757,7 @@
>>> collect()
>>> before = len(InstanceDeclarations)
- >>> class C:
+ >>> class C(object):
... pass
>>> from zope.interface import Interface
@@ -825,9 +825,9 @@
...
>>> class IC(Interface): pass
...
- >>> class A: implements(IA1, IA2)
+ >>> class A(object): implements(IA1, IA2)
...
- >>> class B: implements(IB)
+ >>> class B(object): implements(IB)
...
>>> class C(A, B):
@@ -946,7 +946,7 @@
... pass
>>> class IFoo(Interface):
... pass
- >>> class C:
+ >>> class C(object):
... implements(IFoo)
... classProvides(IFooFactory)
>>> [i.getName() for i in C.__provides__]
@@ -1026,7 +1026,7 @@
...
>>> class IFooFactory(Interface): pass
...
- >>> class C:
+ >>> class C(object):
... implements(IFoo)
... classProvides(IFooFactory)
>>> [i.getName() for i in C.__providedBy__]
@@ -1041,7 +1041,7 @@
...
>>> class IFooFactory(Interface): pass
...
- >>> class C:
+ >>> class C(object):
... implements(IFoo)
>>> directlyProvides(C, IFooFactory)
>>> [i.getName() for i in C.__providedBy__]
@@ -1138,9 +1138,9 @@
...
>>> class I5(Interface): pass
...
- >>> class A: implements(I1)
+ >>> class A(object): implements(I1)
...
- >>> class B: __implemented__ = I2
+ >>> class B(object): __implemented__ = I2
...
>>> class C(A, B): implements(I31)
...
@@ -1191,7 +1191,7 @@
... pass
>>> class I2(Interface):
... pass
- >>> class C:
+ >>> class C(object):
... implements(I1)
>>> c = C()
>>> int(bool(providedBy(c)))
@@ -1199,7 +1199,7 @@
>>> directlyProvides(c, I2)
>>> int(bool(providedBy(c)))
1
- >>> class C:
+ >>> class C(object):
... pass
>>> c = C()
>>> int(bool(providedBy(c)))
@@ -1295,7 +1295,7 @@
...
>>> class IFooFactory(Interface): pass
...
- >>> class C:
+ >>> class C(object):
... implements(IFoo)
... classProvides(IFooFactory)
>>> [i.getName() for i in C.__providedBy__]
Modified: Zope3/trunk/src/zope/interface/interface.py
===================================================================
--- Zope3/trunk/src/zope/interface/interface.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/interface/interface.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -89,10 +89,10 @@
>>> from zope.interface import *
>>> class I1(Interface):
... pass
- >>> class C:
+ >>> class C(object):
... implements(I1)
>>> c = C()
- >>> class X:
+ >>> class X(object):
... pass
>>> x = X()
>>> I1.providedBy(x)
@@ -617,7 +617,7 @@
If an object already implements the interface, then it will be
returned::
- >>> class C:
+ >>> class C(object):
... zope.interface.implements(I)
>>> obj = C()
@@ -626,7 +626,7 @@
If an object implements __conform__, then it will be used::
- >>> class C:
+ >>> class C(object):
... zope.interface.implements(I)
... def __conform__(self, proto):
... return 0
@@ -708,7 +708,7 @@
unless the object given provides the interface::
- >>> class C:
+ >>> class C(object):
... zope.interface.implements(I)
>>> obj = C()
Modified: Zope3/trunk/src/zope/interface/tests/odd.py
===================================================================
--- Zope3/trunk/src/zope/interface/tests/odd.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/interface/tests/odd.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -15,7 +15,7 @@
This is used for testing support for ExtensionClass in new interfaces.
- >>> class A:
+ >>> class A(object):
... __metaclass__ = MetaClass
... a = 1
...
@@ -23,7 +23,7 @@
'A'
>>> A.__bases__
()
- >>> class B:
+ >>> class B(object):
... __metaclass__ = MetaClass
... b = 1
...
Modified: Zope3/trunk/src/zope/interface/tests/test_advice.py
===================================================================
--- Zope3/trunk/src/zope/interface/tests/test_advice.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/interface/tests/test_advice.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -88,7 +88,7 @@
def checkOrder(self):
log = []
- class Foo:
+ class Foo(object):
ping(log, 1)
ping(log, 2)
ping(log, 3)
Modified: Zope3/trunk/src/zope/interface/tests/test_declarations.py
===================================================================
--- Zope3/trunk/src/zope/interface/tests/test_declarations.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/interface/tests/test_declarations.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -13,10 +13,8 @@
##############################################################################
"""Test the new API for making and checking interface declarations
-
$Id$
"""
-
import unittest
from zope.interface import *
from zope.testing.doctestunit import DocTestSuite
@@ -28,9 +26,9 @@
class I4(Interface): pass
class I5(Interface): pass
-class A:
+class A(object):
implements(I1)
-class B:
+class B(object):
implements(I2)
class C(A, B):
implements(I3)
@@ -76,7 +74,7 @@
def test_backward_compat(self):
- class C1: __implemented__ = I1
+ class C1(object): __implemented__ = I1
class C2(C1): __implemented__ = I2, I5
class C3(C2): __implemented__ = I3, C2.__implemented__
@@ -149,7 +147,7 @@
def test_signature_w_no_class_interfaces():
"""
>>> from zope.interface import *
- >>> class C:
+ >>> class C(object):
... pass
>>> c = C()
>>> list(providedBy(c))
@@ -167,13 +165,13 @@
contrived
>>> from zope.interface import *
- >>> class B1:
+ >>> class B1(object):
... pass
>>> class B2(B1):
... pass
>>> class B3(B2):
... pass
- >>> class D:
+ >>> class D(object):
... implements()
>>> class S(B3, D):
... implements()
@@ -200,7 +198,7 @@
def test_that_we_dont_inherit_class_provides():
"""
- >>> class X:
+ >>> class X(object):
... classProvides(I1)
>>> class Y(X):
... pass
@@ -220,10 +218,10 @@
descriptors that provides a default for instances that don't have
instance-specific declarations:
- >>> class A:
+ >>> class A(object):
... implements(I1)
- >>> class B:
+ >>> class B(object):
... implements(I2)
>>> [i.__name__ for i in A().__provides__]
@@ -270,7 +268,7 @@
... pass
>>> class IFoo(Interface):
... pass
- >>> class C:
+ >>> class C(object):
... classProvides(IFooFactory)
... implements(IFoo)
>>> [i.getName() for i in C.__provides__]
Modified: Zope3/trunk/src/zope/interface/tests/test_odd_declarations.py
===================================================================
--- Zope3/trunk/src/zope/interface/tests/test_odd_declarations.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/interface/tests/test_odd_declarations.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -30,7 +30,7 @@
class I4(Interface): pass
class I5(Interface): pass
-class Odd: __metaclass__ = odd.MetaClass
+class Odd(object): __metaclass__ = odd.MetaClass
class B(Odd): __implemented__ = I2
Modified: Zope3/trunk/src/zope/interface/tests/test_verify.py
===================================================================
--- Zope3/trunk/src/zope/interface/tests/test_verify.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/interface/tests/test_verify.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,13 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Interface Verify tests
-Revision information:
$Id$
"""
-
-
from zope.interface import Interface, implements, classImplements
from zope.interface.verify import verifyClass, verifyObject
from zope.interface.exceptions import DoesNotImplement, BrokenImplementation
@@ -29,7 +26,7 @@
def testNotImplemented(self):
- class C: pass
+ class C(object): pass
class I(Interface): pass
@@ -44,7 +41,7 @@
class I(Interface):
def f(): pass
- class C:
+ class C(object):
implements(I)
self.assertRaises(BrokenImplementation, verifyClass, I, C)
@@ -62,8 +59,7 @@
class I(II):
pass
- class C:
-
+ class C(object):
implements(I)
self.assertRaises(BrokenImplementation, verifyClass, I, C)
@@ -77,8 +73,7 @@
class I(Interface):
def f(a): pass
- class C:
-
+ class C(object):
def f(self, b): pass
implements(I)
@@ -111,8 +106,7 @@
class I(Interface):
def f(a): pass
- class C:
-
+ class C(object):
def f(self, a, b): pass
implements(I)
@@ -132,8 +126,7 @@
class I(Interface):
def f(a, *args): pass
- class C:
-
+ class C(object):
def f(self, a): pass
implements(I)
@@ -149,8 +142,7 @@
class I(Interface):
def f(a, **args): pass
- class C:
-
+ class C(object):
def f(self, a): pass
implements(I)
Modified: Zope3/trunk/src/zope/interface/tests/unitfixtures.py
===================================================================
--- Zope3/trunk/src/zope/interface/tests/unitfixtures.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/interface/tests/unitfixtures.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,6 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""Unit Test Fixtures
+
+$Id$
+"""
from zope.interface import Interface, invariant
from zope.interface.interface import Attribute
from zope.interface.exceptions import Invalid
@@ -18,7 +22,7 @@
class mytest(Interface):
pass
-class C:
+class C(object):
def m1(self, a, b):
"return 1"
return 1
@@ -29,9 +33,6 @@
# testInstancesOfClassImplements
-
-
-
# YAGNI IC=Interface.impliedInterface(C)
class IC(Interface):
def m1(a, b):
@@ -57,7 +58,7 @@
class A(I1.deferred()):
__implemented__=I1
-class B:
+class B(object):
__implemented__=I2, I3
class D(A, B): pass
@@ -83,7 +84,7 @@
def useless(**keywords):
""" useless code is fun! """
-class Foo:
+class Foo(object):
""" A concrete class """
__implemented__ = FooInterface,
@@ -108,7 +109,7 @@
foo_instance = Foo()
-class Blah:
+class Blah(object):
pass
new = Interface.__class__
Modified: Zope3/trunk/src/zope/pagetemplate/tests/batch.py
===================================================================
--- Zope3/trunk/src/zope/pagetemplate/tests/batch.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/pagetemplate/tests/batch.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,11 +11,12 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-##__allow_access_to_unprotected_subobjects__={'batch': 1}
-##__roles__=None
+"""Batching support tests
+$Id$
+"""
-class batch:
+class batch(object):
"""Create a sequence batch"""
def __init__(self, sequence, size, start=0, end=0,
Modified: Zope3/trunk/src/zope/pagetemplate/tests/test_htmltests.py
===================================================================
--- Zope3/trunk/src/zope/pagetemplate/tests/test_htmltests.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/pagetemplate/tests/test_htmltests.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,13 +11,17 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""Page Template HTML Tests
+
+$Id$
+"""
import unittest
from zope.pagetemplate.tests import util
from zope.pagetemplate.pagetemplate import PageTemplate
-class Folder:
+class Folder(object):
context = property(lambda self: self)
class HTMLTests(unittest.TestCase):
Modified: Zope3/trunk/src/zope/pagetemplate/tests/testpackage/content.py
===================================================================
--- Zope3/trunk/src/zope/pagetemplate/tests/testpackage/content.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/pagetemplate/tests/testpackage/content.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,11 +11,12 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Content
+
$Id$
"""
-class Content:
+class Content(object):
def getSomething(self):
return 42
Modified: Zope3/trunk/src/zope/pagetemplate/tests/util.py
===================================================================
--- Zope3/trunk/src/zope/pagetemplate/tests/util.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/pagetemplate/tests/util.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,12 +11,16 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""Utilities
+
+$Id$
+"""
import os
import re
import sys
-class Bruce:
+class Bruce(object):
__allow_access_to_unprotected_subobjects__=1
def __str__(self): return 'bruce'
def __int__(self): return 42
@@ -37,12 +41,12 @@
bruce = Bruce()
-class arg:
+class arg(object):
__allow_access_to_unprotected_subobjects__ = 1
def __init__(self,nn,aa): self.num, self.arg = nn, aa
def __str__(self): return str(self.arg)
-class argv:
+class argv(object):
__allow_access_to_unprotected_subobjects__ = 1
def __init__(self, argv=sys.argv[1:]):
Modified: Zope3/trunk/src/zope/proxy/tests/test_proxy.py
===================================================================
--- Zope3/trunk/src/zope/proxy/tests/test_proxy.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/proxy/tests/test_proxy.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -23,9 +23,9 @@
from zope.proxy import ProxyBase
class Thing:
- pass
+ """This class is expected to be a classic class."""
-class Comparable:
+class Comparable(object):
def __init__(self, value):
self.value = value
@@ -199,7 +199,7 @@
# still to work. PyObject_GetIter() will not be called on the
# proxy, so the tp_iter slot won't unwrap it.
- class Iterable:
+ class Iterable(object):
def __init__(self, test, data):
self.test = test
self.data = data
@@ -346,7 +346,7 @@
... pass
>>> class P2(ProxyBase):
... pass
- >>> class C:
+ >>> class C(object):
... pass
>>> c = C()
>>> int(isProxy(c))
@@ -369,7 +369,7 @@
def test_getProxiedObject():
"""
>>> from zope.proxy import ProxyBase, getProxiedObject
- >>> class C:
+ >>> class C(object):
... pass
>>> c = C()
>>> int(getProxiedObject(c) is c)
@@ -386,7 +386,7 @@
def test_ProxyIterator():
"""
>>> from zope.proxy import ProxyBase, ProxyIterator
- >>> class C:
+ >>> class C(object):
... pass
>>> c = C()
>>> p1 = ProxyBase(c)
@@ -401,7 +401,7 @@
def test_removeAllProxies():
"""
>>> from zope.proxy import ProxyBase, removeAllProxies
- >>> class C:
+ >>> class C(object):
... pass
>>> c = C()
>>> int(removeAllProxies(c) is c)
@@ -422,7 +422,7 @@
... pass
>>> class P2(ProxyBase):
... pass
- >>> class C:
+ >>> class C(object):
... pass
>>> c = C()
>>> queryProxy(c, P1)
@@ -451,7 +451,7 @@
... pass
>>> class P2(ProxyBase):
... pass
- >>> class C:
+ >>> class C(object):
... pass
>>> c = C()
>>> queryInnerProxy(c, P1)
@@ -484,7 +484,7 @@
def test_sameProxiedObjects():
"""
>>> from zope.proxy import ProxyBase, sameProxiedObjects
- >>> class C:
+ >>> class C(object):
... pass
>>> c1 = C()
>>> c2 = C()
Modified: Zope3/trunk/src/zope/publisher/browser.py
===================================================================
--- Zope3/trunk/src/zope/publisher/browser.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/publisher/browser.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -739,7 +739,7 @@
lang = lang.replace(' ', '')
return lang
-class BrowserLanguages:
+class BrowserLanguages(object):
implements(IUserPreferredLanguages)
Modified: Zope3/trunk/src/zope/publisher/http.py
===================================================================
--- Zope3/trunk/src/zope/publisher/http.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/publisher/http.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -928,7 +928,7 @@
return text
-class DefaultPublisher:
+class DefaultPublisher(object):
implements(IHTTPPublisher)
def publishTraverse(self, request, name):
@@ -944,7 +944,7 @@
return cmp(y, x)
-class HTTPCharsets:
+class HTTPCharsets(object):
implements(IUserPreferredCharsets)
def __init__(self, request):
Modified: Zope3/trunk/src/zope/publisher/tests/basetestipublicationrequest.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/basetestipublicationrequest.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/publisher/tests/basetestipublicationrequest.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,9 +11,8 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""IPublicationRequest base test
-Revision information:
$Id$
"""
@@ -22,7 +21,7 @@
from zope.publisher.interfaces import IPublicationRequest
-class BaseTestIPublicationRequest:
+class BaseTestIPublicationRequest(object):
def testVerifyIPublicationRequest(self):
verifyObject(IPublicationRequest, self._Test__new())
Modified: Zope3/trunk/src/zope/publisher/tests/basetestipublisherrequest.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/basetestipublisherrequest.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/publisher/tests/basetestipublisherrequest.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,9 +11,8 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""IPublisherReuqest Test
-Revision information:
$Id$
"""
@@ -21,7 +20,7 @@
from zope.publisher.interfaces import IPublisherRequest
-class BaseTestIPublisherRequest:
+class BaseTestIPublisherRequest(object):
def testVerifyIPublisherRequest(self):
verifyObject(IPublisherRequest, self._Test__new())
Modified: Zope3/trunk/src/zope/publisher/tests/publication.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/publication.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/publisher/tests/publication.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,14 +11,15 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Publication test
+
$Id$
"""
from zope.publisher.interfaces import IPublication
from zope.interface import implements
-class TestPublication:
+class TestPublication(object):
implements(IPublication)
@@ -63,7 +64,7 @@
self._callTraversalHooks = getattr(self, '_callTraversalHooks', 0) + 1
-class App:
+class App(object):
def __init__(self, name):
self.name = name
Modified: Zope3/trunk/src/zope/publisher/tests/test_browserrequest.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/test_browserrequest.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/publisher/tests/test_browserrequest.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -67,33 +67,33 @@
def setUp(self):
super(BrowserTests, self).setUp()
- class AppRoot:
- " "
+ class AppRoot(object):
+ """Required docstring for the publisher."""
- class Folder:
- " "
+ class Folder(object):
+ """Required docstring for the publisher."""
- class Item:
- " "
+ class Item(object):
+ """Required docstring for the publisher."""
def __call__(self, a, b):
return "%s, %s" % (`a`, `b`)
- class Item3:
- " "
+ class Item3(object):
+ """Required docstring for the publisher."""
def __call__(self, *args):
return "..."
- class View:
- " "
+ class View(object):
+ """Required docstring for the publisher."""
def browserDefault(self, request):
return self, ['index']
def index(self, a, b):
- " "
+ """Required docstring for the publisher."""
return "%s, %s" % (`a`, `b`)
- class Item2:
- " "
+ class Item2(object):
+ """Required docstring for the publisher."""
view = View()
def browserDefault(self, request):
Modified: Zope3/trunk/src/zope/publisher/tests/test_http.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/test_http.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/publisher/tests/test_http.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -35,7 +35,7 @@
from Cookie import SimpleCookie, CookieError
-class UserStub:
+class UserStub(object):
implements(ILoggingInfo)
def __init__(self, id):
@@ -64,14 +64,14 @@
}
def setUp(self):
- class AppRoot:
- " "
+ class AppRoot(object):
+ """Required docstring for the publisher."""
- class Folder:
- " "
+ class Folder(object):
+ """Required docstring for the publisher."""
- class Item:
- " "
+ class Item(object):
+ """Required docstring for the publisher."""
def __call__(self, a, b):
return "%s, %s" % (`a`, `b`)
@@ -267,7 +267,7 @@
self.assertEquals(lpw, (login, password))
def testSetPrincipal(self):
- class HTTPTaskStub:
+ class HTTPTaskStub(object):
auth_user_name = None
def setAuthUserName(self, name):
self.auth_user_name = name
Modified: Zope3/trunk/src/zope/publisher/tests/test_ipublication.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/test_ipublication.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/publisher/tests/test_ipublication.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,9 +11,8 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""IPublication Test
-Revision information:
$Id$
"""
@@ -24,7 +23,7 @@
from zope.publisher.interfaces import IPublication
-class BaseIPublicationTest:
+class BaseIPublicationTest(object):
# This test isn't as interesting as we'd like it to be because we
# know too little about the semantics if a particular publication
Modified: Zope3/trunk/src/zope/publisher/tests/test_mapply.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/test_mapply.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/publisher/tests/test_mapply.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,6 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""Test mapply() function
+
+$Id$
+"""
import unittest
from zope.publisher.publish import mapply
@@ -29,7 +33,7 @@
def testClass(self):
values = {'a':2, 'b':3, 'c':5}
- class c:
+ class c(object):
a = 3
def __call__(self, b, c=4):
return '%d%d%d' % (self.a, b, c)
@@ -42,7 +46,9 @@
v = mapply(cc.compute, (), values)
self.failUnlessEqual(v, '334')
- class c2: pass
+ class c2:
+ """Must be a classic class."""
+
c2inst = c2()
c2inst.__call__ = cc
v = mapply(c2inst, (), values)
Modified: Zope3/trunk/src/zope/publisher/tests/test_publisher.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/test_publisher.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/publisher/tests/test_publisher.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -36,14 +36,14 @@
class PublisherTests(unittest.TestCase):
def setUp(self):
- class AppRoot:
- " "
+ class AppRoot(object):
+ """Required docstring for the publisher."""
- class Folder:
- " "
+ class Folder(object):
+ """Required docstring for the publisher."""
- class Item:
- " "
+ class Item(object):
+ """Required docstring for the publisher."""
def __call__(self):
return "item"
Modified: Zope3/trunk/src/zope/publisher/tests/test_xmlrpcmethodpublisher.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/test_xmlrpcmethodpublisher.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/publisher/tests/test_xmlrpcmethodpublisher.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,6 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""XML-RPC Method Publisher tests
+
+$Id$
+"""
import unittest
from zope.publisher.xmlrpc import MethodPublisher, TestRequest
@@ -19,7 +23,7 @@
from zope.interface.verify import verifyClass
from zope.interface import implementedBy
-class ContentStub:
+class ContentStub(object):
pass
class Presentation(MethodPublisher):
Modified: Zope3/trunk/src/zope/publisher/tests/test_xmlrpcrequest.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/test_xmlrpcrequest.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/publisher/tests/test_xmlrpcrequest.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -74,13 +74,13 @@
def setUp(self):
super(XMLRPCTests, self).setUp()
- class AppRoot:
- " "
+ class AppRoot(object):
+ pass
- class Folder:
- " "
+ class Folder(object):
+ pass
- class Item:
+ class Item(object):
def __call__(self, a, b):
return "%s, %s" % (`a`, `b`)
@@ -88,13 +88,13 @@
def doit(self, a, b):
return 'do something %s %s' % (a, b)
- class View:
+ class View(object):
def action(self, a):
return "Parameter[type: %s; value: %s" %(
type(a).__name__, `a`)
- class Item2:
+ class Item2(object):
view = View()
Modified: Zope3/trunk/src/zope/publisher/tests/views.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/views.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/publisher/tests/views.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,9 +11,9 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Test objects and interfaces.
-Revision information: $Id$
+$Id$
"""
from zope.interface import Interface, implements
@@ -25,7 +25,7 @@
class VZMI(V1): pass
-class R1:
+class R1(object):
def __init__(self, request): self.request = request
class RZMI(R1):
Modified: Zope3/trunk/src/zope/publisher/tests/xmlrpcviews.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/xmlrpcviews.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/publisher/tests/xmlrpcviews.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,17 +11,16 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""XML-RPC Views test objects
-Revision information: $Id$
+$Id$
"""
-
from zope.interface import Interface, implements
from zope.publisher.interfaces.xmlrpc import IXMLRPCPublisher
class IC(Interface): pass
-class V1:
+class V1(object):
implements(IXMLRPCPublisher)
def __init__(self, context, request):
@@ -31,7 +30,7 @@
class VZMI(V1):
pass
-class R1:
+class R1(object):
def __init__(self, request):
self.request = request
Modified: Zope3/trunk/src/zope/schema/tests/states.py
===================================================================
--- Zope3/trunk/src/zope/schema/tests/states.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/schema/tests/states.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -84,7 +84,7 @@
}
-class State:
+class State(object):
__slots__ = 'value', 'title'
implements(interfaces.ITerm)
Modified: Zope3/trunk/src/zope/schema/tests/tabcomplete.py
===================================================================
--- Zope3/trunk/src/zope/schema/tests/tabcomplete.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/schema/tests/tabcomplete.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,10 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""Example vocabulary for tab completion.
-"""Example vocabulary for tab completion."""
-
-
+$Id$
+"""
from zope.schema.interfaces import ITerm, IVocabulary, IVocabularyQuery
from zope.interface import implements
@@ -27,7 +27,7 @@
prefix."""
-class Term:
+class Term(object):
implements(ITerm)
def __init__(self, value):
@@ -62,7 +62,7 @@
raise LookupError(value)
-class PrefixQuery:
+class PrefixQuery(object):
implements(IPrefixQuery)
def __init__(self, vocabulary):
Modified: Zope3/trunk/src/zope/schema/tests/test_accessors.py
===================================================================
--- Zope3/trunk/src/zope/schema/tests/test_accessors.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/schema/tests/test_accessors.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -15,7 +15,6 @@
$Id$
"""
-
import unittest
from zope.interface import Interface, implements
from zope.schema import Text, accessors
@@ -35,10 +34,10 @@
getFoo, setFoo = accessors(field)
- class Bad:
+ class Bad(object):
implements(I)
- class Good:
+ class Good(object):
implements(I)
def getFoo(self):
Modified: Zope3/trunk/src/zope/schema/tests/test_listfield.py
===================================================================
--- Zope3/trunk/src/zope/schema/tests/test_listfield.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/schema/tests/test_listfield.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -99,7 +99,7 @@
# however, allow anything that implements IField
List(value_type=Field())
- class FakeField:
+ class FakeField(object):
implements(IField)
List(value_type=FakeField())
Modified: Zope3/trunk/src/zope/schema/tests/test_setfield.py
===================================================================
--- Zope3/trunk/src/zope/schema/tests/test_setfield.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/schema/tests/test_setfield.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -108,7 +108,7 @@
# however, allow anything that implements IField
Set(value_type=Field())
- class FakeField:
+ class FakeField(object):
implements(IField)
Set(value_type=FakeField())
Modified: Zope3/trunk/src/zope/schema/tests/test_tuplefield.py
===================================================================
--- Zope3/trunk/src/zope/schema/tests/test_tuplefield.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/schema/tests/test_tuplefield.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -105,7 +105,7 @@
# however, allow anything that implements IField
Tuple(value_type=Field())
- class FakeField:
+ class FakeField(object):
implements(IField)
Tuple(value_type=FakeField())
Modified: Zope3/trunk/src/zope/schema/tests/test_vocabulary.py
===================================================================
--- Zope3/trunk/src/zope/schema/tests/test_vocabulary.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/schema/tests/test_vocabulary.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -57,10 +57,10 @@
# TODO: still need to test the default implementation
-class SampleTerm:
+class SampleTerm(object):
pass
-class SampleVocabulary:
+class SampleVocabulary(object):
implements(interfaces.IVocabulary)
def __iter__(self):
@@ -152,7 +152,7 @@
[(1, 'one'), ('1', 'another one')])
def test_overriding_createTerm(self):
- class MyTerm:
+ class MyTerm(object):
def __init__(self, value):
self.value = value
self.token = repr(value)
Modified: Zope3/trunk/src/zope/security/examples/sandbox.py
===================================================================
--- Zope3/trunk/src/zope/security/examples/sandbox.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/security/examples/sandbox.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -69,7 +69,7 @@
pass
-class Identity:
+class Identity(object):
"""Mixin for pretty printing and identity method"""
def __init__(self, id, *args, **kw):
self.id = id
@@ -164,7 +164,7 @@
agent, destination)
)
-class Service:
+class Service(object):
implements(IService)
def getId(self):
return self.__class__.__name__
@@ -212,9 +212,8 @@
time_service = home.getService('TimeService')
return time_service.getTime()
-class TimeGenerator:
- """
- Represents the passage of time in the agent simulation.
+class TimeGenerator(object):
+ """Represents the passage of time in the agent simulation.
each turn represents some discrete unit of time, during
which all agents attempt to perform their action. Additionally,
Modified: Zope3/trunk/src/zope/security/examples/sandbox_security.py
===================================================================
--- Zope3/trunk/src/zope/security/examples/sandbox_security.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/security/examples/sandbox_security.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -50,7 +50,7 @@
NoSetAttr = lambda name: NotAllowed
-class SimulationSecurityDatabase:
+class SimulationSecurityDatabase(object):
"""Security Database
In the database, locations are mapped to authentication tokens to
@@ -73,7 +73,7 @@
}
-class SimulationSecurityPolicy:
+class SimulationSecurityPolicy(object):
"""Security Policy during the Simulation.
A very simple security policy that is specific to the simulations.
@@ -108,7 +108,7 @@
return True
-class AgentParticipation:
+class AgentParticipation(object):
"""Agent Participation during the Simulation.
A very simple participation that is specific to the simulations.
Modified: Zope3/trunk/src/zope/security/interpreter.py
===================================================================
--- Zope3/trunk/src/zope/security/interpreter.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/security/interpreter.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -19,7 +19,7 @@
"""
from zope.security.builtins import RestrictedBuiltins
-class RestrictedInterpreter:
+class RestrictedInterpreter(object):
def __init__(self):
self.globals = {}
Modified: Zope3/trunk/src/zope/security/simplepolicies.py
===================================================================
--- Zope3/trunk/src/zope/security/simplepolicies.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/security/simplepolicies.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -15,7 +15,6 @@
$Id$
"""
-
from zope.interface import implements
from zope.security.interfaces import ISecurityPolicy
from zope.security.management import system_user
@@ -23,7 +22,7 @@
as _createInteraction
import zope.security.checker
-class ParanoidSecurityPolicy:
+class ParanoidSecurityPolicy(object):
"""Deny all access."""
implements(ISecurityPolicy)
@@ -43,7 +42,7 @@
return False
-class PermissiveSecurityPolicy:
+class PermissiveSecurityPolicy(object):
"""Allow all access."""
implements(ISecurityPolicy)
Modified: Zope3/trunk/src/zope/security/tests/test_checker.py
===================================================================
--- Zope3/trunk/src/zope/security/tests/test_checker.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/security/tests/test_checker.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -290,7 +290,7 @@
def testAlwaysAvailable(self):
from zope.security.checker import NamesChecker
checker = NamesChecker(())
- class C: pass
+ class C(object): pass
self.assertEqual(checker.check(C, '__hash__'), None)
self.assertEqual(checker.check(C, '__nonzero__'), None)
self.assertEqual(checker.check(C, '__class__'), None)
@@ -315,7 +315,7 @@
# values that evaluate to False
def test_ProxyFactory(self):
- class SomeClass:
+ class SomeClass(object):
pass
import zope.security
checker = NamesChecker()
@@ -346,7 +346,7 @@
self.assert_(getChecker(proxy) is specific_checker)
def test_ProxyFactory_using_proxy(self):
- class SomeClass:
+ class SomeClass(object):
pass
obj = SomeClass()
checker = NamesChecker()
Modified: Zope3/trunk/src/zope/security/tests/test_management.py
===================================================================
--- Zope3/trunk/src/zope/security/tests/test_management.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/security/tests/test_management.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -70,10 +70,10 @@
obj = object()
interaction = object()
- class InteractionStub:
+ class InteractionStub(object):
pass
- class PolicyStub:
+ class PolicyStub(object):
def createInteraction(s, r):
return InteractionStub()
Modified: Zope3/trunk/src/zope/security/tests/test_proxy.py
===================================================================
--- Zope3/trunk/src/zope/security/tests/test_proxy.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/security/tests/test_proxy.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,6 +11,11 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""Security proxy tests
+
+$Id$
+"""
+
import unittest
from zope.security.proxy import getChecker, ProxyFactory
from zope.proxy import ProxyBase as proxy, getProxiedObject
@@ -223,7 +228,7 @@
self.assertEqual(self.c, getChecker(self.p))
def testProxiedClassicClassAsDictKey(self):
- class C:
+ class C(object):
pass
d = {C: C()}
pC = ProxyFactory(C, self.c)
Modified: Zope3/trunk/src/zope/security/tests/test_simpleinteraction.py
===================================================================
--- Zope3/trunk/src/zope/security/tests/test_simpleinteraction.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/security/tests/test_simpleinteraction.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,14 +11,16 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Unit tests for zope.security.simpleinteraction."""
+"""Unit tests for zope.security.simpleinteraction.
+$Id$
+"""
import unittest
from zope.interface.verify import verifyObject
-class RequestStub:
+class RequestStub(object):
def __init__(self, principal=None):
self.principal = principal
Modified: Zope3/trunk/src/zope/security/tests/test_standard_checkers.py
===================================================================
--- Zope3/trunk/src/zope/security/tests/test_standard_checkers.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/security/tests/test_standard_checkers.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -18,7 +18,6 @@
$Id$
"""
-
from zope.security.checker import ProxyFactory, NamesChecker
from zope.exceptions import ForbiddenAttribute
@@ -356,7 +355,7 @@
def test_classic_instance():
"""
- >>> class C:
+ >>> class C(object):
... x, y = 1, 2
>>> c = ProxyFactory(C(), NamesChecker(['x']))
>>> check_forbidden_get(c, 'y')
@@ -423,7 +422,7 @@
def test_iter_of_sequences():
"""
- >>> class X:
+ >>> class X(object):
... d = 1, 2, 3
... def __getitem__(self, i):
... return self.d[i]
Modified: Zope3/trunk/src/zope/server/adjustments.py
===================================================================
--- Zope3/trunk/src/zope/server/adjustments.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/adjustments.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -15,11 +15,10 @@
$Id$
"""
-
from zope.server import maxsockets
-class Adjustments:
+class Adjustments(object):
"""This class contains tunable communication parameters.
You can either change default_adj to adjust parameters for
Modified: Zope3/trunk/src/zope/server/buffers.py
===================================================================
--- Zope3/trunk/src/zope/server/buffers.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/buffers.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -1,13 +1,20 @@
-# Copyright 2001-2002 Zope Corporation and Contributors. All Rights Reserved.
+##############################################################################
#
+# Copyright (c) 2001-2004 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Buffers
-
+$Id$
+"""
try:
from cStringIO import StringIO
except ImportError:
@@ -21,7 +28,7 @@
STRBUF_LIMIT = 8192
-class FileBasedBuffer:
+class FileBasedBuffer(object):
remain = 0
@@ -125,7 +132,7 @@
-class OverflowableBuffer:
+class OverflowableBuffer(object):
"""
This buffer implementation has four stages:
- No data
Modified: Zope3/trunk/src/zope/server/fixedstreamreceiver.py
===================================================================
--- Zope3/trunk/src/zope/server/fixedstreamreceiver.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/fixedstreamreceiver.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Fixed Stream Receiver
$Id$
"""
@@ -20,7 +20,7 @@
from zope.interface import implements
-class FixedStreamReceiver:
+class FixedStreamReceiver(object):
implements(IStreamConsumer)
Modified: Zope3/trunk/src/zope/server/ftp/logger.py
===================================================================
--- Zope3/trunk/src/zope/server/ftp/logger.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/ftp/logger.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,11 +11,10 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Common FTP Activity Logger
$Id$
"""
-
import time
import sys
@@ -23,7 +22,7 @@
from zope.server.logger.resolvinglogger import ResolvingLogger
from zope.server.logger.unresolvinglogger import UnresolvingLogger
-class CommonFTPActivityLogger:
+class CommonFTPActivityLogger(object):
"""Outputs hits in common HTTP log format.
"""
Modified: Zope3/trunk/src/zope/server/ftp/publisher.py
===================================================================
--- Zope3/trunk/src/zope/server/ftp/publisher.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/ftp/publisher.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -29,7 +29,7 @@
from zope.interface import implements
-class PublisherFileSystem:
+class PublisherFileSystem(object):
"""Generic Publisher FileSystem implementation."""
implements(IFileSystem)
@@ -123,7 +123,7 @@
return path
-class NoOutput:
+class NoOutput(object):
"""An output stream lookalike that warns you if you try to
dump anything into it."""
@@ -144,7 +144,7 @@
super(PublisherFTPServer, self).__init__(ip, port, fs_access,
*args, **kw)
-class PublisherFileSystemAccess:
+class PublisherFileSystemAccess(object):
implements(IFileSystemAccess)
Modified: Zope3/trunk/src/zope/server/ftp/server.py
===================================================================
--- Zope3/trunk/src/zope/server/ftp/server.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/ftp/server.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -769,7 +769,7 @@
-class FinishedRecvTask:
+class FinishedRecvTask(object):
implements(ITask)
@@ -867,7 +867,7 @@
ChannelBaseClass.close(self)
-class ApplicationXmitStream:
+class ApplicationXmitStream(object):
"""Provide stream output, remapping close() to close_when_done().
"""
Modified: Zope3/trunk/src/zope/server/ftp/tests/fstests.py
===================================================================
--- Zope3/trunk/src/zope/server/ftp/tests/fstests.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/ftp/tests/fstests.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -15,12 +15,11 @@
$Id$
"""
-
from StringIO import StringIO
from zope.interface.verify import verifyObject
from zope.server.interfaces.ftp import IFileSystem
-class FileSystemTests:
+class FileSystemTests(object):
"""Tests of a readable filesystem
"""
Modified: Zope3/trunk/src/zope/server/ftp/tests/test_publisher.py
===================================================================
--- Zope3/trunk/src/zope/server/ftp/tests/test_publisher.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/ftp/tests/test_publisher.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -28,7 +28,7 @@
return demofs.DemoFileSystem.rename(
self, "%s/%s" % (path, old), "%s/%s" % (path, new))
-class Publication:
+class Publication(object):
def __init__(self, root):
self.root = root
@@ -58,7 +58,7 @@
request.response._exc = info[:2]
-class Request:
+class Request(object):
def __init__(self, input, output, env):
self.env = env
@@ -76,7 +76,7 @@
def close(self):
pass
-class Response:
+class Response(object):
_exc = _body = None
@@ -91,7 +91,7 @@
raise self._exc[0], self._exc[1]
return self._body
-class RequestFactory:
+class RequestFactory(object):
def __init__(self, root):
self.pub = Publication(root)
Modified: Zope3/trunk/src/zope/server/http/chunking.py
===================================================================
--- Zope3/trunk/src/zope/server/http/chunking.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/http/chunking.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Data Chunk Receiver
$Id$
"""
@@ -21,7 +21,7 @@
from zope.interface import implements
-class ChunkedReceiver:
+class ChunkedReceiver(object):
implements(IStreamConsumer)
Modified: Zope3/trunk/src/zope/server/http/commonaccesslogger.py
===================================================================
--- Zope3/trunk/src/zope/server/http/commonaccesslogger.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/http/commonaccesslogger.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Common Access Logger
$Id$
"""
@@ -24,7 +24,7 @@
from zope.server.logger.resolvinglogger import ResolvingLogger
from zope.server.logger.unresolvinglogger import UnresolvingLogger
-class CommonAccessLogger:
+class CommonAccessLogger(object):
"""Outputs accesses in common HTTP log format.
"""
Modified: Zope3/trunk/src/zope/server/http/httprequestparser.py
===================================================================
--- Zope3/trunk/src/zope/server/http/httprequestparser.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/http/httprequestparser.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,13 +11,13 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""HTTP Request Parser
+
This server uses asyncore to accept connections and do initial
processing but threads to do work.
$Id$
"""
-
import re
from urllib import unquote
@@ -33,7 +33,7 @@
from StringIO import StringIO
-class HTTPRequestParser:
+class HTTPRequestParser(object):
"""A structure that collects the HTTP request.
Once the stream is completed, the instance is passed to
Modified: Zope3/trunk/src/zope/server/http/httptask.py
===================================================================
--- Zope3/trunk/src/zope/server/http/httptask.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/http/httptask.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -34,7 +34,7 @@
'CONNECTION' : 'CONNECTION_TYPE',
}
-class HTTPTask:
+class HTTPTask(object):
"""An HTTP task accepts a request and writes to a channel.
Subclass this and override the execute() method.
Modified: Zope3/trunk/src/zope/server/http/tests/test_httpserver.py
===================================================================
--- Zope3/trunk/src/zope/server/http/tests/test_httpserver.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/http/tests/test_httpserver.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -61,7 +61,7 @@
task.write(data)
-class SleepingTask:
+class SleepingTask(object):
implements(ITask)
Modified: Zope3/trunk/src/zope/server/http/tests/test_publisherserver.py
===================================================================
--- Zope3/trunk/src/zope/server/http/tests/test_publisherserver.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/http/tests/test_publisherserver.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -9,11 +9,10 @@
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
##############################################################################
-"""
+"""Test Puvlisher-based HTTP Server
$Id$
"""
-
import unittest
from asyncore import socket_map, poll
from threading import Thread
@@ -44,7 +43,7 @@
HTTPRequest.STAGGER_RETRIES = 0 # Don't pause.
-class Conflict (Exception):
+class Conflict(Exception):
"""
Pseudo ZODB conflict error.
"""
@@ -61,8 +60,8 @@
retry_allowed)
-class tested_object:
- " "
+class tested_object(object):
+ """Docstring required by publisher."""
tries = 0
def __call__(self, REQUEST):
@@ -87,7 +86,6 @@
raise Conflict
-
class Tests(PlacelessSetup, unittest.TestCase):
def setUp(self):
Modified: Zope3/trunk/src/zope/server/linereceiver/linecommandparser.py
===================================================================
--- Zope3/trunk/src/zope/server/linereceiver/linecommandparser.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/linereceiver/linecommandparser.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,16 +11,15 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Line Command Parser
$Id$
"""
-
from zope.server.interfaces import IStreamConsumer
from zope.interface import implements
-class LineCommandParser:
+class LineCommandParser(object):
"""Line Command parser. Arguments are left alone for now."""
implements(IStreamConsumer)
Modified: Zope3/trunk/src/zope/server/linereceiver/linetask.py
===================================================================
--- Zope3/trunk/src/zope/server/linereceiver/linetask.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/linereceiver/linetask.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,18 +11,17 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Line Task
$Id$
"""
-
import socket
import time
from zope.server.interfaces import ITask
from zope.interface import implements
-class LineTask:
+class LineTask(object):
"""This is a generic task that can be used with command line
protocols to handle commands in a separate thread.
"""
Modified: Zope3/trunk/src/zope/server/logger/filelogger.py
===================================================================
--- Zope3/trunk/src/zope/server/logger/filelogger.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/logger/filelogger.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""File Logger
$Id$
"""
@@ -20,7 +20,7 @@
from zope.server.interfaces.logger import IMessageLogger
from zope.interface import implements
-class FileLogger:
+class FileLogger(object):
"""Simple File Logger
"""
Modified: Zope3/trunk/src/zope/server/logger/m_syslog.py
===================================================================
--- Zope3/trunk/src/zope/server/logger/m_syslog.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/logger/m_syslog.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -136,7 +136,7 @@
import socket
-class syslog_client:
+class syslog_client(object):
def __init__(self, address='/dev/log'):
self.address = address
Modified: Zope3/trunk/src/zope/server/logger/pythonlogger.py
===================================================================
--- Zope3/trunk/src/zope/server/logger/pythonlogger.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/logger/pythonlogger.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -20,7 +20,7 @@
from zope.server.interfaces.logger import IMessageLogger
from zope.interface import implements
-class PythonLogger:
+class PythonLogger(object):
"""Proxy for Python's logging module"""
implements(IMessageLogger)
Modified: Zope3/trunk/src/zope/server/logger/resolvinglogger.py
===================================================================
--- Zope3/trunk/src/zope/server/logger/resolvinglogger.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/logger/resolvinglogger.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Resolving Logger
$Id$
"""
@@ -19,7 +19,7 @@
from zope.interface import implements
-class ResolvingLogger:
+class ResolvingLogger(object):
"""Feed (ip, message) combinations into this logger to get a
resolved hostname in front of the message. The message will not
be logged until the PTR request finishes (or fails)."""
@@ -31,7 +31,7 @@
# logger is an IMessageLogger
self.logger = logger
- class logger_thunk:
+ class logger_thunk(object):
def __init__(self, message, logger):
self.message = message
self.logger = logger
Modified: Zope3/trunk/src/zope/server/logger/taillogger.py
===================================================================
--- Zope3/trunk/src/zope/server/logger/taillogger.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/logger/taillogger.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,15 +11,14 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Tail Logger
$Id$
"""
-
from zope.server.interfaces.logger import IMessageLogger
from zope.interface import implements
-class TailLogger:
+class TailLogger(object):
"""Keep track of the last <size> log messages"""
implements(IMessageLogger)
Modified: Zope3/trunk/src/zope/server/logger/unresolvinglogger.py
===================================================================
--- Zope3/trunk/src/zope/server/logger/unresolvinglogger.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/logger/unresolvinglogger.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,14 +11,14 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""Unresolving Logger
$Id$
"""
from zope.server.interfaces.logger import IRequestLogger
from zope.interface import implements
-class UnresolvingLogger:
+class UnresolvingLogger(object):
"""Just in case you don't want to resolve"""
implements(IRequestLogger)
Modified: Zope3/trunk/src/zope/server/taskthreads.py
===================================================================
--- Zope3/trunk/src/zope/server/taskthreads.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/server/taskthreads.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -24,7 +24,7 @@
from zope.interface import implements
-class ThreadedTaskDispatcher:
+class ThreadedTaskDispatcher(object):
"""A Task Dispatcher that creates a thread for each task."""
implements(ITaskDispatcher)
Modified: Zope3/trunk/src/zope/tal/dummyengine.py
===================================================================
--- Zope3/trunk/src/zope/tal/dummyengine.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/tal/dummyengine.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -30,7 +30,7 @@
class CompilerError(Exception):
pass
-class DummyEngine:
+class DummyEngine(object):
position = None
source_file = None
@@ -247,7 +247,7 @@
return result.getvalue()
-class Iterator:
+class Iterator(object):
def __init__(self, name, seq, engine):
self.name = name
@@ -266,7 +266,7 @@
return 1
-class DummyTranslationDomain:
+class DummyTranslationDomain(object):
implements(ITranslationDomain)
domain = ''
Modified: Zope3/trunk/src/zope/tal/ndiff.py
===================================================================
--- Zope3/trunk/src/zope/tal/ndiff.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/tal/ndiff.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -123,7 +123,7 @@
del re
-class SequenceMatcher:
+class SequenceMatcher(object):
def __init__(self, isjunk=None, a='', b=''):
# Members:
# a
Modified: Zope3/trunk/src/zope/tal/taldefs.py
===================================================================
--- Zope3/trunk/src/zope/tal/taldefs.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/tal/taldefs.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -95,7 +95,7 @@
pass
-class ErrorInfo:
+class ErrorInfo(object):
implements(ITALExpressionErrorInfo)
def __init__(self, err, position=(None, None)):
Modified: Zope3/trunk/src/zope/tal/talgenerator.py
===================================================================
--- Zope3/trunk/src/zope/tal/talgenerator.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/tal/talgenerator.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -31,7 +31,7 @@
_name_rx = re.compile(NAME_RE)
-class TALGenerator:
+class TALGenerator(object):
inMacroUse = 0
inMacroDef = 0
Modified: Zope3/trunk/src/zope/tal/talgettext.py
===================================================================
--- Zope3/trunk/src/zope/tal/talgettext.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/tal/talgettext.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -250,7 +250,7 @@
return
# We don't care about the rendered output of the .pt file
- class Devnull:
+ class Devnull(object):
def write(self, s):
pass
Modified: Zope3/trunk/src/zope/tal/talinterpreter.py
===================================================================
--- Zope3/trunk/src/zope/tal/talinterpreter.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/tal/talinterpreter.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -89,7 +89,7 @@
return TALGenerator.replaceAttrs(self, attrlist, repldict)
-class TALInterpreter:
+class TALInterpreter(object):
"""TAL interpreter.
Some notes on source annotations. They are HTML/XML comments added to the
Modified: Zope3/trunk/src/zope/tal/tests/test_xmlparser.py
===================================================================
--- Zope3/trunk/src/zope/tal/tests/test_xmlparser.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/tal/tests/test_xmlparser.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -83,7 +83,7 @@
self.append(("starttag_text", self.get_starttag_text()))
-class SegmentedFile:
+class SegmentedFile(object):
def __init__(self, parts):
self.parts = list(parts)
Modified: Zope3/trunk/src/zope/tal/translationcontext.py
===================================================================
--- Zope3/trunk/src/zope/tal/translationcontext.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/tal/translationcontext.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -18,10 +18,9 @@
$Id$
"""
-
DEFAULT_DOMAIN = "default"
-class TranslationContext:
+class TranslationContext(object):
"""Information about the I18N settings of a TAL processor."""
def __init__(self, parent=None, domain=None, target=None, source=None):
Modified: Zope3/trunk/src/zope/tal/xmlparser.py
===================================================================
--- Zope3/trunk/src/zope/tal/xmlparser.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/tal/xmlparser.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -15,11 +15,10 @@
This creates a parser with namespace processing enabled.
"""
-
import logging
-class XMLParser:
+class XMLParser(object):
ordered_attributes = 0
Modified: Zope3/trunk/src/zope/tales/pythonexpr.py
===================================================================
--- Zope3/trunk/src/zope/tales/pythonexpr.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/tales/pythonexpr.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -16,7 +16,7 @@
$Id$
"""
-class PythonExpr:
+class PythonExpr(object):
def __init__(self, name, expr, engine):
text = ' '.join(expr.splitlines()).strip()
self.text = text
@@ -58,7 +58,7 @@
return '<PythonExpr %s>' % self.text
-class ExprTypeProxy:
+class ExprTypeProxy(object):
'''Class that proxies access to an expression type handler'''
def __init__(self, name, handler, econtext):
self._name = name
Modified: Zope3/trunk/src/zope/tales/tales.py
===================================================================
--- Zope3/trunk/src/zope/tales/tales.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/tales/tales.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -538,7 +538,7 @@
example:
- class stringFuncs:
+ class stringFuncs(object):
def __init__(self,context):
self.context = str(context)
Modified: Zope3/trunk/src/zope/tales/tests/simpleexpr.py
===================================================================
--- Zope3/trunk/src/zope/tales/tests/simpleexpr.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/tales/tests/simpleexpr.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -11,8 +11,12 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""Simple TALES Expression
-class SimpleExpr:
+$Id$
+"""
+
+class SimpleExpr(object):
'''Simple example of an expression type handler
for testing
Modified: Zope3/trunk/src/zope/tales/tests/test_expressions.py
===================================================================
--- Zope3/trunk/src/zope/tales/tests/test_expressions.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/tales/tests/test_expressions.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -21,7 +21,7 @@
from zope.tales.interfaces import ITALESFunctionNamespace
from zope.interface import implements
-class Data:
+class Data(object):
def __init__(self, **kw):
self.__dict__.update(kw)
@@ -142,7 +142,7 @@
ExpressionTestBase.setUp(self)
# a test namespace
- class TestNameSpace:
+ class TestNameSpace(object):
implements(ITALESFunctionNamespace)
def __init__(self, context):
Modified: Zope3/trunk/src/zope/tales/tests/test_tales.py
===================================================================
--- Zope3/trunk/src/zope/tales/tests/test_tales.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/tales/tests/test_tales.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -127,7 +127,7 @@
ctxt.endScope()
-class Harness:
+class Harness(object):
def __init__(self, testcase):
self._callstack = []
self._testcase = testcase
@@ -141,7 +141,7 @@
def __getattr__(self, name):
return HarnessMethod(self, name)
-class HarnessMethod:
+class HarnessMethod(object):
def __init__(self, harness, name):
self._harness = harness
Modified: Zope3/trunk/src/zope/testing/doctest.py
===================================================================
--- Zope3/trunk/src/zope/testing/doctest.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/testing/doctest.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -382,7 +382,7 @@
# Capture stdout when running examples.
-class _SpoofOut:
+class _SpoofOut(object):
def __init__(self):
self.clear()
def write(self, s):
@@ -602,7 +602,7 @@
return module.__name__ == object.__module__
raise ValueError("object must be a class or function")
-class Tester:
+class Tester(object):
"""Class Tester -- runs docstring examples and accumulates stats.
In normal use, function doctest.testmod() hides all this from you,
@@ -866,7 +866,7 @@
... def g():
... '''>>> assert 2 != 1
... '''
- ... class H:
+ ... class H(object):
... '''>>> assert 2 > 1
... '''
... def bar(self):
@@ -1444,7 +1444,7 @@
-class _TestClass:
+class _TestClass(object):
"""
A pointless class, for sanity-checking of docstring testing.
Modified: Zope3/trunk/src/zope/xmlpickle/ppml.py
===================================================================
--- Zope3/trunk/src/zope/xmlpickle/ppml.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/xmlpickle/ppml.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -710,7 +710,7 @@
file = StringIO(str)
return ToXMLUnpickler(file).load()
-class xmlPickler:
+class xmlPickler(object):
binary = 1
Modified: Zope3/trunk/src/zope/xmlpickle/tests/test_xmlpickle.py
===================================================================
--- Zope3/trunk/src/zope/xmlpickle/tests/test_xmlpickle.py 2004-07-15 17:08:25 UTC (rev 26558)
+++ Zope3/trunk/src/zope/xmlpickle/tests/test_xmlpickle.py 2004-07-15 21:22:32 UTC (rev 26559)
@@ -251,6 +251,8 @@
class Simple:
+ """This class is expected to be a classic class."""
+
def __init__(self, *a):
self.spam, self.eggs = a
More information about the Zope3-Checkins
mailing list