[Checkins] SVN: Products.ZCatalog/trunk/src/Products/ZCatalog/CatalogBrains.py Less nesting

[Hanno Schlichting]

Log message for revision 123113:
  Less nesting
  

Changed:
  U   Products.ZCatalog/trunk/src/Products/ZCatalog/CatalogBrains.py

-=-
Modified: Products.ZCatalog/trunk/src/Products/ZCatalog/CatalogBrains.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/ZCatalog/CatalogBrains.py	2011-10-20 13:20:11 UTC (rev 123112)
+++ Products.ZCatalog/trunk/src/Products/ZCatalog/CatalogBrains.py	2011-10-20 13:23:09 UTC (rev 123113)
@@ -53,9 +53,8 @@
     def getURL(self, relative=0):
         """Generate a URL for this record"""
         request = aq_get(self, 'REQUEST', None)
-        if request is None:
-            if _GLOBALREQUEST_INSTALLED:
-                request = getRequest()
+        if request is None and _GLOBALREQUEST_INSTALLED:
+            request = getRequest()
         return request.physicalPathToURL(self.getPath(), relative)
 
     def _unrestrictedGetObject(self):
@@ -64,14 +63,14 @@
         Same as getObject, but does not do security checks.
         """
         parent = aq_parent(self)
-        if aq_get(parent, 'REQUEST', None) is None:
-            if _GLOBALREQUEST_INSTALLED:
-                request = getRequest()
-                if request is not None:
-                    # path should be absolute, starting at the physical root
-                    parent = self.getPhysicalRoot()
-                    request_container = RequestContainer(REQUEST=request)
-                    parent = aq_base(parent).__of__(request_container)
+        if (aq_get(parent, 'REQUEST', None) is None
+            and _GLOBALREQUEST_INSTALLED):
+            request = getRequest()
+            if request is not None:
+                # path should be absolute, starting at the physical root
+                parent = self.getPhysicalRoot()
+                request_container = RequestContainer(REQUEST=request)
+                parent = aq_base(parent).__of__(request_container)
         return parent.unrestrictedTraverse(self.getPath())
 
     def getObject(self, REQUEST=None):
@@ -89,14 +88,14 @@
         if not path:
             return None
         parent = aq_parent(self)
-        if aq_get(parent, 'REQUEST', None) is None:
-            if _GLOBALREQUEST_INSTALLED:
-                request = getRequest()
-                if request is not None:
-                    # path should be absolute, starting at the physical root
-                    parent = self.getPhysicalRoot()
-                    request_container = RequestContainer(REQUEST=request)
-                    parent = aq_base(parent).__of__(request_container)
+        if (aq_get(parent, 'REQUEST', None) is None
+            and _GLOBALREQUEST_INSTALLED):
+            request = getRequest()
+            if request is not None:
+                # path should be absolute, starting at the physical root
+                parent = self.getPhysicalRoot()
+                request_container = RequestContainer(REQUEST=request)
+                parent = aq_base(parent).__of__(request_container)
         if len(path) > 1:
             parent = parent.unrestrictedTraverse(path[:-1])