[Zope3-checkins]
SVN: Zope3/branches/roger-contentprovider/src/zope/
Normalize whitespace.
Stephan Richter
srichter at cosmos.phy.tufts.edu
Wed Oct 12 21:39:47 EDT 2005
Log message for revision 39109:
Normalize whitespace.
Changed:
U Zope3/branches/roger-contentprovider/src/zope/app/component/interface.py
U Zope3/branches/roger-contentprovider/src/zope/interface/__init__.py
U Zope3/branches/roger-contentprovider/src/zope/interface/adapter.py
U Zope3/branches/roger-contentprovider/src/zope/interface/declarations.py
-=-
Modified: Zope3/branches/roger-contentprovider/src/zope/app/component/interface.py
===================================================================
--- Zope3/branches/roger-contentprovider/src/zope/app/component/interface.py 2005-10-12 21:33:53 UTC (rev 39108)
+++ Zope3/branches/roger-contentprovider/src/zope/app/component/interface.py 2005-10-13 01:39:47 UTC (rev 39109)
@@ -97,7 +97,7 @@
directlyProvides(interface, iface_type, directlyProvidedBy(interface))
else:
iface_type = IInterface
-
+
gsm = zapi.getGlobalSiteManager()
gsm.provideUtility(iface_type, interface, id, info)
@@ -128,7 +128,7 @@
""" 'zope.app.component.interface.I4')
>>> iface.__name__
'I4'
- >>> placelesssetup.tearDown()
+ >>> placelesssetup.tearDown()
"""
iface = queryInterface(id, None)
if iface is None:
@@ -154,7 +154,7 @@
>>> IContentType.providedBy(I3)
False
>>> queryInterface('zope.app.component.interface.I3')
-
+
>>> provideInterface('', I3, IContentType)
>>> IContentType.providedBy(I3)
True
Modified: Zope3/branches/roger-contentprovider/src/zope/interface/__init__.py
===================================================================
--- Zope3/branches/roger-contentprovider/src/zope/interface/__init__.py 2005-10-12 21:33:53 UTC (rev 39108)
+++ Zope3/branches/roger-contentprovider/src/zope/interface/__init__.py 2005-10-13 01:39:47 UTC (rev 39109)
@@ -36,7 +36,7 @@
o `declarations` provides utilities to declare interfaces on objects. It
also provides a wide range of helpful utilities that aid in managing
- declared interfaces. Most of its public names are however imported here.
+ declared interfaces. Most of its public names are however imported here.
o `document` has a utility for documenting an interface as structured text.
Modified: Zope3/branches/roger-contentprovider/src/zope/interface/adapter.py
===================================================================
--- Zope3/branches/roger-contentprovider/src/zope/interface/adapter.py 2005-10-12 21:33:53 UTC (rev 39108)
+++ Zope3/branches/roger-contentprovider/src/zope/interface/adapter.py 2005-10-13 01:39:47 UTC (rev 39109)
@@ -46,7 +46,7 @@
# subscription adapters.
# 'with' is a tuple of specs that is non-empty only in the case
-# of multi-adapters.
+# of multi-adapters.
# 'name' is a unicode adapter name. Unnamed adapters have an empty
# name.
@@ -172,7 +172,7 @@
# override less-specific data.
ancestors.reverse()
for ancestor in ancestors:
-
+
for key, v in ancestor.selfImplied.iteritems():
# key is specification or ('s', specification)
@@ -184,7 +184,7 @@
oldbyname = implied.get(key)
if not oldbyname:
implied[key] = oldbyname = {}
-
+
# v is name -> object
oldbyname.update(v)
@@ -196,11 +196,11 @@
oldwithobs = implied.get(key)
if not oldwithobs:
oldwithobs = implied[key] = {}
-
+
# v is {with -> tuple([object])}
for with, objects in v.iteritems():
oldwithobs[with] = oldwithobs.get(with, ()) + objects
-
+
else:
oldbyname = implied.get(key)
if not oldbyname:
@@ -301,10 +301,10 @@
break
else:
withs.append((with, value))
-
+
return withs
-
+
def withextends(with1, with2):
for spec1, spec2 in zip(with1, with2):
if spec1.extends(spec2):
@@ -349,7 +349,7 @@
value = byname.get(name, default)
else:
return default
-
+
return value
elif order == 0:
@@ -391,7 +391,7 @@
rank.append(list(spec.__sro__).index(rspec))
else:
# If the new rank is better than the best previously
- # recorded one, make the new adapter the best one found.
+ # recorded one, make the new adapter the best one found.
rank = tuple(rank)
if best is None or rank < best[0]:
best = rank, value
@@ -443,7 +443,7 @@
default = self._default.get(('s', provided))
if default:
result.extend(default)
-
+
return result
elif order == 0:
@@ -452,12 +452,12 @@
return list(result)
else:
return []
-
+
# Multi
key = 's', provided, order
with = required[1:]
result = []
-
+
for surrogate in self.get(required[0]), self._default:
bywith = surrogate.get(key)
if not bywith:
@@ -473,8 +473,8 @@
return result
-
+
def queryMultiAdapter(self, objects, interface, name='', default=None):
factory = self.lookup(map(providedBy, objects), interface, name)
if factory is not None:
@@ -527,7 +527,7 @@
except KeyError:
pass
lookup = AdapterLookup(self, surrogates, _remove)
-
+
for name in ('lookup', 'lookup1', 'queryAdapter', 'get',
'adapter_hook', 'subscriptions',
'queryMultiAdapter', 'subscribers',
@@ -546,7 +546,7 @@
else:
with = ()
required = self._null
-
+
if not isinstance(name, basestring):
raise TypeError("The name provided to provideAdapter "
"must be a string or unicode")
@@ -629,7 +629,7 @@
if provided is None:
provided = Null
-
+
required._subscriptionAdaptTo(provided, value, with)
def mextends(with, rwith):
@@ -679,7 +679,7 @@
def _add_named_adapter(target, provided, name, implied,
registered, value):
-
+
ikey = target
rkey = target, name
@@ -711,7 +711,7 @@
if not bywith:
bywith = byname[name] = {}
-
+
rkey = ikey, name, with # The full key has all 4
if (with not in bywith
or
@@ -730,7 +730,7 @@
def _add_named_sub_adapter(target, implied, objects):
key = ('s', target)
implied[key] = implied.get(key, ()) + objects
-
+
for b in target.__bases__:
_add_named_sub_adapter(b, implied, objects)
Modified: Zope3/branches/roger-contentprovider/src/zope/interface/declarations.py
===================================================================
--- Zope3/branches/roger-contentprovider/src/zope/interface/declarations.py 2005-10-12 21:33:53 UTC (rev 39108)
+++ Zope3/branches/roger-contentprovider/src/zope/interface/declarations.py 2005-10-13 01:39:47 UTC (rev 39109)
@@ -22,8 +22,8 @@
- ProvidesDeclarations are used to express interfaces directly
provided by objects.
-
+
$Id$
"""
__docformat__ = 'restructuredtext'
@@ -35,7 +35,7 @@
from types import ClassType
from zope.interface.advice import addClassAdvisor
-# Registry of class-implementation specifications
+# Registry of class-implementation specifications
BuiltinImplementationSpecifications = {}
class Declaration(Specification):
More information about the Zope3-Checkins
mailing list