From 94b9143b30cbde811c275ebfc9c22676cc0e7e05 Mon Sep 17 00:00:00 2001 From: helmutm Date: Wed, 13 Jan 2010 16:31:08 +0000 Subject: [PATCH] ignore wiki linking at the moment; needs change in order to use new link and link manager implementations git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3681 fd906abe-77d9-0310-91a1-e0d9ade77398 --- README.txt | 2 +- tests/setup.py | 4 ++-- wiki/configure.zcml | 2 -- wiki/setup.py | 6 +++--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/README.txt b/README.txt index f4a48d4..9211478 100755 --- a/README.txt +++ b/README.txt @@ -542,7 +542,7 @@ view for rendering.) >>> from loops.wiki.base import wikiLinksActive >>> wikiLinksActive(loopsRoot) - True + False >>> view.renderTarget() u'

Test data

\n

Another paragraph

\n' diff --git a/tests/setup.py b/tests/setup.py index 747ec7f..0e7f819 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -50,7 +50,7 @@ from cybertools.wiki.base.config import WikiConfiguration from cybertools.wiki.dcu.html import Writer as DocutilsHTMLWriter from cybertools.wiki.dcu import process from cybertools.wiki.dcu.rstx import Parser as DocutilsRstxParser -from cybertools.wiki.tracking.link import LinkManager +#from cybertools.wiki.tracking.link import LinkManager from loops.base import Loops from loops import util @@ -186,7 +186,7 @@ class TestSite(object): component.provideAdapter(WikiSetupManager, name='wiki') component.provideUtility(WikiConfiguration()) - component.provideAdapter(LinkManager) + #component.provideAdapter(LinkManager) component.provideUtility(DocutilsHTMLWriter(), name='docutils.html') component.provideUtility(DocutilsRstxParser(), name='docutils.rstx') #component.provideAdapter(LoopsLinkProcessor, name='loops') diff --git a/wiki/configure.zcml b/wiki/configure.zcml index 1f5f7a2..85b148e 100644 --- a/wiki/configure.zcml +++ b/wiki/configure.zcml @@ -13,8 +13,6 @@ - - diff --git a/wiki/setup.py b/wiki/setup.py index df3d607..14c8e13 100644 --- a/wiki/setup.py +++ b/wiki/setup.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2009 Helmut Merz helmutm@cy55.de +# Copyright (c) 2010 Helmut Merz helmutm@cy55.de # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,14 +22,14 @@ Automatic setup of a loops site for the wiki package. $Id$ """ -from cybertools.tracking.btree import TrackingStorage -from cybertools.wiki.tracking.link import Link +from cybertools.link.base import LinkManager from loops.setup import SetupManager as BaseSetupManager class SetupManager(BaseSetupManager): def setup(self): + return records = self.context.getRecordManager() if 'links' not in records: records['links'] = TrackingStorage(trackFactory=Link)