From 3d36d6539b44ffe55f19dc262a850ab1bad250ee Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Wed, 20 May 2015 11:13:26 +0200
Subject: [PATCH] [IMP] readability

---
 database_cleanup/model/purge_modules.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/database_cleanup/model/purge_modules.py b/database_cleanup/model/purge_modules.py
index 37651f39f..d371b5f05 100644
--- a/database_cleanup/model/purge_modules.py
+++ b/database_cleanup/model/purge_modules.py
@@ -45,13 +45,15 @@ class IrModelData(orm.Model):
     def _module_data_uninstall(self, cr, uid, modules_to_remove, context=None):
         """this function crashes for xmlids on undefined models or fields
         referring to undefined models"""
+        if context is None:
+            context = {}
         ids = self.search(cr, uid, [('module', 'in', modules_to_remove)])
         for this in self.browse(cr, uid, ids, context=context):
             if this.model == 'ir.model.fields':
+                ctx = context.copy()
+                ctx[MODULE_UNINSTALL_FLAG] = True
                 field = self.pool[this.model].browse(
-                    cr, uid, [this.res_id],
-                    context=dict(
-                        context or {}, **{MODULE_UNINSTALL_FLAG: True}))[0]
+                    cr, uid, this.res_id, context=ctx)
                 if not self.pool.get(field.model):
                     this.unlink()
                     continue