Merge lp:~syleam/openobject-addons/5.0-improve-dms into lp:openobject-addons/5.0

[Christophe CHAUVET]

[Christophe CHAUVET (christophe-chauvet)]

Correct the bug 333223

=== modified file 'document/__init__.py'
--- document/__init__.py	2009-01-04 22:12:50 +0000
+++ document/__init__.py	2009-03-03 09:51:57 +0000
@@ -22,3 +22,5 @@
 
 import document
 import ftpserver
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'document/__terp__.py'
--- document/__terp__.py	2009-02-03 17:02:20 +0000
+++ document/__terp__.py	2009-03-03 09:51:57 +0000
@@ -45,4 +45,5 @@
     'active': False,
     'certificate': '0070515416461',
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'document/content_index.py'
--- document/content_index.py	2009-01-14 07:54:20 +0000
+++ document/content_index.py	2009-03-03 09:51:57 +0000
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution   
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -29,27 +29,29 @@
 # This should be the indexer
 #
 def content_index(content, filename=None, content_type=None):
-	fname,ext = os.path.splitext(filename)
-	result = ''
-	if ext in ('.doc'): #or content_type ?
-		(stdin,stdout) = os.popen2('antiword -', 'b')
-		stdin.write(content)
-		stdin.close()
-		result = stdout.read().decode('latin1','replace').encode('utf-8','replace')
-	elif ext == '.pdf':
-                file_descriptor, file_name = tempfile.mkstemp(suffix=ext)
-                os.write(file_descriptor, content)
-                os.close(file_descriptor)
-		fp = os.popen('pdftotext -enc UTF-8 -nopgbrk '+file_name+' -', 'r')
-		result = fp.read()
-		fp.close()
-	elif ext in ('.xls','.ods','.odt','.odp'):
-		s = StringIO.StringIO(content)
-		o = odt2txt.OpenDocumentTextFile(s)
-		result = o.toString().encode('ascii','replace')
-		s.close()
-	elif ext in ('.txt','.py','.patch','.html','.csv','.xml'):
-		result = content
-	else:
-		result = content
-	return result
+    fname,ext = os.path.splitext(filename)
+    result = ''
+    if ext in ('.doc'): #or content_type ?
+        (stdin,stdout) = os.popen2('antiword -', 'b')
+        stdin.write(content)
+        stdin.close()
+        result = stdout.read().decode('latin1','replace').encode('utf-8','replace')
+    elif ext == '.pdf':
+        file_descriptor, file_name = tempfile.mkstemp(suffix=ext)
+        os.write(file_descriptor, content)
+        os.close(file_descriptor)
+        fp = os.popen('pdftotext -enc UTF-8 -nopgbrk '+file_name+' -', 'r')
+        result = fp.read()
+        fp.close()
+    elif ext in ('.xls','.ods','.odt','.odp'):
+        s = StringIO.StringIO(content)
+        o = odt2txt.OpenDocumentTextFile(s)
+        result = o.toString().encode('ascii','replace')
+        s.close()
+    elif ext in ('.txt','.py','.patch','.html','.csv','.xml'):
+        result = content
+    else:
+        result = content
+    return result
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'document/document.py'
--- document/document.py	2009-02-05 17:30:32 +0000
+++ document/document.py	2009-03-03 09:51:57 +0000
@@ -41,7 +41,7 @@
 
 def random_name():
     random.seed()
-    d = [random.choice(string.letters) for x in xrange(10) ]
+    d = [random.choice(string.ascii_letters) for x in xrange(10) ]
     name = "".join(d)
     return name
 
@@ -492,11 +492,11 @@
         result = {}
         cr.execute('select id,store_fname,link from ir_attachment where id in ('+','.join(map(str,ids))+')')
         for id,r,l in cr.fetchall():
-	    try:
-	        value = file(os.path.join(self._get_filestore(cr), r), 'rb').read()
-	        result[id] = base64.encodestring(value)
-	    except:
-	        result[id]=''
+            try:
+                value = file(os.path.join(self._get_filestore(cr), r), 'rb').read()
+                result[id] = base64.encodestring(value)
+            except:
+                result[id]=''
 
             if context.get('bin_size', False):
                 result[id] = tools.human_size(len(result[id]))
@@ -581,7 +581,7 @@
                     res_id=file.res_id and file.res_id or 0
                 res=self.search(cr,uid,[('id','<>',file.id),('name','=',name),('parent_id','=',parent_id),('res_model','=',res_model),('res_id','=',res_id)])
                 if len(res):
