r13359 - in MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/plip10778-plone.uuid: . src/archetypes/referencebrowserwidget/browser src/archetypes/referencebrowserwidget/tests

Author: toutpt
Date: Fri Dec 17 09:44:36 2010
New Revision: 13359

Modified:
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/plip10778-plone.uuid/setup.py
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/plip10778-plone.uuid/src/archetypes/referencebrowserwidget/browser/view.py
   MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/plip10778-plone.uuid/src/archetypes/referencebrowserwidget/tests/test_product.py
Log:
add plone.uuid in dependecies. remove bbb code

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/plip10778-plone.uuid/setup.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/plip10778-plone.uuid/setup.py	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/plip10778-plone.uuid/setup.py	Fri Dec 17 09:44:36 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/branches/plip10778-plone.uuid/src/archetypes/referencebrowserwidget/browser/view.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/plip10778-plone.uuid/src/archetypes/referencebrowserwidget/browser/view.py	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/plip10778-plone.uuid/src/archetypes/referencebrowserwidget/browser/view.py	Fri Dec 17 09:44:36 2010
@@ -18,11 +18,7 @@
 
 from Products.Archetypes.config import REFERENCE_CATALOG
 from Products.CMFCore.utils import getToolByName
-try:
-    from plone.uuid.interfaces import IUUID
-    HAS_UUID = True
-except ImportError:
-    HAS_UUID = False
+from plone.uuid.interfaces import IUUID
 try:
     # Plone >= 4.0
     from plone.sequencebatch import Batch
@@ -71,10 +67,7 @@
         """ Helper to get UID in restricted code without having rights to
             access the object
         """
-        if HAS_UUID:
-            return IUUID(ref, None)
-        else:
-            return ref.UID()
+        return IUUID(ref, None)
 
     def getStartupDirectory(self, field):
         """ Return the URL to the startup directory. """

Modified: MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/plip10778-plone.uuid/src/archetypes/referencebrowserwidget/tests/test_product.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/plip10778-plone.uuid/src/archetypes/referencebrowserwidget/tests/test_product.py	(original)
+++ MoreFieldsAndWidgets/archetypes.referencebrowserwidget/branches/plip10778-plone.uuid/src/archetypes/referencebrowserwidget/tests/test_product.py	Fri Dec 17 09:44:36 2010
@@ -19,11 +19,7 @@
 from Products.CMFCore.utils import getToolByName
 from Products.PloneTestCase.PloneTestCase import default_password
 from Products.PloneTestCase.PloneTestCase import portal_owner
-try:
-    import plone.uuid
-    HAS_UUID=True
-except:
-    HAS_UUID=False
+import plone.uuid
 
 try:
     # Plone 4
@@ -569,19 +565,13 @@
 
         ROWS = re.compile(r'<tr.*?>(.*?)</tr>', re.MULTILINE|re.DOTALL)
         self.assertEqual(len(ROWS.findall(body)), wanted_rows)
-        if HAS_UUID:
-            self.assertEqual(len(INSERTLINK_UUID.findall(body)), wanted_insertlinks)
-        else:
-            self.assertEqual(len(INSERTLINK.findall(body)), wanted_insertlinks)
+        self.assertEqual(len(INSERTLINK_UUID.findall(body)), wanted_insertlinks)
 
         makeContent(self.portal, portal_type='News Item', id='newsitem')
         body = self.getNormalizedPopup()
 
         self.assertEqual(len(ROWS.findall(body)), wanted_rows + 1)
-        if HAS_UUID:
-            self.assertEqual(len(INSERTLINK_UUID.findall(body)), wanted_insertlinks)
-        else:
-            self.assertEqual(len(INSERTLINK.findall(body)), wanted_insertlinks)
+        self.assertEqual(len(INSERTLINK_UUID.findall(body)), wanted_insertlinks)
 
     def test_bc_navigationroot(self):
         makeContent(self.portal.folder1, portal_type='Document', id='page1')

------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d