# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1318699234 -7200
# Node ID 2d87223ae480f5b6526acfafb7cdea772bef3dcc
# Parent  2e97d9694103e8e6bf7d975164f240c54a97a6a5
Added support for MoinMoin 1.9.x around group membership testing.

diff -r 2e97d9694103 -r 2d87223ae480 ApproveChangesSupport.py
--- a/ApproveChangesSupport.py	Sat Oct 15 17:39:22 2011 +0200
+++ b/ApproveChangesSupport.py	Sat Oct 15 19:20:34 2011 +0200
@@ -41,12 +41,12 @@
 
 def is_reviewer(request):
     return request.user.valid and (
-        request.dicts.has_member(get_approved_editors_group(request), request.user.name) or \
+        has_member(request, get_approved_editors_group(request), request.user.name) or \
         request.user.isSuperUser())
 
 def is_approved(request):
     return request.user.valid and (
-        request.dicts.has_member(get_approved_editors_group(request), request.user.name) or \
+        has_member(request, get_approved_editors_group(request), request.user.name) or \
         request.user.isSuperUser())
 
 def is_queued_changes_user(request):
@@ -213,4 +213,12 @@
 def escattr(s):
     return escape(s, 1)
 
+# More Moin 1.9 compatibility functions.
+
+def has_member(request, groupname, username):
+    if hasattr(request.dicts, "has_member"):
+        return request.dicts.has_member(groupname, username)
+    else:
+        return username in request.dicts.get(groupname, [])
+
 # vim: tabstop=4 expandtab shiftwidth=4