- Zope-Dev - Zope lists

Zope Tests: 5 OK
by Zope Tests Summarizer 31 Jul '08

31 Jul '08

Summary of messages to the zope-tests list. Period Wed Jul 30 11:00:00 2008 UTC to Thu Jul 31 11:00:00 2008 UTC. There were 5 messages: 5 from Zope Tests. Tests passed OK --------------- Subject: OK : Zope-2.8 Python-2.3.6 : Linux From: Zope Tests Date: Wed Jul 30 20:53:23 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009935.html Subject: OK : Zope-2.9 Python-2.4.4 : Linux From: Zope Tests Date: Wed Jul 30 20:54:53 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009936.html Subject: OK : Zope-2.10 Python-2.4.4 : Linux From: Zope Tests Date: Wed Jul 30 20:56:23 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009937.html Subject: OK : Zope-2.11 Python-2.4.4 : Linux From: Zope Tests Date: Wed Jul 30 20:57:53 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009938.html Subject: OK : Zope-trunk Python-2.4.4 : Linux From: Zope Tests Date: Wed Jul 30 20:59:23 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009939.html

1 0

Re: import error in python2.6
by Bristow Thankachan 31 Jul '08

31 Jul '08

Hi, Can anybody tell me how to run the module ImplPython in python2.6 to check for syntax errors. Or is there any other means by which I can correct the import error of the module ImplPython? The error message is as follows:- Running tests at level 1 /home/zope/ztrunk26/lib/python/zope/schema/_field.py:24: DeprecationWarning: the sets module is deprecated from sets import Set as SetType Traceback (most recent call last): File "./test.py", line 117, in <module> sys.exit(testrunner.run(defaults)) File "/home/zope/ztrunk26/lib/python/zope/testing/testrunner.py", line 932, in run failed = not run_with_options(options) File "/home/zope/ztrunk26/lib/python/zope/testing/testrunner.py", line 1040, in run_with_options tests_by_layer_name = find_tests(options, found_suites) File "/home/zope/ztrunk26/lib/python/zope/testing/testrunner.py", line 1615, in find_tests for suite in found_suites: File "/home/zope/ztrunk26/lib/python/zope/testing/testrunner.py", line 1654, in find_suites for fpath, package in find_test_files(options): File "/home/zope/ztrunk26/lib/python/zope/testing/testrunner.py", line 1735, in find_test_files for f, package in find_test_files_(options): File "/home/zope/ztrunk26/lib/python/zope/testing/testrunner.py", line 1763, in find_test_files_ for (p, package) in test_dirs(options, {}): File "/home/zope/ztrunk26/lib/python/zope/testing/testrunner.py", line 1818, in test_dirs p = import_name(p) File "/home/zope/ztrunk26/lib/python/zope/testing/testrunner.py", line 1834, in import_name __import__(name) File "/home/zope/ztrunk26/lib/python/AccessControl/__init__.py", line 17, in <module> from Implementation import setImplementation File "/home/zope/ztrunk26/lib/python/AccessControl/Implementation.py", line 98, in <module> setImplementation("C") File "/home/zope/ztrunk26/lib/python/AccessControl/Implementation.py", line 51, in setImplementation from AccessControl import ImplC as impl File "/home/zope/ztrunk26/lib/python/AccessControl/ImplC.py", line 29, in <module> from ImplPython import RestrictedDTML, SecurityManager, ZopeSecurityPolicy ImportError: No module named ImplPython regards Bristow. On Mon, Jul 28, 2008 at 8:44 PM, Baiju M <mbaiju(a)zeomega.com> wrote: > Hi Bristow, > > > Bristow Thankachan wrote: > >> Hi, >> >> During the porting to python2.6, I'm stuck with the import error. I >> need your help to correct the error. The error message is give >> below:- >> >> from AccessControl import ImplC as impl File >> "/home/zope/ztrunk26/lib/python/AccessControl/ImplC.py", line 29, in >> <module> from ImplPython import RestrictedDTML, SecurityManager, >> ZopeSecurityPolicy ImportError: No module named ImplPython. >> >> I tried copying the file ImplPython, then I got the following error >> message. >> >> File "/home/zope/ztrunk26/lib/python/html_quote.py", line 4, in >> <module> from ustr import ustr ImportError: No module named ustr. >> >> So please help me to rectify the import errors. How can I move >> forward on correcting these import errors? >> > > Few days back you got a reply from Lennart regarding this issue ? > http://mail.zope.org/pipermail/zope-dev/2008-July/032692.html > > Did you checked that ? Can you please verify whether there is > any syntax error or not ? > > Also can you please provide full traceback of this error ? > > Regards, > Baiju M > > >

2 1

Zope Tests: 4 OK, 1 Failed
by Zope Tests Summarizer 30 Jul '08

30 Jul '08

Summary of messages to the zope-tests list. Period Tue Jul 29 11:00:00 2008 UTC to Wed Jul 30 11:00:00 2008 UTC. There were 5 messages: 5 from Zope Tests. Test failures ------------- Subject: FAILED (errors=1) : Zope-2.8 Python-2.3.6 : Linux From: Zope Tests Date: Tue Jul 29 20:52:19 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009930.html Tests passed OK --------------- Subject: OK : Zope-2.9 Python-2.4.4 : Linux From: Zope Tests Date: Tue Jul 29 20:53:49 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009931.html Subject: OK : Zope-2.10 Python-2.4.4 : Linux From: Zope Tests Date: Tue Jul 29 20:55:19 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009932.html Subject: OK : Zope-2.11 Python-2.4.4 : Linux From: Zope Tests Date: Tue Jul 29 20:56:49 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009933.html Subject: OK : Zope-trunk Python-2.4.4 : Linux From: Zope Tests Date: Tue Jul 29 20:58:19 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009934.html

1 0

Running the 3.4 KGS tests: 9 fail, 6 errors
by Marius Gedminas 29 Jul '08

29 Jul '08

I finally discovered zope.release (and by "discovered" I mean Stephan Richter told me about it on IRC, again, but this time I had the time to take a look). It has a script that generates a buildout of all the KGS packages so you could run the tests on all of them: svn co svn+ssh://svn.zope.org/repos/main/zope.release/branches/3.4 zope.release cd zope.release buildout bin/generate-buildout cd test buildout For some reason, the test script tries to run all the tests found in my /usr/lib/python2.5/site-packages, some of which then fail. vi bin/test remove site-packages bin/test -pvc I see 9 failures and 4 errors on my system (Python 2.5 on 32-bit Linux): * z3c.coverage 1.1.1 has a nondeterministic test (assumes the order of the names returned by os.listdir()). This has been fixed in SVN, but nobody has made a 1.1.2 release and updated the KGS. I don't have PyPI rights to release z3c.coverage. * z3c.form 1.8.0 is not compatible with Python 2.5 (assumes OverflowWarning) * z3c.rml 0.7.3 tests fail to find random TTF font files and fail. * zc.zope3recipes 0.6.1 is trying to get a distribution for setuptools, recursively, until it gets a stack overflow error * zope.server 3.4.2 is very unhappy about some bad file descriptors * the test runner keels over at the end of the unit test run, with AttributeError: 'module' object has no attribute 'DemoLayer' If I then continue by skipping the unit tests bin/test -pvc -f all the tests in layers pass. I have interest in fixing these errors, especially the test runner one (because it's important), and the z3c.coverage one (because it's easy). I don't know if Python 2.5 compatibility is important for the 3.4 KGS, but the z3c.form problem seems to be easy to fix. I don't believe I have the expertise to handle the zc.zope3recipes recursive setuptools failure. Although it looks like it could provide me with a few hours of entertaining debugging, I've no confidence I can fix it. The zope.server multi-threaded bad file descriptor errors also seem tricky. A lot of tests like to spew random output to stdout/stderr, which makes interpreting the test output harder (and probably breaking the test runner if it has to run any of those tests in a subprocess, e.g. if you want to run those tests in parallel). A crusade to clean that up is out of scope for 3.4, IMHO. I think I'll run the test suite again on a 64-bit Linux machine, for extra fun. And maybe do that for Python 2.4 as well. Marius Gedminas -- Always proofread carefully to seon e if you any words out.

3 4

Killing deprecation warnings in Zope 3.4
by Marius Gedminas 29 Jul '08

29 Jul '08

In case some of you noticed my sudden interest in Zope 3.4 after a long period of silent indifference, I'm porting a large-ish app from 3.2 to 3.4. At the moment is it simpler for me to use the monolithic Zope 3.4 subversion branch with all those svn:externals. This is why I'm doing various cleanups around it. Today I was irritated by deprecation warnings and fixed them all, but haven't had the time to commit them. The commits are a bit more involved these days: - for each egg (assuming none of them have C modules): - check out from svn - apply patch - run tests - tag a release - update setup.py (twice) - upload to pypi - update the KGS version list in zope.release - upload it to downloads.zope.org - update the 3.4 tree At least we have documentation: - http://svn.zope.org/*checkout*/Sandbox/philikon/foundation/releasing-softwa… - http://svn.zope.org/*checkout*/zope.release/branches/3.4/README.txt It's time to go home for me today, so I'm posting the uncommitted diff here, for two reasons: - Tomorrow I'll see the diff and a list of actions, so I won't forget what I was doing and where exactly I stopped - Maybe someone else will take a look at the diff and update a few of the affected packages: zope.app.applicationcontrol zope.app.cache zope.app.pagetemplate zope.app.pythonpage zope.app.wsgi zope.traversing Marius Gedminas -- main(k){float i,j,r,x,y=-16;while(puts(""),y++<15)for(x =0;x++<84;putchar(" .:-;!/>)|&IH%*#"[k&15]))for(i=k=r=0; j=r*r-i*i-2+x/25,i=2*r*i+y/10,j*j+i*i<11&&k++<111;r=j);} /* Mandelbrot in ASCII. */

1 0

Zope Tests: 5 OK
by Zope Tests Summarizer 29 Jul '08

29 Jul '08

Summary of messages to the zope-tests list. Period Mon Jul 28 11:00:00 2008 UTC to Tue Jul 29 11:00:00 2008 UTC. There were 5 messages: 5 from Zope Tests. Tests passed OK --------------- Subject: OK : Zope-2.8 Python-2.3.6 : Linux From: Zope Tests Date: Mon Jul 28 20:51:52 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009925.html Subject: OK : Zope-2.9 Python-2.4.4 : Linux From: Zope Tests Date: Mon Jul 28 20:53:23 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009926.html Subject: OK : Zope-2.10 Python-2.4.4 : Linux From: Zope Tests Date: Mon Jul 28 20:54:53 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009927.html Subject: OK : Zope-2.11 Python-2.4.4 : Linux From: Zope Tests Date: Mon Jul 28 20:56:23 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009928.html Subject: OK : Zope-trunk Python-2.4.4 : Linux From: Zope Tests Date: Mon Jul 28 20:57:53 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009929.html

1 0

Zope Tests: 5 OK
by Zope Tests Summarizer 28 Jul '08

28 Jul '08

Summary of messages to the zope-tests list. Period Sun Jul 27 11:00:00 2008 UTC to Mon Jul 28 11:00:00 2008 UTC. There were 5 messages: 5 from Zope Tests. Tests passed OK --------------- Subject: OK : Zope-2.8 Python-2.3.6 : Linux From: Zope Tests Date: Sun Jul 27 20:58:51 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009920.html Subject: OK : Zope-2.9 Python-2.4.4 : Linux From: Zope Tests Date: Sun Jul 27 21:00:22 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009921.html Subject: OK : Zope-2.10 Python-2.4.4 : Linux From: Zope Tests Date: Sun Jul 27 21:01:52 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009922.html Subject: OK : Zope-2.11 Python-2.4.4 : Linux From: Zope Tests Date: Sun Jul 27 21:03:22 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009923.html Subject: OK : Zope-trunk Python-2.4.4 : Linux From: Zope Tests Date: Sun Jul 27 21:04:52 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009924.html

1 0

Zope Tests: 5 OK
by Zope Tests Summarizer 27 Jul '08

27 Jul '08

Summary of messages to the zope-tests list. Period Sat Jul 26 11:00:00 2008 UTC to Sun Jul 27 11:00:00 2008 UTC. There were 5 messages: 5 from Zope Tests. Tests passed OK --------------- Subject: OK : Zope-2.8 Python-2.3.6 : Linux From: Zope Tests Date: Sat Jul 26 20:57:23 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009915.html Subject: OK : Zope-2.9 Python-2.4.4 : Linux From: Zope Tests Date: Sat Jul 26 20:58:54 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009916.html Subject: OK : Zope-2.10 Python-2.4.4 : Linux From: Zope Tests Date: Sat Jul 26 21:00:24 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009917.html Subject: OK : Zope-2.11 Python-2.4.4 : Linux From: Zope Tests Date: Sat Jul 26 21:01:54 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009918.html Subject: OK : Zope-trunk Python-2.4.4 : Linux From: Zope Tests Date: Sat Jul 26 21:03:24 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009919.html

1 0

Zope Tests: 5 OK
by Zope Tests Summarizer 26 Jul '08

26 Jul '08

Summary of messages to the zope-tests list. Period Fri Jul 25 11:00:00 2008 UTC to Sat Jul 26 11:00:00 2008 UTC. There were 5 messages: 5 from Zope Tests. Tests passed OK --------------- Subject: OK : Zope-2.8 Python-2.3.6 : Linux From: Zope Tests Date: Fri Jul 25 21:01:36 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009910.html Subject: OK : Zope-2.9 Python-2.4.4 : Linux From: Zope Tests Date: Fri Jul 25 21:03:06 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009911.html Subject: OK : Zope-2.10 Python-2.4.4 : Linux From: Zope Tests Date: Fri Jul 25 21:04:36 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009912.html Subject: OK : Zope-2.11 Python-2.4.4 : Linux From: Zope Tests Date: Fri Jul 25 21:06:06 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009913.html Subject: OK : Zope-trunk Python-2.4.4 : Linux From: Zope Tests Date: Fri Jul 25 21:07:36 EDT 2008 URL: http://mail.zope.org/pipermail/zope-tests/2008-July/009914.html

1 0

Re: SVN: zope.component/ Merge wichert-utility-factories branch to trunk
by Jacob Holm 25 Jul '08

25 Jul '08

Hello This checkin contains the following change to zope.component/trunk/src/zope/component/registry.py which looks wrong to me (it's a noop). It looks to me as if the [:2] should move outside the ")" following it. I am surprised that this doesn't break any tests, as it means that reregistrations are not detected as such. - if (self._utility_registrations.get((provided, name)) + if (self._utility_registrations.get((provided, name)[:2]) Wichert Akkerman wrote: > Log message for revision 88794: > Merge wichert-utility-factories branch to trunk > > Changed: > D zope.component/branches/wichert-utility-factories/ > U zope.component/trunk/README.txt > U zope.component/trunk/src/zope/component/interfaces.py > U zope.component/trunk/src/zope/component/registry.py > U zope.component/trunk/src/zope/component/registry.txt > U zope.component/trunk/src/zope/component/zcml.py > > -=- > Modified: zope.component/trunk/README.txt > =================================================================== > --- zope.component/trunk/README.txt 2008-07-24 16:00:26 UTC (rev 88793) > +++ zope.component/trunk/README.txt 2008-07-24 16:17:58 UTC (rev 88794) > @@ -14,6 +14,10 @@ > 3.5.0 (unreleased) > ================== > > +Support registration of utilities via factories through the component registry > +and return factory information in the registration information. This fixes > +https://bugs.launchpad.net/zope3/+bug/240631 > + > Optimized un/registerUtility via storing an optimized data structure for > efficient retrieval of already registered utilities. This avoids looping over > all utilities when registering a new one. > > Modified: zope.component/trunk/src/zope/component/interfaces.py > =================================================================== > --- zope.component/trunk/src/zope/component/interfaces.py 2008-07-24 16:00:26 UTC (rev 88793) > +++ zope.component/trunk/src/zope/component/interfaces.py 2008-07-24 16:17:58 UTC (rev 88794) > @@ -512,6 +512,7 @@ > """Information about the registration of a utility > """ > > + factory = interface.Attribute("The factory used to create the utility. Optional.") > component = interface.Attribute("The object registered") > provided = interface.Attribute("The interface provided by the component") > > @@ -583,9 +584,12 @@ > """Register components > """ > > - def registerUtility(component, provided=None, name=u'', info=u''): > + def registerUtility(component=None, provided=None, name=u'', info=u'', factory=None): > """Register a utility > > + factory > + Factory for the component to be registerd. > + > component > The registered component > > @@ -602,10 +606,11 @@ > An object that can be converted to a string to provide > information about the registration. > > + Only one of component and factory can be used. > A Registered event is generated with an IUtilityRegistration. > """ > > - def unregisterUtility(component=None, provided=None, name=u''): > + def unregisterUtility(component=None, provided=None, name=u'', factory=None): > """Unregister a utility > > A boolean is returned indicating whether the registry was > @@ -614,6 +619,9 @@ > None and is not registered, then the function returns > False, otherwise it returns True. > > + factory > + Factory for the component to be unregisterd. > + > component > The registered component The given component can be > None, in which case any component registered to provide > @@ -629,6 +637,7 @@ > name > The utility name. > > + Only one of component and factory can be used. > An UnRegistered event is generated with an IUtilityRegistration. > """ > > > Modified: zope.component/trunk/src/zope/component/registry.py > =================================================================== > --- zope.component/trunk/src/zope/component/registry.py 2008-07-24 16:00:26 UTC (rev 88793) > +++ zope.component/trunk/src/zope/component/registry.py 2008-07-24 16:17:58 UTC (rev 88794) > @@ -65,12 +65,17 @@ > lambda self, bases: self._setBases(bases), > ) > > - def registerUtility(self, component, provided=None, name=u'', info=u'', > - event=True): > + def registerUtility(self, component=None, provided=None, name=u'', info=u'', > + event=True, factory=None): > + if factory: > + if component: > + raise TypeError("Can't specify factory and component.") > + component = factory() > + > if provided is None: > provided = _getUtilityProvided(component) > > - if (self._utility_registrations.get((provided, name)) > + if (self._utility_registrations.get((provided, name)[:2]) > == (component, info)): > # already registered > return > @@ -81,7 +86,7 @@ > subscribed = True > break > > - self._utility_registrations[(provided, name)] = component, info > + self._utility_registrations[(provided, name)] = component, info, factory > self.utilities.register((), provided, name, component) > > if not subscribed: > @@ -89,13 +94,18 @@ > > if event: > zope.event.notify(interfaces.Registered( > - UtilityRegistration(self, provided, name, component, info) > + UtilityRegistration(self, provided, name, component, info, factory) > )) > > - def unregisterUtility(self, component=None, provided=None, name=u''): > + def unregisterUtility(self, component=None, provided=None, name=u'', factory=None): > + if factory: > + if component: > + raise TypeError("Can't specify factory and component.") > + component = factory() > + > if provided is None: > if component is None: > - raise TypeError("Must specify one of component and provided") > + raise TypeError("Must specify one of component, factory and provided") > provided = _getUtilityProvided(component) > > old = self._utility_registrations.get((provided, name)) > @@ -118,15 +128,15 @@ > self.utilities.unsubscribe((), provided, component) > > zope.event.notify(interfaces.Unregistered( > - UtilityRegistration(self, provided, name, component, old[1]) > + UtilityRegistration(self, provided, name, component, *old[1:]) > )) > > return True > > def registeredUtilities(self): > - for ((provided, name), (component, info) > + for ((provided, name), data > ) in self._utility_registrations.iteritems(): > - yield UtilityRegistration(self, provided, name, component, info) > + yield UtilityRegistration(self, provided, name, *data) > > def queryUtility(self, provided, name=u'', default=None): > return self.utilities.lookup((), provided, name, default) > @@ -398,18 +408,20 @@ > > interface.implements(interfaces.IUtilityRegistration) > > - def __init__(self, registry, provided, name, component, doc): > - (self.registry, self.provided, self.name, self.component, self.info > - ) = registry, provided, name, component, doc > + def __init__(self, registry, provided, name, component, doc, factory=None): > + (self.registry, self.provided, self.name, self.component, self.info, > + self.factory > + ) = registry, provided, name, component, doc, factory > > def __repr__(self): > - return '%s(%r, %s, %r, %s, %r)' % ( > - self.__class__.__name__, > - self.registry, > - getattr(self.provided, '__name__', None), self.name, > - getattr(self.component, '__name__', `self.component`), self.info, > - ) > - > + return '%s(%r, %s, %r, %s, %r, %r)' % ( > + self.__class__.__name__, > + self.registry, > + getattr(self.provided, '__name__', None), self.name, > + getattr(self.component, '__name__', `self.component`), > + self.factory, self.info, > + ) > + > def __cmp__(self, other): > return cmp(self.__repr__(), other.__repr__()) > > > Modified: zope.component/trunk/src/zope/component/registry.txt > =================================================================== > --- zope.component/trunk/src/zope/component/registry.txt 2008-07-24 16:00:26 UTC (rev 88793) > +++ zope.component/trunk/src/zope/component/registry.txt 2008-07-24 16:17:58 UTC (rev 88794) > @@ -35,7 +35,7 @@ > > >>> components.registerUtility(tests.U1(1)) > Registered event: > - UtilityRegistration(<Components comps>, I1, u'', 1, u'') > + UtilityRegistration(<Components comps>, I1, u'', 1, None, u'') > > Here we didn't specify an interface or name. An unnamed utility was > registered for interface I1, since that is only interface implemented > @@ -44,6 +44,15 @@ > >>> components.getUtility(tests.I1) > U1(1) > > +You can also register a utility using a factory instead of a utility instance: > + > + >>> def factory(): > + ... return tests.U1(1) > + >>> components.registerUtility(factory=factory) > + Registered event: > + UtilityRegistration(<Components comps>, I1, u'', 1, <function factory at <SOME ADDRESS>>, u'') > + > + > If a component implements other than one interface or no interface, > then an error will be raised: > > @@ -66,13 +75,13 @@ > > >>> components.registerUtility(tests.U12(2), tests.I2) > Registered event: > - UtilityRegistration(<Components comps>, I2, u'', 2, u'') > + UtilityRegistration(<Components comps>, I2, u'', 2, None, u'') > > and we can specify a name: > > >>> components.registerUtility(tests.U12(3), tests.I2, u'three') > Registered event: > - UtilityRegistration(<Components comps>, I2, u'three', 3, u'') > + UtilityRegistration(<Components comps>, I2, u'three', 3, None, u'') > > >>> components.getUtility(tests.I2) > U12(2) > @@ -113,7 +122,7 @@ > > >>> components.registerUtility(tests.U1(4), info=u'use 4 now') > Registered event: > - UtilityRegistration(<Components comps>, I1, u'', 4, u'use 4 now') > + UtilityRegistration(<Components comps>, I1, u'', 4, None, u'use 4 now') > >>> components.getUtility(tests.I1) > U1(4) > > @@ -135,7 +144,7 @@ > > >>> components.unregisterUtility(provided=tests.I1) > Unregistered event: > - UtilityRegistration(<Components comps>, I1, u'', 4, u'use 4 now') > + UtilityRegistration(<Components comps>, I1, u'', 4, None, u'use 4 now') > True > > A boolean is returned indicating whether anything changed: > @@ -155,14 +164,14 @@ > >>> u5 = tests.U1(5) > >>> components.registerUtility(u5) > Registered event: > - UtilityRegistration(<Components comps>, I1, u'', 5, u'') > + UtilityRegistration(<Components comps>, I1, u'', 5, None, u'') > >>> components.unregisterUtility(tests.U1(6)) > False > >>> components.queryUtility(tests.I1) > U1(5) > >>> components.unregisterUtility(u5) > Unregistered event: > - UtilityRegistration(<Components comps>, I1, u'', 5, u'') > + UtilityRegistration(<Components comps>, I1, u'', 5, None, u'') > True > >>> components.queryUtility(tests.I1) > > @@ -179,7 +188,7 @@ > >>> util = tests.U('ext') > >>> components.registerUtility(util, tests.I2e) > Registered event: > - UtilityRegistration(<Components comps>, I2e, u'', ext, u'') > + UtilityRegistration(<Components comps>, I2e, u'', ext, None, u'') > > We don't get the new utility for getUtilitiesFor: > > @@ -910,7 +919,7 @@ > > >>> c1.registerUtility(tests.U1(1)) > Registered event: > - UtilityRegistration(<Components 1>, I1, u'', 1, u'') > + UtilityRegistration(<Components 1>, I1, u'', 1, None, u'') > > >>> c1.queryUtility(tests.I1) > U1(1) > @@ -918,7 +927,7 @@ > U1(1) > >>> c1.registerUtility(tests.U1(2)) > Registered event: > - UtilityRegistration(<Components 1>, I1, u'', 2, u'') > + UtilityRegistration(<Components 1>, I1, u'', 2, None, u'') > > >>> c2.queryUtility(tests.I1) > U1(2) > @@ -932,14 +941,14 @@ > > >>> c1.registerUtility(tests.U12(1), tests.I2) > Registered event: > - UtilityRegistration(<Components 1>, I2, u'', 1, u'') > + UtilityRegistration(<Components 1>, I2, u'', 1, None, u'') > > >>> c4.queryUtility(tests.I2) > U12(1) > > >>> c3.registerUtility(tests.U12(3), tests.I2) > Registered event: > - UtilityRegistration(<Components 3>, I2, u'', 3, u'') > + UtilityRegistration(<Components 3>, I2, u'', 3, None, u'') > >>> c4.queryUtility(tests.I2) > U12(3) > > @@ -1065,15 +1074,15 @@ > >>> components.registerUtility(u5) > ... # doctest: +NORMALIZE_WHITESPACE > Double dispatch: > - UtilityRegistration(<Components comps>, I1, u'', 5, u'') > + UtilityRegistration(<Components comps>, I1, u'', 5, None, u'') > Registered event: > - UtilityRegistration(<Components comps>, I1, u'', 5, u'') > + UtilityRegistration(<Components comps>, I1, u'', 5, None, u'') > Double dispatch: > U1(5) > Registered event: > - UtilityRegistration(<Components comps>, I1, u'', 5, u'') > + UtilityRegistration(<Components comps>, I1, u'', 5, None, u'') > Registered event: > - UtilityRegistration(<Components comps>, I1, u'', 5, u'') > + UtilityRegistration(<Components comps>, I1, u'', 5, None, u'') > > >>> components.registerAdapter(tests.A12_1) > ... # doctest: +NORMALIZE_WHITESPACE > > Modified: zope.component/trunk/src/zope/component/zcml.py > =================================================================== > --- zope.component/trunk/src/zope/component/zcml.py 2008-07-24 16:00:26 UTC (rev 88793) > +++ zope.component/trunk/src/zope/component/zcml.py 2008-07-24 16:17:58 UTC (rev 88794) > @@ -400,10 +400,8 @@ > > def utility(_context, provides=None, component=None, factory=None, > permission=None, name=''): > - if factory: > - if component: > - raise TypeError("Can't specify factory and component.") > - component = factory() > + if factory and component: > + raise TypeError("Can't specify factory and component.") > > if provides is None: > provides = list(zope.interface.providedBy(component)) > @@ -423,6 +421,7 @@ > discriminator = ('utility', provides, name), > callable = handler, > args = ('registerUtility', component, provides, name), > + kw = dict(factory=factory), > ) > _context.action( > discriminator = None, > > _______________________________________________ > Checkins mailing list > Checkins(a)zope.org > http://mail.zope.org/mailman/listinfo/checkins >

4 5