-	                return False
+                    return False
         if op=='create':
             res=self.search(cr,uid,[('name','=',name),('parent_id','=',parent_id),('res_id','=',res_id),('res_model','=',res_model)])
             if len(res):
@@ -771,3 +771,5 @@
                 'target':'new',
         }
 document_configuration_wizard()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'document/ftpserver/__init__.py'
--- document/ftpserver/__init__.py	2008-12-18 08:55:57 +0000
+++ document/ftpserver/__init__.py	2009-03-03 09:51:57 +0000
@@ -1,3 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution   
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 import threading
 import ftpserver
 import authorizer
@@ -31,3 +53,4 @@
 ds = ftp_server()
 ds.start()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'document/ftpserver/abstracted_fs.py'
--- document/ftpserver/abstracted_fs.py	2009-01-02 06:00:20 +0000
+++ document/ftpserver/abstracted_fs.py	2009-03-03 09:51:57 +0000
@@ -1,3 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution   
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 import os
 import time
 from tarfile import filemode
@@ -788,3 +810,4 @@
             yield "%s%s%s%s%s%s%s%s%s %s\r\n" %(type, size, perm, modify, create,
                                                 mode, uid, gid, unique, basename)
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'document/ftpserver/authorizer.py'
--- document/ftpserver/authorizer.py	2008-10-29 21:45:02 +0000
+++ document/ftpserver/authorizer.py	2009-03-03 09:51:57 +0000
@@ -1,3 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution   
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 #import pooler
 
 class authorizer:
@@ -68,4 +90,4 @@
         """Return the user's quitting message."""
         return 'Bye.'
 
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'document/ftpserver/ftpserver.py'
--- document/ftpserver/ftpserver.py	2008-12-18 08:55:57 +0000
+++ document/ftpserver/ftpserver.py	2009-03-03 09:51:57 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- encoding: utf-8 -*-
 # ftpserver.py
 #
 #  pyftpdlib is released under the MIT license, reproduced below:
@@ -3094,3 +3095,5 @@
 
 if __name__ == '__main__':
     test()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'document/odt2txt.py'
--- document/odt2txt.py	2009-01-04 22:12:50 +0000
+++ document/odt2txt.py	2009-03-03 09:51:57 +0000
@@ -2,7 +2,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution   
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -25,28 +25,30 @@
 import StringIO
 
 class OpenDocumentTextFile :
-	def __init__ (self, filepath) :
-		zip = zipfile.ZipFile(filepath)
-		self.content = xml.dom.minidom.parseString(zip.read("content.xml"))
-
-	def toString (self) :
-		""" Converts the document to a string. """
-		buffer = u""
-		for val in ["text:p", "text:h", "text:list"]:
-			for paragraph in self.content.getElementsByTagName(val) :
-				buffer += self.textToString(paragraph) + "\n"
-		return buffer
-
-	def textToString(self, element) :
-		buffer = u""
-		for node in element.childNodes :
-			if node.nodeType == xml.dom.Node.TEXT_NODE :
-				buffer += node.nodeValue
-			elif node.nodeType == xml.dom.Node.ELEMENT_NODE :
-				buffer += self.textToString(node)
-		return buffer
+    def __init__ (self, filepath) :
+        zip = zipfile.ZipFile(filepath)
+        self.content = xml.dom.minidom.parseString(zip.read("content.xml"))
+
+    def toString (self) :
+        """ Converts the document to a string. """
+        buffer = u""
+        for val in ["text:p", "text:h", "text:list"]:
+            for paragraph in self.content.getElementsByTagName(val) :
+                buffer += self.textToString(paragraph) + "\n"
+        return buffer
+
+    def textToString(self, element) :
+        buffer = u""
+        for node in element.childNodes :
+            if node.nodeType == xml.dom.Node.TEXT_NODE :
+                buffer += node.nodeValue
+            elif node.nodeType == xml.dom.Node.ELEMENT_NODE :
+                buffer += self.textToString(node)
+        return buffer
 
 if __name__ == "__main__" :
-	s =StringIO.StringIO(file(sys.argv[1]).read())
-	odt = OpenDocumentTextFile(s)
-	print odt.toString().encode('ascii','replace')
+    s =StringIO.StringIO(file(sys.argv[1]).read())
+    odt = OpenDocumentTextFile(s)
+    print odt.toString().encode('ascii','replace')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'document_ics/__init__.py'
--- document_ics/__init__.py	2009-01-04 22:12:50 +0000
+++ document_ics/__init__.py	2009-03-03 09:51:57 +0000
@@ -21,3 +21,5 @@
 ##############################################################################
 
 import document
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: