From 8b100dd1bcd47232f1c02507d5f07dd7d18dcd13 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 31 Mar 2012 23:25:15 +0200
Subject: [PATCH] [IMP] ir.model: cleanup/de-duplicate code

bzr revid: odo@openerp.com-20120331212515-qoic9kaysswurxnf
---
 openerp/addons/base/ir/ir_model.py | 49 +++++++++++-------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index cbe5dde6fee..1af5818438a 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -917,39 +917,26 @@ class ir_model_data(osv.osv):
             cr.execute('DROP TABLE %s CASCADE'% (table),)
             _logger.info('Dropped table %s', table)
 
-        for (model, res_id) in to_unlink:
-            if model in ('ir.model','ir.model.fields', 'ir.model.data'):
-                continue
-            external_ids = self.search(cr, uid, [('model', '=', model),('res_id', '=', res_id)])
-            if (set(external_ids)-ids_set):
-                # if other modules have defined this record, we do not delete it
-                continue
-            _logger.info('Deleting %s@%s', res_id, model)
-            try:
-                self.pool.get(model).unlink(cr, uid, [res_id], context=context)
-            except:
-                _logger.info('Unable to delete %s@%s', res_id, model, exc_info=True)
-            cr.commit()
+        def unlink_if_refcount(to_unlink):
+            for model, res_id in to_unlink:
+                external_ids = self.search(cr, uid, [('model', '=', model),('res_id', '=', res_id)])
+                if (set(external_ids)-ids_set):
+                    # if other modules have defined this record, we must not delete it
+                    return
+                _logger.info('Deleting %s@%s', res_id, model)
+                try:
+                    self.pool.get(model).unlink(cr, uid, [res_id], context=context)
+                except:
+                    _logger.info('Unable to delete %s@%s', res_id, model, exc_info=True)
 
-        for (model, res_id) in to_unlink:
-            if model != 'ir.model.fields':
-                continue
-            external_ids = self.search(cr, uid, [('model', '=', model),('res_id', '=', res_id)])
-            if (set(external_ids)-ids_set):
-                # if other modules have defined this record, we do not delete it
-                continue
-            _logger.info('Deleting %s@%s', res_id, model)
-            self.pool.get(model).unlink(cr, uid, [res_id], context=context)
+        # Remove non-model records first, then model fields, and finish with models
+        unlink_if_refcount((model, res_id) for model, res_id in to_unlink
+                                if model not in ('ir.model','ir.model.fields'))
+        unlink_if_refcount((model, res_id) for model, res_id in to_unlink
+                                if model == 'ir.model.fields')
+        unlink_if_refcount((model, res_id) for model, res_id in to_unlink
+                                if model == 'ir.model')
 
-        for (model, res_id) in to_unlink:
-            if model != 'ir.model':
-                continue
-            external_ids = self.search(cr, uid, [('model', '=', model),('res_id', '=', res_id)])
-            if (set(external_ids)-ids_set):
-                # if other modules have defined this record, we do not delete it
-                continue
-            _logger.info('Deleting %s@%s', res_id, model)
-            self.pool.get(model).unlink(cr, uid, [res_id], context=context)
         cr.commit()
 
     def _process_end(self, cr, uid, modules):