[z3-checkins] r10532 - z3/Five/branch/paris-local-sitemanager-branch

[dreamcatcher at codespeak.net]

Author: dreamcatcher
Date: Mon Apr 11 15:56:30 2005
New Revision: 10532

Modified:
   z3/Five/branch/paris-local-sitemanager-branch/TrustedExpression.py
   z3/Five/branch/paris-local-sitemanager-branch/fiveconfigure.py
Log:
Uncommited changes

Modified: z3/Five/branch/paris-local-sitemanager-branch/TrustedExpression.py
==============================================================================
--- z3/Five/branch/paris-local-sitemanager-branch/TrustedExpression.py	(original)
+++ z3/Five/branch/paris-local-sitemanager-branch/TrustedExpression.py	Mon Apr 11 15:56:30 2005
@@ -60,7 +60,7 @@
       o = get(object, name, M)
       if o is M:
         try: o = object[name]
-        except AttributeError: # better exception
+        except (AttributeError, TypeError): # better exception
           raise AttributeError(name)
     object = o
 

Modified: z3/Five/branch/paris-local-sitemanager-branch/fiveconfigure.py
==============================================================================
--- z3/Five/branch/paris-local-sitemanager-branch/fiveconfigure.py	(original)
+++ z3/Five/branch/paris-local-sitemanager-branch/fiveconfigure.py	Mon Apr 11 15:56:30 2005
@@ -220,12 +220,12 @@
 
 def installSiteHook(_context, class_, utility_provider):
     _context.action(
-        discriminator = None,
+        discriminator = (class_,),
         callable = classSiteHook,
         args=(class_,)
         )
     _context.action(
-        discriminator = None,
+        discriminator = (class_, IPossibleSite),
         callable = classImplements,
         args=(class_, IPossibleSite)
         )
@@ -239,7 +239,7 @@
             provides=IUtilityProvider,
             for_=(iface,))
     _context.action(
-        discriminator = None,
+        discriminator = (class_, 'UtilityMarker'),
         callable = classImplements,
         args=(class_, iface)
         )