Reindent code following removal of Business Template format version 0.

product/ERP5/Document/BusinessTemplate.py

@@ -472,7 +472,6 @@ class BaseTemplateItem(Implicit, Persistent):
       XXX: -12 used here is -len('TemplateItem')
     """
     modified_object_list = {}
-    if 1:
     for path in self._objects:
       if installed_item._objects.has_key(path):
         # compare objects to see it there are changes
@@ -817,7 +816,6 @@ class ObjectTemplateItem(BaseTemplateItem):
 
   def preinstall(self, context, installed_item, **kw):
     modified_object_list = {}
-    if 1:
     upgrade_list = []
     type_name = self.__class__.__name__.split('TemplateItem')[-2]
     for path, obj in self._objects.iteritems():
@@ -999,7 +997,7 @@ class ObjectTemplateItem(BaseTemplateItem):
     self.beforeInstall()
     update_dict = kw.get('object_to_update')
     force = kw.get('force')
-    if 1:
+
     def recurse(hook, document, prefix=''):
       my_prefix = '%s/%s' % (prefix, document.id)
       if (hook(document, my_prefix)):
@@ -1835,7 +1833,6 @@ class RegisteredSkinSelectionTemplateItem(BaseTemplateItem):
 
   def preinstall(self, context, installed_item, **kw):
     modified_object_list = {}
-    if 1:
     for path in self._objects:
       if installed_item._objects.has_key(path):
         # compare object to see it there is changes
@@ -2022,7 +2019,6 @@ class WorkflowTemplateItem(ObjectTemplateItem):
     return modified_workflow_dict
 
   def install(self, context, trashbin, **kw):
-    if 1:
     portal = context.getPortalObject()
     update_dict = kw.get('object_to_update')
     force = kw.get('force')
@@ -2359,7 +2355,6 @@ class PortalTypeWorkflowChainTemplateItem(BaseTemplateItem):
 
   def preinstall(self, context, installed_item, **kw):
     modified_object_list = {}
-    if 1:
     new_dict = PersistentMapping()
     # Fix key from installed bt if necessary
     for key, value in installed_item._objects.iteritems():
@@ -2465,7 +2460,6 @@ class PortalTypeAllowedContentTypeTemplateItem(BaseTemplateItem):
 
   def preinstall(self, context, installed_item, **kw):
     modified_object_list = {}
-    if 1:
     new_dict = PersistentMapping()
     # fix key if necessary in installed bt for diff
     for key, value in installed_item._objects.iteritems():
@@ -2749,7 +2743,6 @@ class CatalogMethodTemplateItem(ObjectTemplateItem):
       # Restore filter
       if self._is_filtered_archive.get(method_id, 0):
         expression = self._filter_expression_archive[method_id]
-        if 1:
         if expression and expression.strip():
           # only compile non-empty expressions
           expr_instance = Expression(expression)
@@ -2961,7 +2954,6 @@ class ActionTemplateItem(ObjectTemplateItem):
   def install(self, context, trashbin, **kw):
     update_dict = kw.get('object_to_update')
     force = kw.get('force')
-    if 1:
     portal_type_dict = {}
     p = context.getPortalObject()
     for id in self._objects.keys():
@@ -3248,7 +3240,6 @@ class SitePropertyTemplateItem(BaseTemplateItem):
   def install(self, context, trashbin, **kw):
     update_dict = kw.get('object_to_update')
     force = kw.get('force')
-    if 1:
     p = context.getPortalObject()
     for path in self._objects.keys():
       if update_dict.has_key(path) or force:
@@ -3491,7 +3482,6 @@ class FilesystemDocumentTemplateItem(BaseTemplateItem):
 
   def preinstall(self, context, installed_item, **kw):
     modified_object_list = {}
-    if 1:
     # fix key if necessary in installed bt for diff
     extra_prefix = self.__class__.__name__ + '/'
     for key in installed_item._objects.keys():
@@ -3539,7 +3529,6 @@ class FilesystemDocumentTemplateItem(BaseTemplateItem):
   def install(self, context, trashbin, **kw):
     update_dict = kw.get('object_to_update')
     force = kw.get('force')
-    if 1:
     need_reset = isinstance(self, FilesystemDocumentTemplateItem)
     for key in self._objects.keys():
       # to achieve non data migration fresh installation parameters
@@ -4112,7 +4101,6 @@ class RoleTemplateItem(BaseTemplateItem):
 
   def preinstall(self, context, installed_item, **kw):
     modified_object_list = {}
-    if 1:
     # BBB it might be necessary to change the data structure.
     obsolete_key = self.__class__.__name__ + '/role_list'
     if obsolete_key in installed_item._objects:
@@ -4235,7 +4223,6 @@ class CatalogKeyTemplateItemBase(BaseTemplateItem):
       return
 
     catalog_key_list = list(getattr(catalog, self.key_list_attr, []))
-    if 1:
     if len(self._objects.keys()) == 0: # needed because of pop()
       return
     keys = []
@@ -4408,7 +4395,6 @@ class MessageTranslationTemplateItem(BaseTemplateItem):
 
   def preinstall(self, context, installed_item, **kw):
     modified_object_list = {}
-    if 1:
     for path in self._objects:
       if installed_item._objects.has_key(path):
         # compare object to see if there is changes
@@ -4454,7 +4440,6 @@ class MessageTranslationTemplateItem(BaseTemplateItem):
       localizer = context.getPortalObject().Localizer
     update_dict = kw.get('object_to_update', {})
     force = kw.get('force')
-    if 1:
     for key in sorted(self._objects.keys()):
       if update_dict.has_key(key) or force:
         if not force:

product/ERP5/Tool/TemplateTool.py

@@ -307,7 +307,6 @@ class TemplateTool (BaseTool):
         file.seek(0)
         magic = file.read(5)
 
-      if 1:
       # XXX: should really check for a magic and offer a falback if it
       # doens't correspond to anything handled.
       tar = tarfile.open(path, 'r:gz')