[MERGE] merge with main addons

bzr revid: rpr@tinyerp.com-20121005120503-07e0zo8ucv8k0q3s

1 files changed, 4 insertions, 5 deletions

diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index 4cf3c8dfed2..399541e1f59 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -51,7 +51,7 @@ class indexer(object):
             return mts[0]
         return None
 
-    def indexContent(self, content, filename=None, realfile = None):
+    def indexContent(self, content, filename=None, realfile=None):
         """ Use either content or the real file, to index.
             Some parsers will work better with the actual
             content, others parse a file easier. Try the
@@ -95,16 +95,15 @@ class indexer(object):
 
         raise NhException('No appropriate method to index file.')
 
-    def _doIndexContent(self,content):
+    def _doIndexContent(self, content):
         raise NhException("Content cannot be handled here.")
 
-    def _doIndexFile(self,fpath):
+    def _doIndexFile(self, fpath):
         raise NhException("Content cannot be handled here.")
 
     def __repr__(self):
         return "<indexer %s.%s>" %(self.__module__, self.__class__.__name__)
 
-
 def mime_match(mime, mdict):
     if mdict.has_key(mime):
         return (mime, mdict[mime])
@@ -136,7 +135,7 @@ class contentIndex(object):
         if not f:
             raise Exception("Your indexer should at least support a mimetype or extension.")
 
-    def doIndex(self, content, filename=None, content_type=None, realfname = None, debug=False):
+    def doIndex(self, content, filename=None, content_type=None, realfname=None, debug=False):
         fobj = None
         fname = None
         mime = None