[MERGE] merge with latest stable

[odoo/odoo.git] / addons / document / document_storage.py

diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index eaa4244..b61b7fd 100644 (file)
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -422,9 +422,7 @@ class document_storage(osv.osv):
             optionally, fil_obj could point to the browse object of the file
             (ir.attachment)
         """
-        if not context:
-            context = {}
-        boo = self.browse(cr, uid, id, context)
+        boo = self.browse(cr, uid, id, context=context)
         if not boo.online:
             raise IOError(errno.EREMOTE, 'medium offline')
         
@@ -540,8 +538,6 @@ class document_storage(osv.osv):
             This function MUST be used from an ir.attachment. It wouldn't make sense
             to store things persistently for other types (dynamic).
         """
-        if not context:
-            context = {}
         boo = self.browse(cr, uid, id, context=context)
         if fil_obj:
             ira = fil_obj
@@ -688,8 +684,6 @@ class document_storage(osv.osv):
             
             @return the dict of values that can safely be be stored in the db.
         """
-        if not context:
-            context = {}
         sbro = self.browse(cr, uid, file_node.storage_id, context=context)
         assert sbro, "The file #%d didn't provide storage" % file_node.file_id
 
@@ -732,8 +726,6 @@ class document_storage(osv.osv):
                     file should move to.
             @return the dict of values that can safely be be stored in the db.
         """
-        if not context:
-            context = {}
         sbro = self.browse(cr, uid, file_node.storage_id, context=context)
         assert sbro, "The file #%d didn't provide storage" % file_node.file_id