[Checkins] SVN: grok/branches/jw-simpler-skin-registration/src/grok/ Also give the old-fashion grok.Skin class grokker a proper action discriminator.

[Philipp von Weitershausen]

Log message for revision 89141:
  Also give the old-fashion grok.Skin class grokker a proper action discriminator.
  

Changed:
  U   grok/branches/jw-simpler-skin-registration/src/grok/meta.py
  U   grok/branches/jw-simpler-skin-registration/src/grok/tests/conflict/skin.py

-=-
Modified: grok/branches/jw-simpler-skin-registration/src/grok/meta.py
===================================================================
--- grok/branches/jw-simpler-skin-registration/src/grok/meta.py	2008-08-01 12:56:56 UTC (rev 89140)
+++ grok/branches/jw-simpler-skin-registration/src/grok/meta.py	2008-08-01 12:59:03 UTC (rev 89141)
@@ -642,7 +642,7 @@
 
     def execute(self, factory, config, name, layer, **kw):
         config.action(
-            discriminator=('skin', name),
+            discriminator=('utility', IBrowserSkinType, name),
             callable=zope.component.interface.provideInterface,
             args=(name, layer, IBrowserSkinType)
             )

Modified: grok/branches/jw-simpler-skin-registration/src/grok/tests/conflict/skin.py
===================================================================
--- grok/branches/jw-simpler-skin-registration/src/grok/tests/conflict/skin.py	2008-08-01 12:56:56 UTC (rev 89140)
+++ grok/branches/jw-simpler-skin-registration/src/grok/tests/conflict/skin.py	2008-08-01 12:59:03 UTC (rev 89141)
@@ -5,7 +5,7 @@
   Traceback (most recent call last):
     ...
   ConfigurationConflictError: Conflicting configuration actions
-    For: ('skin', 'foo')
+    For: ('utility', <InterfaceClass zope.publisher.interfaces.browser.IBrowserSkinType>, 'foo')
 """
 
 import grok