changeset 2042:e02cf4c80881

merge
author Roger Haase <crosseyedpenguin@yahoo.com>
date Thu, 21 Mar 2013 08:18:46 -0700
parents e1cf79737e15 (current diff) d47f2665684a (diff)
children 0ad73056b518
files
diffstat 3 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/items/ticket.py	Fri Mar 08 11:56:10 2013 -0700
+++ b/MoinMoin/items/ticket.py	Thu Mar 21 08:18:46 2013 -0700
@@ -96,9 +96,8 @@
         super(TicketUpdateForm, self)._load(item)
         self['submit'].properties['labels'] = {
             'update': L_('Update ticket'),
-            'update_negate_status':
-                L_('Update & reopen ticket') if item.meta.get('closed') else
-                L_('Update & close ticket')
+            'update_negate_status': (L_('Update & reopen ticket') if item.meta.get('closed')
+                                     else L_('Update & close ticket'))
         }
 
     def _dump(self, item):
--- a/MoinMoin/storage/middleware/protecting.py	Fri Mar 08 11:56:10 2013 -0700
+++ b/MoinMoin/storage/middleware/protecting.py	Thu Mar 21 08:18:46 2013 -0700
@@ -19,7 +19,7 @@
 from MoinMoin import log
 logging = log.getLogger(__name__)
 
-from whoosh.util import lru_cache
+from whoosh.util.cache import lru_cache
 
 from MoinMoin.constants.rights import (CREATE, READ, PUBREAD, WRITE, DESTROY, ACL_RIGHTS_CONTENTS)
 from MoinMoin.constants.keys import ALL_REVS, LATEST_REVS, NAME_EXACT, ITEMID
--- a/setup.py	Fri Mar 08 11:56:10 2013 -0700
+++ b/setup.py	Thu Mar 21 08:18:46 2013 -0700
@@ -76,7 +76,8 @@
     zip_safe=False,
     dependency_links=[
         # 'https://github.com/mitsuhiko/werkzeug/tarball/master#egg=Werkzeug-0.7dev',
-        'https://bitbucket.org/thomaswaldmann/whoosh/get/2.4x.tar.gz#egg=Whoosh-2.4.99dev',
+        # 'https://bitbucket.org/thomaswaldmann/whoosh/get/2.4x.tar.gz#egg=Whoosh-2.4.99dev',
+        'https://bitbucket.org/thomaswaldmann/whoosh/get/default.tar.gz#egg=Whoosh-2.5.99dev',
         # fixed flask-themes, 0.1.3 does not work for flask 0.8.x, thus we use a faked 0.1.3.1:
         'https://bitbucket.org/thomaswaldmann/flask-themes/get/24dcc703953f.tar.gz#egg=Flask-Themes-0.1.3.1',
         'https://bitbucket.org/thomaswaldmann/emeraldtree/get/tip.tar.gz#egg=emeraldtree-0.9.2',
@@ -100,7 +101,8 @@
                               # likely due to the fixtures changes.
         'pytest-pep8<1.0.3',  # coding style checker
                               # note: pytest-pep8 1.0.3 needs pytest 2.3
-        'whoosh>=2.4.0',  # needed for indexed search
+        # 'whoosh>=2.4.0',  # needed for indexed search
+        'whoosh>=2.5.0',  # needed for indexed search
         'sphinx>=1.1',  # needed to build the docs
         'pdfminer',  # pdf -> text/plain conversion
         'passlib>=1.6.0',  # strong password hashing (1.6 needed for consteq)