changeset 4831:af155b846cea

Groups2009: wikidicts imports were removed from the SyncPages and wikisync.
author Dmitrijs Milajevs <dimazest@gmail.com>
date Thu, 02 Jul 2009 18:44:17 +0100
parents 069aac5ce3e4
children f83b7b0b59c4
files MoinMoin/action/SyncPages.py MoinMoin/wikisync.py
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/SyncPages.py	Sat Jun 27 14:10:23 2009 +0200
+++ b/MoinMoin/action/SyncPages.py	Thu Jul 02 18:44:17 2009 +0100
@@ -17,7 +17,6 @@
 from MoinMoin.packages import unpackLine, packLine
 from MoinMoin.PageEditor import PageEditor, conflict_markers
 from MoinMoin.Page import Page
-from MoinMoin.wikidicts import Dict
 from MoinMoin.wikisync import TagStore, UnsupportedWikiException, SyncPage, NotAllowedException
 from MoinMoin.wikisync import MoinLocalWiki, MoinRemoteWiki, UP, DOWN, BOTH, MIMETYPE_MOIN
 from MoinMoin.support.python_compatibility import set
@@ -107,7 +106,7 @@
             "password": None,
         }
 
-        options.update(Dict(self.request, self.pagename))
+        options.update(request.dicts[self.pagename])
 
         # Convert page and group list strings to lists
         if options["pageList"] is not None:
--- a/MoinMoin/wikisync.py	Sat Jun 27 14:10:23 2009 +0200
+++ b/MoinMoin/wikisync.py	Thu Jul 02 18:44:17 2009 +0100
@@ -310,10 +310,9 @@
 
     def getGroupItems(self, group_list):
         """ Returns all page names that are listed on the page group_list. """
-        from MoinMoin.wikidicts import Group
         pages = []
         for group_pagename in group_list:
-            pages.extend(Group(self.request, group_pagename).members())
+            pages.extend(request.groups.get(group_pagename, []))
         return [self.createSyncPage(x) for x in pages]
 
     def createSyncPage(self, page_name):