[MERGE]: Merged with team1.

bzr revid: uco@tinyerp.com-20101112044246-qc1tp6ohth0kduie
bzr revid: uco@tinyerp.com-20101115044934-pu05mgdtmmcqs2hz

2 files changed, 4 insertions, 1 deletions

diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 9c16e7dde55..65b17a52c51 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -146,16 +146,18 @@ class abstracted_fs(object):
 
                 ret = child.open_data(cr, mode)
                 cr.commit()
+                assert ret, "Cannot create descriptor for %r: %r" % (child, ret)
                 return ret
         except EnvironmentError:
             raise
-        except Exception,e:
+        except Exception:
             self._log.exception('Cannot locate item %s at node %s', objname, repr(node))
             pass
 
         try:
             child = node.create_child(cr, objname, data=None)
             ret = child.open_data(cr, mode)
+            assert ret, "cannot create descriptor for %r" % child
             cr.commit()
             return ret
         except EnvironmentError:
diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py
index 710494bb9db..bd727427541 100644
--- a/addons/document_ftp/ftpserver/ftpserver.py
+++ b/addons/document_ftp/ftpserver/ftpserver.py
@@ -2223,6 +2223,7 @@ class FTPHandler(asynchat.async_chat):
             if self.restart_position:
                 mode = 'r+'
             fd = self.try_as_current_user(self.fs.create, (datacr, datacr[2], mode + 'b'))
+            assert fd
         except FTPExceptionSent:
             self.fs.close_cr(datacr)
             return