comparison MoinMoin/action/SyncPages.py @ 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 e78462e0c7f1
children 9c67e4b79190
comparison
equal deleted inserted replaced
4830:069aac5ce3e4 4831:af155b846cea
15 15
16 from MoinMoin import wikiutil 16 from MoinMoin import wikiutil
17 from MoinMoin.packages import unpackLine, packLine 17 from MoinMoin.packages import unpackLine, packLine
18 from MoinMoin.PageEditor import PageEditor, conflict_markers 18 from MoinMoin.PageEditor import PageEditor, conflict_markers
19 from MoinMoin.Page import Page 19 from MoinMoin.Page import Page
20 from MoinMoin.wikidicts import Dict
21 from MoinMoin.wikisync import TagStore, UnsupportedWikiException, SyncPage, NotAllowedException 20 from MoinMoin.wikisync import TagStore, UnsupportedWikiException, SyncPage, NotAllowedException
22 from MoinMoin.wikisync import MoinLocalWiki, MoinRemoteWiki, UP, DOWN, BOTH, MIMETYPE_MOIN 21 from MoinMoin.wikisync import MoinLocalWiki, MoinRemoteWiki, UP, DOWN, BOTH, MIMETYPE_MOIN
23 from MoinMoin.support.python_compatibility import set 22 from MoinMoin.support.python_compatibility import set
24 from MoinMoin.util.bdiff import decompress, patch, compress, textdiff 23 from MoinMoin.util.bdiff import decompress, patch, compress, textdiff
25 from MoinMoin.util import diff3, rpc_aggregator 24 from MoinMoin.util import diff3, rpc_aggregator
105 "direction": "foo", # is defaulted below 104 "direction": "foo", # is defaulted below
106 "user": None, # XXX should be refactored into a password agent or OpenID like solution 105 "user": None, # XXX should be refactored into a password agent or OpenID like solution
107 "password": None, 106 "password": None,
108 } 107 }
109 108
110 options.update(Dict(self.request, self.pagename)) 109 options.update(request.dicts[self.pagename])
111 110
112 # Convert page and group list strings to lists 111 # Convert page and group list strings to lists
113 if options["pageList"] is not None: 112 if options["pageList"] is not None:
114 options["pageList"] = unpackLine(options["pageList"], ",") 113 options["pageList"] = unpackLine(options["pageList"], ",")
115 if options["groupList"] is not None: 114 if options["groupList"] is not None: