[Erp5-report] r15230 - /erp5/trunk/products/ERP5/ERP5Site.py

[nobody at svn.erp5.org]

Author: romain
Date: Mon Jul 16 20:33:30 2007
New Revision: 15230

URL: http://svn.erp5.org?rev=15230&view=rev
Log:
Use the else keyword instead of testing

Modified:
    erp5/trunk/products/ERP5/ERP5Site.py

Modified: erp5/trunk/products/ERP5/ERP5Site.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/ERP5Site.py?rev=15230&r1=15229&r2=15230&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/ERP5Site.py (original)
+++ erp5/trunk/products/ERP5/ERP5Site.py Mon Jul 16 20:33:30 2007
@@ -937,19 +937,19 @@
     expected_module_id = portal_type.lower().replace(' ','_')
     if portal_object._getOb(expected_module_id, None) is not None:
       module_id = expected_module_id
-    expected_module_id += '_module'
-    if module_id is None and portal_object._getOb(expected_module_id, None) \
-        is not None:
-      module_id = expected_module_id
-    # then look for module where the type is allowed
-    if module_id is None:
-      for expected_module_id in portal_object.objectIds(spec=('ERP5 Folder',)):
-        module = portal_object._getOb(expected_module_id, None)
-        if module is not None:
-          if portal_type in self.portal_types[module.getPortalType()].\
-                                    allowed_content_types:
-            module_id = expected_module_id
-            break
+    else:
+      expected_module_id += '_module'
+      if portal_object._getOb(expected_module_id, None) is not None:
+        module_id = expected_module_id
+      # then look for module where the type is allowed
+      else:
+        for expected_module_id in portal_object.objectIds(spec=('ERP5 Folder',)):
+          module = portal_object._getOb(expected_module_id, None)
+          if module is not None:
+            if portal_type in self.portal_types[module.getPortalType()].\
+                                      allowed_content_types:
+              module_id = expected_module_id
+              break
 
     if module_id is None:
       if default is not MARKER: