r13320 - in MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk: . src/archetypes/referencebrowserwidget/browser

Author: tom_gross
Date: Fri Dec  3 09:39:38 2010
New Revision: 13320

Modified:
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/setup.py
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/browser/view.py
Log:
make plone.uuid optional


Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/setup.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/setup.py	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/setup.py	Fri Dec  3 09:39:38 2010
@@ -60,7 +60,7 @@
 #          'Acquisition',
           'plone.app.form',
           'plone.app.jquerytools>=1.1b1',
-          'plone.uuid'
+#          'plone.uuid'
 # Older versions of jquerytools don't work. See #10939
       ],
       entry_points="""

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/browser/view.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/browser/view.py	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/trunk/src/archetypes/referencebrowserwidget/browser/view.py	Fri Dec  3 09:39:38 2010
@@ -17,7 +17,11 @@
 
 from Products.Archetypes.config import REFERENCE_CATALOG
 from Products.CMFCore.utils import getToolByName
-from plone.uuid.interfaces import IUUID
+try:
+    from plone.uuid.interfaces import IUUID
+    HAS_UUID = True
+except ImportError:
+    HAS_UUID = False
 try:
     # Plone >= 4.0
     from plone.sequencebatch import Batch
@@ -65,7 +69,10 @@
         """ Helper to get UID in restricted code without having rights to
             access the object
         """
-        return IUUID(ref, None)
+        if HAS_UUID:
+            return IUUID(ref, None)
+        else:
+            return ref.UID()
 
     def getStartupDirectory(self, field):
         """ Return the path to the startup directory. """

------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev