r13683 - in archetypes.schemaextender/trunk: . archetypes/schemaextender

Author: davisagli
Date: Wed Jun 15 03:25:11 2011
New Revision: 13683

Modified:
   archetypes.schemaextender/trunk/CHANGES.txt
   archetypes.schemaextender/trunk/archetypes/schemaextender/extender.py
Log:
revert changes that don't belong on this branch

Modified: archetypes.schemaextender/trunk/CHANGES.txt
==============================================================================
--- archetypes.schemaextender/trunk/CHANGES.txt	(original)
+++ archetypes.schemaextender/trunk/CHANGES.txt	Wed Jun 15 03:25:11 2011
@@ -4,9 +4,6 @@
 2.1.1 - Unreleased
 ------------------
 
-* Only use plone.uuid to look up content UUIDs if objets are aware.
-  [malthe]
-
 * Acquire request object via local site hook if object is not
   acquisition-wrapped (in ``cachingInstanceSchemaFactory``). This
   fixes caching issues with objects rendered using DTML. Note that

Modified: archetypes.schemaextender/trunk/archetypes/schemaextender/extender.py
==============================================================================
--- archetypes.schemaextender/trunk/archetypes/schemaextender/extender.py	(original)
+++ archetypes.schemaextender/trunk/archetypes/schemaextender/extender.py	Wed Jun 15 03:25:11 2011
@@ -11,13 +11,8 @@
 from zope.component import adapter, getAdapters
 from zope.interface import implementer
 from plone.uuid.interfaces import IUUID
-from plone.uuid.interfaces import IUUIDAware
 
-try:
-    from zope.site.hooks import getSite
-except ImportError:
-    # BBB, for older Zope 2
-    from zope.app.component.hooks import getSite
+from zope.site.hooks import getSite
 
 try:
     from plone.browserlayer.utils import registered_layers
@@ -142,13 +137,7 @@
                 # If the object is just being created, we use its id() as a
                 # fallback. Generally the id() is not stable, as it changes
                 # with Acquisition wrappers and ZODB ghosting
-                fallback = str(id(context))
-
-                # Use ``plone.uuid`` only if applicable (object is aware)
-                if IUUIDAware.providedBy(context):
-                    key = IUUID(context, fallback)
-                else:
-                    key = context.UID() or fallback
+                key = IUUID(context, str(id(context))) 
 
                 schema = cache.get(key, None)
                 if schema is None:

------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev