[Checkins] SVN: zope.app.component/branches/sidnei-back35-quick-hack/src/zope/app/component/ - Quick temporary hack to get Zope2 to startup
Sidnei da Silva
sidnei at enfoldsystems.com
Fri Oct 10 14:56:15 EDT 2008
Log message for revision 92020:
- Quick temporary hack to get Zope2 to startup
Changed:
U zope.app.component/branches/sidnei-back35-quick-hack/src/zope/app/component/back35.py
U zope.app.component/branches/sidnei-back35-quick-hack/src/zope/app/component/site.py
-=-
Modified: zope.app.component/branches/sidnei-back35-quick-hack/src/zope/app/component/back35.py
===================================================================
--- zope.app.component/branches/sidnei-back35-quick-hack/src/zope/app/component/back35.py 2008-10-10 18:54:24 UTC (rev 92019)
+++ zope.app.component/branches/sidnei-back35-quick-hack/src/zope/app/component/back35.py 2008-10-10 18:56:14 UTC (rev 92020)
@@ -282,7 +282,7 @@
required=False,
default=None)
- with = schema.Tuple(
+ with_ = schema.Tuple(
title = _("With interfaces"),
description = _("Additionally required interfaces"),
readonly=True,
@@ -625,10 +625,10 @@
name='', permission=None):
if not isinstance(required, (tuple, list)):
self.required = required
- self.with = ()
+ self.with_ = ()
else:
self.required = required[0]
- self.with = tuple(required[1:])
+ self.with_ = tuple(required[1:])
self.provided = provided
self.name = name
self.factoryName = factoryName
@@ -650,10 +650,10 @@
name='', permission=None, registry=None):
if not isinstance(required, (tuple, list)):
self.required = required
- self.with = ()
+ self.with_ = ()
else:
self.required = required[0]
- self.with = tuple(required[1:])
+ self.with_ = tuple(required[1:])
self.provided = provided
self.name = name
self.component = factory
@@ -666,7 +666,7 @@
def __repr__(self):
return ('<%s: ' %self.__class__.__name__ +
'required=%r, ' %self.required +
- 'with=' + `self.with` + ', ' +
+ 'with_=' + `self.with_` + ', ' +
'provided=%r, ' %self.provided +
'name=%r, ' %self.name +
'component=%r, ' %self.component +
Modified: zope.app.component/branches/sidnei-back35-quick-hack/src/zope/app/component/site.py
===================================================================
--- zope.app.component/branches/sidnei-back35-quick-hack/src/zope/app/component/site.py 2008-10-10 18:54:24 UTC (rev 92019)
+++ zope.app.component/branches/sidnei-back35-quick-hack/src/zope/app/component/site.py 2008-10-10 18:56:14 UTC (rev 92020)
@@ -238,7 +238,7 @@
elif interfaces.IAdapterRegistration.providedBy(registration):
self.registerAdapter(
registration.component,
- (registration.required, ) + registration.with,
+ (registration.required, ) + registration.with_,
registration.provided,
registration.name,
)
@@ -264,7 +264,7 @@
elif interfaces.IAdapterRegistration.providedBy(registration):
self.unregisterAdapter(
registration.component,
- (registration.required, ) + registration.with,
+ (registration.required, ) + registration.with_,
registration.provided,
registration.name,
)
@@ -305,7 +305,7 @@
r.name == registration.name
and
r.required == ((registration.required, )
- + registration.with)
+ + registration.with_)
)
])
elif (
@@ -321,7 +321,7 @@
r.name == registration.name
and
r.required == ((registration.required, )
- + registration.with)
+ + registration.with_)
)
])
elif zope.component.interfaces.IHandlerRegistration.providedBy(
@@ -336,7 +336,7 @@
r.name == registration.name
and
r.required == ((registration.required, )
- + registration.with)
+ + registration.with_)
)
])
return False
More information about the Checkins
mailing list