changeset 5059:bc97e2bed238

merged main
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Sun, 30 Aug 2009 14:13:27 +0200
parents b986f014dc71 (current diff) e30bd336a8f3 (diff)
children dfc2277289fe
files MoinMoin/action/AttachFile.py
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/AttachFile.py	Sun Aug 30 12:43:34 2009 +0200
+++ b/MoinMoin/action/AttachFile.py	Sun Aug 30 14:13:27 2009 +0200
@@ -603,8 +603,8 @@
     _addLogEntry(request, 'ATTDEL', pagename, filename)
 
     if request.cfg.xapian_search:
-        from MoinMoin.search.Xapian import Index
-        index = Index(request)
+        from MoinMoin.search.Xapian import XapianIndex
+        index = XapianIndex(request)
         if index.exists:
             index.remove_item(pagename, filename)
 
--- a/MoinMoin/search/_tests/test_search.py	Sun Aug 30 12:43:34 2009 +0200
+++ b/MoinMoin/search/_tests/test_search.py	Sun Aug 30 14:13:27 2009 +0200
@@ -403,12 +403,12 @@
     def test_index_in_new_thread(self):
         """ search: kicks off indexing for a single pages in Xapian """
         try:
-            from MoinMoin.search.Xapian import Index
+            from MoinMoin.search.Xapian import XapianIndex
         except ImportError:
             py.test.skip('xapian is not installed')
 
         nuke_xapian_index(self.request)
-        index = Index(self.request)
+        index = XapianIndex(self.request)
         index.indexPagesInNewThread(mode='add')
 
         nuke_xapian_index(self.request)