--- a/.settings/org.eclipse.core.resources.prefs	Mon May 23 00:40:13 2011 +0200
+++ b/.settings/org.eclipse.core.resources.prefs	Tue Oct 18 08:36:11 2011 +0200
@@ -1,5 +1,11 @@
-#Fri Nov 12 14:48:38 CET 2010
+#Tue Oct 18 08:26:00 CEST 2011
 eclipse.preferences.version=1
+encoding//build/lib/ztfy/utils/site.py=utf-8
+encoding//build/lib/ztfy/utils/tal/html.py=utf-8
+encoding//build/lib/ztfy/utils/tal/request.py=utf-8
+encoding//build/lib/ztfy/utils/tal/text.py=utf-8
+encoding//build/lib/ztfy/utils/timezone/__init__.py=utf-8
+encoding//build/lib/ztfy/utils/timezone/utility.py=utf-8
 encoding//ztfy/utils/__init__.py=utf-8
 encoding//ztfy/utils/catalog/__init__.py=utf-8
 encoding//ztfy/utils/catalog/index.py=utf-8

--- a/ztfy.utils.egg-info/PKG-INFO	Mon May 23 00:40:13 2011 +0200
+++ b/ztfy.utils.egg-info/PKG-INFO	Tue Oct 18 08:36:11 2011 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: ztfy.utils
-Version: 0.3
+Version: 0.4.0
 Summary: ZTFY utility functions and classes for Zope3
 Home-page: http://trac.ztfy.org/ztfy.utils
 Author: Thierry Florac

--- a/ztfy/utils/catalog/index.py	Mon May 23 00:40:13 2011 +0200
+++ b/ztfy/utils/catalog/index.py	Tue Oct 18 08:36:11 2011 +0200
@@ -28,8 +28,8 @@
 # import local interfaces
 
 # import Zope3 packages
-from zope.app import zapi
 from zope.catalog.attribute import AttributeIndex
+from zope.component import createObject
 from zope.container.contained import Contained
 from zope.interface import implements
 from zopyx.txng3.core import config
@@ -64,7 +64,7 @@
                  splitter_casefolding=config.defaults['splitter_casefolding']):
         spaces = re.compile(r'\s+')
         if ranking:
-            util = zapi.createObject(storage)
+            util = createObject(storage)
             if not IStorageWithTermFrequency.providedBy(util):
                 raise ValueError("This storage cannot be used for ranking")
         _fields = spaces.split(field_name)

--- a/ztfy/utils/site.py	Mon May 23 00:40:13 2011 +0200
+++ b/ztfy/utils/site.py	Tue Oct 18 08:36:11 2011 +0200
@@ -21,7 +21,7 @@
 from zope.intid.interfaces import IIntIds
 
 # import local interfaces
-from interfaces import INewSiteManagerEvent
+from ztfy.utils.interfaces import INewSiteManagerEvent
 
 # import Zope3 packages
 from zope.component import getUtility

--- a/ztfy/utils/tal/html.py	Mon May 23 00:40:13 2011 +0200
+++ b/ztfy/utils/tal/html.py	Tue Oct 18 08:36:11 2011 +0200
@@ -21,7 +21,7 @@
 from zope.tales.interfaces import ITALESFunctionNamespace
 
 # import local interfaces
-from interfaces import IHTMLTalesAPI
+from ztfy.utils.tal.interfaces import IHTMLTalesAPI
 
 # import Zope3 packages
 from zope.interface import implements

--- a/ztfy/utils/tal/request.py	Mon May 23 00:40:13 2011 +0200
+++ b/ztfy/utils/tal/request.py	Tue Oct 18 08:36:11 2011 +0200
@@ -21,7 +21,7 @@
 from zope.tales.interfaces import ITALESFunctionNamespace
 
 # import local interfaces
-from interfaces import IRequestDataTalesAPI
+from ztfy.utils.tal.interfaces import IRequestDataTalesAPI
 
 # import Zope3 packages
 from zope.interface import implements

--- a/ztfy/utils/tal/session.py	Mon May 23 00:40:13 2011 +0200
+++ b/ztfy/utils/tal/session.py	Tue Oct 18 08:36:11 2011 +0200
@@ -21,7 +21,7 @@
 from zope.tales.interfaces import ITALESFunctionNamespace
 
 # import local interfaces
-from interfaces import ISessionDataTalesAPI
+from ztfy.utils.tal.interfaces import ISessionDataTalesAPI
 
 # import Zope3 packages
 from zope.interface import implements

--- a/ztfy/utils/tal/text.py	Mon May 23 00:40:13 2011 +0200
+++ b/ztfy/utils/tal/text.py	Tue Oct 18 08:36:11 2011 +0200
@@ -21,7 +21,7 @@
 from zope.tales.interfaces import ITALESFunctionNamespace
 
 # import local interfaces
-from interfaces import ITextStartTalesAPI, ITextOutputTalesAPI
+from ztfy.utils.tal.interfaces import ITextStartTalesAPI, ITextOutputTalesAPI
 
 # import Zope3 packages
 from zope.interface import implements

--- a/ztfy/utils/text.py	Mon May 23 00:40:13 2011 +0200
+++ b/ztfy/utils/text.py	Tue Oct 18 08:36:11 2011 +0200
@@ -25,7 +25,7 @@
 from zope.component import createObject, queryMultiAdapter
 
 # import local packages
-from request import getRequest
+from ztfy.utils.request import getRequest
 
 
 def textStart(text, length, max=0):

--- a/ztfy/utils/timezone/__init__.py	Mon May 23 00:40:13 2011 +0200
+++ b/ztfy/utils/timezone/__init__.py	Tue Oct 18 08:36:11 2011 +0200
@@ -23,7 +23,7 @@
 from zope.publisher.interfaces.browser import IBrowserRequest
 
 # import local interfaces
-from interfaces import IServerTimezone
+from ztfy.utils.timezone.interfaces import IServerTimezone
 
 # import Zope3 packages
 from zope.component import adapter, queryUtility

--- a/ztfy/utils/timezone/utility.py	Mon May 23 00:40:13 2011 +0200
+++ b/ztfy/utils/timezone/utility.py	Tue Oct 18 08:36:11 2011 +0200
@@ -21,7 +21,7 @@
 # import Zope3 interfaces
 
 # import local interfaces
-from interfaces import IServerTimezone
+from ztfy.utils.timezone.interfaces import IServerTimezone
 
 # import Zope3 packages
 from zope.container.contained import Contained