Merge branch 'github-main' of github.com:jean/Plomino into github-main

Conflicts: Products/CMFPlomino/index/PlominoIndex.py README.rst
plomino · Nov 17, 2014 · fd42781 · fd42781
2 parents 3c4e002 + 9199515
commit fd42781
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Products/CMFPlomino/index/PlominoIndex.py b/Products/CMFPlomino/index/PlominoIndex.py
@@ -156,7 +156,7 @@ def indexDocument(self, doc, idxs=None, update_metadata=1):
         except Exception, e:
             _logger.info(
                     'indexDocument> %s\non %s' % (repr(e), doc.id),
-                    exc_info=True) 
+                    exc_info=True)
             raise
 
     security.declareProtected(READ_PERMISSION, 'unindexDocument')
@@ -184,8 +184,8 @@ def dbsearch(self, request, sortindex=None, reverse=0,
             user_id = self.getCurrentMember().getUserName()
             if user_id != "Anonymous User":
                 user_groups_roles += (
-                        [user_id] + 
-                        self.getCurrentUserGroups() + 
+                        [user_id] +
+                        self.getCurrentUserGroups() +
                         self.getCurrentUserRoles())
             request['getPlominoReaders'] = user_groups_roles
         try:
@@ -198,7 +198,7 @@ def dbsearch(self, request, sortindex=None, reverse=0,
                         "The %s index does not allow sorting" % sortindex,
                         self.REQUEST,
                         error=True)
-            results = self.search(request, None, reverse, limit)                
+            results = self.search(request, None, reverse, limit)
         return results
 
     security.declareProtected(READ_PERMISSION, 'getKeyUniqueValues')
@@ -233,13 +233,12 @@ def convertFileToText(self, doc, field):
                 except TransformException:
                     _logger.info(
                             'convertFileToText> Transform failed',
-                            exc_info=True) 
+                            exc_info=True)
                 except MissingBinary:
                     _logger.info(
                             'convertFileToText> Transform failed',
-                            exc_info=True) 
+                            exc_info=True)
                 if textstream:
                     result = textstream.getData()
 
         return result
-
diff --git a/README.rst b/README.rst
@@ -119,6 +119,7 @@ The complete list is available `here <http://www.plomino.net/credits>`.
 
 Companies
 ---------
+
 |makinacom|_
 
 * `Planet Makina Corpus <http://www.makina-corpus.org>`_