# HG changeset patch
# User tflorac
# Date 1320667339 -3600
# Node ID 658842861161d0df5958839e3077d25ad66da33e
# Parent  6ca775e44505c9a2ecfe09fdeca01492c2da41e0# Parent  2f9d956952cda0e491ced7db7fd0529efa7af636
Merge with 2f9d956952cda0e491ced7db7fd0529efa7af636

diff -r 6ca775e44505 -r 658842861161 .hgtags
--- a/.hgtags	Mon Nov 07 12:38:27 2011 +0100
+++ b/.hgtags	Mon Nov 07 13:02:19 2011 +0100
@@ -1,3 +1,6 @@
 9646b52609c9ab476ba5e8d7a26bc8214b973676 0.1
 d81fcb734e6ce30d78f644fa4ce98fb125656f49 0.2
 420291b2fc72df23f111ba8c17bb98203b531aff 0.2.1
+35d95d221249504767e536df4aca0c012be147ad 0.3.0
+a8072195e0c6b9a9da43c1ec4239f08cdd0617cb 0.3.1
+96e344fe61666bcf26f9f0529f6efd761ab11b28 0.3.2
diff -r 6ca775e44505 -r 658842861161 .pydevproject
--- a/.pydevproject	Mon Nov 07 12:38:27 2011 +0100
+++ b/.pydevproject	Mon Nov 07 13:02:19 2011 +0100
@@ -4,30 +4,8 @@
 <pydev_project>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/ZTFY.utils/ztfy</path>
+<path>/ZTFY.utils (hg)/ztfy</path>
 </pydev_pathproperty>
-<pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH">
-<path>/var/local/eggs/zope.interface-3.4.1-py2.5-linux-i686.egg</path>
-<path>/var/local/eggs/zope.app.renderer-3.4.0-py2.5.egg</path>
-<path>/var/local/eggs/zope.tales-3.4.0-py2.5.egg</path>
-<path>/var/local/eggs/zope.component-3.4.0-py2.5.egg</path>
-<path>/var/local/eggs/zope.app.zapi-3.4.0-py2.5.egg</path>
-<path>/var/local/eggs/zope.app.security-3.5.2-py2.5.egg</path>
-<path>/var/local/eggs/zope.app.authentication-3.4.4-py2.5.egg</path>
-<path>/var/local/eggs/ZODB3-3.8.5-py2.5-linux-i686.egg</path>
-<path>/var/local/eggs/zope.publisher-3.4.6-py2.5.egg</path>
-<path>/var/local/eggs/pytz-2007k-py2.5.egg</path>
-<path>/var/local/eggs/zope.schema-3.4.0-py2.5.egg</path>
-<path>/var/local/eggs/zope.annotation-3.4.1-py2.5.egg</path>
-<path>/var/local/eggs/zope.app.catalog-3.5.1-py2.5.egg</path>
-<path>/var/local/eggs/zope.app.container-3.5.6-py2.5-linux-i686.egg</path>
-<path>/var/local/eggs/zope.app.file-3.4.4-py2.5.egg</path>
-<path>/var/local/eggs/zope.app.intid-3.4.1-py2.5.egg</path>
-<path>/var/local/eggs/zope.index-3.4.1-py2.5.egg</path>
-<path>/var/local/eggs/zopyx.txng3.core-3.3.4-py2.5.egg</path>
-<path>/var/local/eggs/hurry.query-0.9.2-py2.5.egg</path>
-<path>/var/local/eggs/ZODB3-3.8.5-py2.5-linux-i686.egg</path>
-<path>/var/local/eggs/zope.location-3.4.0-py2.5.egg</path>
-</pydev_pathproperty>
+
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Python 2.5</pydev_property>
 </pydev_project>
diff -r 6ca775e44505 -r 658842861161 .settings/org.eclipse.core.resources.prefs
--- a/.settings/org.eclipse.core.resources.prefs	Mon Nov 07 12:38:27 2011 +0100
+++ b/.settings/org.eclipse.core.resources.prefs	Mon Nov 07 13:02:19 2011 +0100
@@ -1,5 +1,11 @@
-#Fri Aug 27 09:08:36 CEST 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
@@ -10,10 +16,12 @@
 encoding//ztfy/utils/protocol/xmlrpc.py=utf-8
 encoding//ztfy/utils/request.py=utf-8
 encoding//ztfy/utils/security.py=utf-8
+encoding//ztfy/utils/session.py=utf-8
 encoding//ztfy/utils/site.py=utf-8
 encoding//ztfy/utils/tal/html.py=utf-8
 encoding//ztfy/utils/tal/interfaces.py=utf-8
 encoding//ztfy/utils/tal/request.py=utf-8
+encoding//ztfy/utils/tal/session.py=utf-8
 encoding//ztfy/utils/tal/text.py=utf-8
 encoding//ztfy/utils/tests/test_utilsdocs.py=utf-8
 encoding//ztfy/utils/tests/test_utilsdocstrings.py=utf-8
diff -r 6ca775e44505 -r 658842861161 bin/buildout
--- a/bin/buildout	Mon Nov 07 12:38:27 2011 +0100
+++ b/bin/buildout	Mon Nov 07 13:02:19 2011 +0100
@@ -1,10 +1,11 @@
-#!/var/local/ztfy-2.5/bin/python2.5
+#!/var/local/env/bb-2.6/bin/python
 
 import sys
 sys.path[0:0] = [
-  '/var/local/eggs/setuptools-0.6c9-py2.5.egg',
-  '/var/local/eggs/zc.buildout-1.4.3-py2.5.egg',
-  ]
+    '/var/local/eggs/distribute-0.6.14-py2.6.egg',
+    '/var/local/eggs/zc.buildout-1.5.2-py2.6.egg',
+    ]
+
 
 import zc.buildout.buildout
 
diff -r 6ca775e44505 -r 658842861161 bin/i18ncompile
--- a/bin/i18ncompile	Mon Nov 07 12:38:27 2011 +0100
+++ b/bin/i18ncompile	Mon Nov 07 13:02:19 2011 +0100
@@ -1,103 +1,94 @@
-#!/var/local/ztfy-2.5/bin/python2.5
+#!/var/local/env/bb-2.6/bin/python
 
 import sys
 sys.path[0:0] = [
-  '/var/local/ztfy-2.5/ztfy.utils',
-  '/var/local/eggs/zc.set-0.1dev_r75642-py2.5.egg',
-  '/var/local/eggs/zope.app.zapi-3.4.0-py2.5.egg',
-  '/var/local/eggs/zopyx.txng3.core-3.3.4-py2.5.egg',
-  '/var/local/eggs/hurry.query-0.9.2-py2.5.egg',
-  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
-  '/var/local/eggs/zope.app.locales-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.appsetup-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.applicationcontrol-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.tal-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.interface-3.4.1-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.i18nmessageid-3.4.3-py2.5-linux-i686.egg',
-  '/var/local/eggs/setuptools-0.6c9-py2.5.egg',
-  '/var/local/eggs/zope.configuration-3.4.0-py2.5.egg',
-  '/var/local/eggs/zc.recipe.egg-1.2.2-py2.5.egg',
-  '/var/local/eggs/zc.buildout-1.4.3-py2.5.egg',
-  '/var/local/eggs/zc.catalog-1.2.0-py2.5.egg',
-  '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.component-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.interface-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.publisher-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.traversing-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.folder-3.4.0-py2.5.egg',
-  '/var/local/eggs/ZODB3-3.9.5-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.security-3.4.1-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.event-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.error-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.publication-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.app.container-3.5.6-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.component-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.size-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.i18n-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.schema-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.deprecation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.testing-3.5.6-py2.5.egg',
-  '/var/local/eggs/zope.publisher-3.4.6-py2.5.egg',
-  '/var/local/eggs/zope.app.catalog-3.5.1-py2.5.egg',
-  '/var/local/eggs/pytz-2007k-py2.5.egg',
-  '/var/local/eggs/zope.deferredimport-3.4.0-py2.5.egg',
-  '/var/local/eggs/zodbcode-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.pagetemplate-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.location-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.datetime-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.contenttype-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.pagetemplate-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.proxy-3.4.2-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.security-3.5.2-py2.5.egg',
-  '/var/local/eggs/zope.app.authentication-3.4.4-py2.5.egg',
-  '/var/local/eggs/zope.dublincore-3.4.0-py2.5.egg',
-  '/var/local/eggs/zdaemon-2.0.2-py2.5.egg',
-  '/var/local/eggs/ZConfig-2.5.1-py2.5.egg',
-  '/var/local/eggs/zc.lockfile-1.0.0-py2.5.egg',
-  '/var/local/eggs/transaction-1.1.0-py2.5.egg',
-  '/var/local/eggs/zope.exceptions-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.exception-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.error-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.http-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.copypastemove-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.broken-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.filerepresentation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.lifecycleevent-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.dottedname-3.4.2-py2.5.egg',
-  '/var/local/eggs/zope.cachedescriptors-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.thread-3.4-py2.5.egg',
-  '/var/local/eggs/zope.formlib-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.annotation-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.testing-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.index-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.intid-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.tales-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.form-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.session-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.principalannotation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.zcmlfiles-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.hookable-3.4.0-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.dependable-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.debug-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.keyreference-3.4.1-py2.5.egg',
-  '/var/local/eggs/RestrictedPython-3.4.2-py2.5.egg',
-  '/var/local/eggs/zope.app.basicskin-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.minmax-1.1.0-py2.5.egg',
-  '/var/local/eggs/zope.app.schema-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.wsgi-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.rotterdam-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.zopeappgenerations-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.i18n-3.4.4-py2.5.egg',
-  '/var/local/eggs/zope.app.generations-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.content-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.modulealias-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.renderer-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.structuredtext-3.4.0-py2.5.egg',
-  '/var/local/eggs/docutils-0.4-py2.5.egg',
-  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
-  ]
+    '/var/local/src/ztfy-bb/ztfy.utils',
+    '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
+    '/var/local/eggs/zope.app.locales-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.app.appsetup-3.15.0-py2.6.egg',
+    '/var/local/eggs/zope.app.applicationcontrol-3.5.9-py2.6.egg',
+    '/var/local/eggs/zope.tal-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.interface-3.6.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18nmessageid-3.5.3-py2.6-linux-x86_64.egg',
+    '/var/local/env/bb-2.6/lib/python2.6/site-packages/distribute-0.6.19-py2.6.egg',
+    '/var/local/eggs/zope.configuration-3.7.4-py2.6.egg',
+    '/var/local/eggs/zc.recipe.egg-1.3.2-py2.6.egg',
+    '/var/local/eggs/zc.buildout-1.5.2-py2.6.egg',
+    '/var/local/eggs/zopyx.txng3.core-3.5.3-py2.6.egg',
+    '/var/local/eggs/zope.tales-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.session-3.9.4-py2.6.egg',
+    '/var/local/eggs/zope.security-3.8.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.app.authentication-3.9-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
+    '/var/local/eggs/zc.set-0.1dev_r75642-py2.6.egg',
+    '/var/local/eggs/z3c.form-2.4.3-py2.6.egg',
+    '/var/local/eggs/pytz-2011g-py2.6.egg',
+    '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
+    '/var/local/eggs/zope.traversing-3.14.0-py2.6.egg',
+    '/var/local/eggs/zope.site-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.processlifetime-1.0-py2.6.egg',
+    '/var/local/eggs/zope.event-3.5.0_1-py2.6.egg',
+    '/var/local/eggs/zope.error-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publication-3.12.0-py2.6.egg',
+    '/var/local/eggs/ZODB3-3.10.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.applicationcontrol-3.5.5-py2.6.egg',
+    '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.3-py2.6.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
+    '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
+    '/var/local/eggs/transaction-1.1.1-py2.6.egg',
+    '/var/local/eggs/zope.app.component-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.pluggableauth-1.2-py2.6.egg',
+    '/var/local/eggs/zope.password-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.formlib-4.0.5-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.contentprovider-3.7.2-py2.6.egg',
+    '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
+    '/var/local/eggs/zdaemon-2.0.4-py2.6.egg',
+    '/var/local/eggs/ZConfig-2.8.0-py2.6.egg',
+    '/var/local/eggs/zc.lockfile-1.0.0-py2.6.egg',
+    '/var/local/eggs/zope.componentvocabulary-1.0.1-py2.6.egg',
+    '/var/local/eggs/zope.deprecation-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.cachedescriptors-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.app.pagetemplate-3.11.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.hookable-3.4.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.ptresource-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
+    '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
+    '/var/local/eggs/RestrictedPython-3.6.0-py2.6.egg',
+    '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
+    ]
+
 
 import z3c.recipe.i18n.i18ncompile
 
 if __name__ == '__main__':
-    z3c.recipe.i18n.i18ncompile.main(['i18ncompile', '-l', '/var/local/ztfy-2.5/ztfy.utils/ztfy/utils/locales'])
+    z3c.recipe.i18n.i18ncompile.main(['i18ncompile', '-l', '/var/local/src/ztfy-bb/ztfy.utils/ztfy/utils/locales'])
diff -r 6ca775e44505 -r 658842861161 bin/i18nextract
--- a/bin/i18nextract	Mon Nov 07 12:38:27 2011 +0100
+++ b/bin/i18nextract	Mon Nov 07 13:02:19 2011 +0100
@@ -1,108 +1,99 @@
-#!/var/local/ztfy-2.5/bin/python2.5
+#!/var/local/env/bb-2.6/bin/python
 
 import sys
 sys.path[0:0] = [
-  '/var/local/ztfy-2.5/ztfy.utils',
-  '/var/local/eggs/zc.set-0.1dev_r75642-py2.5.egg',
-  '/var/local/eggs/zope.app.zapi-3.4.0-py2.5.egg',
-  '/var/local/eggs/zopyx.txng3.core-3.3.4-py2.5.egg',
-  '/var/local/eggs/hurry.query-0.9.2-py2.5.egg',
-  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
-  '/var/local/eggs/zope.app.locales-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.appsetup-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.applicationcontrol-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.tal-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.interface-3.4.1-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.i18nmessageid-3.4.3-py2.5-linux-i686.egg',
-  '/var/local/eggs/setuptools-0.6c9-py2.5.egg',
-  '/var/local/eggs/zope.configuration-3.4.0-py2.5.egg',
-  '/var/local/eggs/zc.recipe.egg-1.2.2-py2.5.egg',
-  '/var/local/eggs/zc.buildout-1.4.3-py2.5.egg',
-  '/var/local/eggs/zc.catalog-1.2.0-py2.5.egg',
-  '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.component-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.interface-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.publisher-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.traversing-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.folder-3.4.0-py2.5.egg',
-  '/var/local/eggs/ZODB3-3.9.5-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.security-3.4.1-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.event-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.error-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.publication-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.app.container-3.5.6-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.component-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.size-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.i18n-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.schema-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.deprecation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.testing-3.5.6-py2.5.egg',
-  '/var/local/eggs/zope.publisher-3.4.6-py2.5.egg',
-  '/var/local/eggs/zope.app.catalog-3.5.1-py2.5.egg',
-  '/var/local/eggs/pytz-2007k-py2.5.egg',
-  '/var/local/eggs/zope.deferredimport-3.4.0-py2.5.egg',
-  '/var/local/eggs/zodbcode-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.pagetemplate-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.location-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.datetime-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.contenttype-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.pagetemplate-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.proxy-3.4.2-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.security-3.5.2-py2.5.egg',
-  '/var/local/eggs/zope.app.authentication-3.4.4-py2.5.egg',
-  '/var/local/eggs/zope.dublincore-3.4.0-py2.5.egg',
-  '/var/local/eggs/zdaemon-2.0.2-py2.5.egg',
-  '/var/local/eggs/ZConfig-2.5.1-py2.5.egg',
-  '/var/local/eggs/zc.lockfile-1.0.0-py2.5.egg',
-  '/var/local/eggs/transaction-1.1.0-py2.5.egg',
-  '/var/local/eggs/zope.exceptions-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.exception-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.error-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.http-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.copypastemove-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.broken-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.filerepresentation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.lifecycleevent-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.dottedname-3.4.2-py2.5.egg',
-  '/var/local/eggs/zope.cachedescriptors-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.thread-3.4-py2.5.egg',
-  '/var/local/eggs/zope.formlib-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.annotation-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.testing-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.index-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.intid-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.tales-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.form-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.session-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.principalannotation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.zcmlfiles-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.hookable-3.4.0-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.dependable-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.debug-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.keyreference-3.4.1-py2.5.egg',
-  '/var/local/eggs/RestrictedPython-3.4.2-py2.5.egg',
-  '/var/local/eggs/zope.app.basicskin-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.minmax-1.1.0-py2.5.egg',
-  '/var/local/eggs/zope.app.schema-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.wsgi-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.rotterdam-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.zopeappgenerations-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.i18n-3.4.4-py2.5.egg',
-  '/var/local/eggs/zope.app.generations-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.content-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.modulealias-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.renderer-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.structuredtext-3.4.0-py2.5.egg',
-  '/var/local/eggs/docutils-0.4-py2.5.egg',
-  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
-  ]
+    '/var/local/src/ztfy-bb/ztfy.utils',
+    '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
+    '/var/local/eggs/zope.app.locales-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.app.appsetup-3.15.0-py2.6.egg',
+    '/var/local/eggs/zope.app.applicationcontrol-3.5.9-py2.6.egg',
+    '/var/local/eggs/zope.tal-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.interface-3.6.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18nmessageid-3.5.3-py2.6-linux-x86_64.egg',
+    '/var/local/env/bb-2.6/lib/python2.6/site-packages/distribute-0.6.19-py2.6.egg',
+    '/var/local/eggs/zope.configuration-3.7.4-py2.6.egg',
+    '/var/local/eggs/zc.recipe.egg-1.3.2-py2.6.egg',
+    '/var/local/eggs/zc.buildout-1.5.2-py2.6.egg',
+    '/var/local/eggs/zopyx.txng3.core-3.5.3-py2.6.egg',
+    '/var/local/eggs/zope.tales-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.session-3.9.4-py2.6.egg',
+    '/var/local/eggs/zope.security-3.8.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.app.authentication-3.9-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
+    '/var/local/eggs/zc.set-0.1dev_r75642-py2.6.egg',
+    '/var/local/eggs/z3c.form-2.4.3-py2.6.egg',
+    '/var/local/eggs/pytz-2011g-py2.6.egg',
+    '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
+    '/var/local/eggs/zope.traversing-3.14.0-py2.6.egg',
+    '/var/local/eggs/zope.site-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.processlifetime-1.0-py2.6.egg',
+    '/var/local/eggs/zope.event-3.5.0_1-py2.6.egg',
+    '/var/local/eggs/zope.error-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publication-3.12.0-py2.6.egg',
+    '/var/local/eggs/ZODB3-3.10.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.applicationcontrol-3.5.5-py2.6.egg',
+    '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.3-py2.6.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
+    '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
+    '/var/local/eggs/transaction-1.1.1-py2.6.egg',
+    '/var/local/eggs/zope.app.component-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.pluggableauth-1.2-py2.6.egg',
+    '/var/local/eggs/zope.password-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.formlib-4.0.5-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.contentprovider-3.7.2-py2.6.egg',
+    '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
+    '/var/local/eggs/zdaemon-2.0.4-py2.6.egg',
+    '/var/local/eggs/ZConfig-2.8.0-py2.6.egg',
+    '/var/local/eggs/zc.lockfile-1.0.0-py2.6.egg',
+    '/var/local/eggs/zope.componentvocabulary-1.0.1-py2.6.egg',
+    '/var/local/eggs/zope.deprecation-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.cachedescriptors-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.app.pagetemplate-3.11.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.hookable-3.4.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.ptresource-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
+    '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
+    '/var/local/eggs/RestrictedPython-3.6.0-py2.6.egg',
+    '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
+    ]
+
 
 import os
 sys.argv[0] = os.path.abspath(sys.argv[0])
-os.chdir('/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg')
+os.chdir('/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg')
 
 
 import z3c.recipe.i18n.i18nextract
 
 if __name__ == '__main__':
-    z3c.recipe.i18n.i18nextract.main(['i18nextract', '-d', 'ztfy.utils', '-s', '/var/local/ztfy-2.5/ztfy.utils/parts/i18n/configure.zcml', '-o', '/var/local/ztfy-2.5/ztfy.utils/ztfy/utils/locales', '-p', 'ztfy.utils'])
+    z3c.recipe.i18n.i18nextract.main(['i18nextract', '-d', 'ztfy.utils', '-s', '/var/local/src/ztfy-bb/ztfy.utils/parts/i18n/configure.zcml', '-o', '/var/local/src/ztfy-bb/ztfy.utils/ztfy/utils/locales', '-p', 'ztfy.utils'])
diff -r 6ca775e44505 -r 658842861161 bin/i18nmergeall
--- a/bin/i18nmergeall	Mon Nov 07 12:38:27 2011 +0100
+++ b/bin/i18nmergeall	Mon Nov 07 13:02:19 2011 +0100
@@ -1,103 +1,94 @@
-#!/var/local/ztfy-2.5/bin/python2.5
+#!/var/local/env/bb-2.6/bin/python
 
 import sys
 sys.path[0:0] = [
-  '/var/local/ztfy-2.5/ztfy.utils',
-  '/var/local/eggs/zc.set-0.1dev_r75642-py2.5.egg',
-  '/var/local/eggs/zope.app.zapi-3.4.0-py2.5.egg',
-  '/var/local/eggs/zopyx.txng3.core-3.3.4-py2.5.egg',
-  '/var/local/eggs/hurry.query-0.9.2-py2.5.egg',
-  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
-  '/var/local/eggs/zope.app.locales-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.appsetup-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.applicationcontrol-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.tal-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.interface-3.4.1-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.i18nmessageid-3.4.3-py2.5-linux-i686.egg',
-  '/var/local/eggs/setuptools-0.6c9-py2.5.egg',
-  '/var/local/eggs/zope.configuration-3.4.0-py2.5.egg',
-  '/var/local/eggs/zc.recipe.egg-1.2.2-py2.5.egg',
-  '/var/local/eggs/zc.buildout-1.4.3-py2.5.egg',
-  '/var/local/eggs/zc.catalog-1.2.0-py2.5.egg',
-  '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.component-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.interface-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.publisher-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.traversing-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.folder-3.4.0-py2.5.egg',
-  '/var/local/eggs/ZODB3-3.9.5-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.security-3.4.1-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.event-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.error-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.publication-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.app.container-3.5.6-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.component-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.size-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.i18n-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.schema-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.deprecation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.testing-3.5.6-py2.5.egg',
-  '/var/local/eggs/zope.publisher-3.4.6-py2.5.egg',
-  '/var/local/eggs/zope.app.catalog-3.5.1-py2.5.egg',
-  '/var/local/eggs/pytz-2007k-py2.5.egg',
-  '/var/local/eggs/zope.deferredimport-3.4.0-py2.5.egg',
-  '/var/local/eggs/zodbcode-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.pagetemplate-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.location-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.datetime-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.contenttype-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.pagetemplate-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.proxy-3.4.2-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.security-3.5.2-py2.5.egg',
-  '/var/local/eggs/zope.app.authentication-3.4.4-py2.5.egg',
-  '/var/local/eggs/zope.dublincore-3.4.0-py2.5.egg',
-  '/var/local/eggs/zdaemon-2.0.2-py2.5.egg',
-  '/var/local/eggs/ZConfig-2.5.1-py2.5.egg',
-  '/var/local/eggs/zc.lockfile-1.0.0-py2.5.egg',
-  '/var/local/eggs/transaction-1.1.0-py2.5.egg',
-  '/var/local/eggs/zope.exceptions-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.exception-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.error-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.http-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.copypastemove-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.broken-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.filerepresentation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.lifecycleevent-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.dottedname-3.4.2-py2.5.egg',
-  '/var/local/eggs/zope.cachedescriptors-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.thread-3.4-py2.5.egg',
-  '/var/local/eggs/zope.formlib-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.annotation-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.testing-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.index-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.intid-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.tales-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.form-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.session-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.principalannotation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.zcmlfiles-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.hookable-3.4.0-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.dependable-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.debug-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.keyreference-3.4.1-py2.5.egg',
-  '/var/local/eggs/RestrictedPython-3.4.2-py2.5.egg',
-  '/var/local/eggs/zope.app.basicskin-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.minmax-1.1.0-py2.5.egg',
-  '/var/local/eggs/zope.app.schema-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.wsgi-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.rotterdam-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.zopeappgenerations-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.i18n-3.4.4-py2.5.egg',
-  '/var/local/eggs/zope.app.generations-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.content-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.modulealias-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.renderer-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.structuredtext-3.4.0-py2.5.egg',
-  '/var/local/eggs/docutils-0.4-py2.5.egg',
-  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
-  ]
+    '/var/local/src/ztfy-bb/ztfy.utils',
+    '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
+    '/var/local/eggs/zope.app.locales-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.app.appsetup-3.15.0-py2.6.egg',
+    '/var/local/eggs/zope.app.applicationcontrol-3.5.9-py2.6.egg',
+    '/var/local/eggs/zope.tal-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.interface-3.6.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18nmessageid-3.5.3-py2.6-linux-x86_64.egg',
+    '/var/local/env/bb-2.6/lib/python2.6/site-packages/distribute-0.6.19-py2.6.egg',
+    '/var/local/eggs/zope.configuration-3.7.4-py2.6.egg',
+    '/var/local/eggs/zc.recipe.egg-1.3.2-py2.6.egg',
+    '/var/local/eggs/zc.buildout-1.5.2-py2.6.egg',
+    '/var/local/eggs/zopyx.txng3.core-3.5.3-py2.6.egg',
+    '/var/local/eggs/zope.tales-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.session-3.9.4-py2.6.egg',
+    '/var/local/eggs/zope.security-3.8.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.app.authentication-3.9-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
+    '/var/local/eggs/zc.set-0.1dev_r75642-py2.6.egg',
+    '/var/local/eggs/z3c.form-2.4.3-py2.6.egg',
+    '/var/local/eggs/pytz-2011g-py2.6.egg',
+    '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
+    '/var/local/eggs/zope.traversing-3.14.0-py2.6.egg',
+    '/var/local/eggs/zope.site-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.processlifetime-1.0-py2.6.egg',
+    '/var/local/eggs/zope.event-3.5.0_1-py2.6.egg',
+    '/var/local/eggs/zope.error-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publication-3.12.0-py2.6.egg',
+    '/var/local/eggs/ZODB3-3.10.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.applicationcontrol-3.5.5-py2.6.egg',
+    '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.3-py2.6.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
+    '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
+    '/var/local/eggs/transaction-1.1.1-py2.6.egg',
+    '/var/local/eggs/zope.app.component-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.pluggableauth-1.2-py2.6.egg',
+    '/var/local/eggs/zope.password-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.formlib-4.0.5-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.contentprovider-3.7.2-py2.6.egg',
+    '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
+    '/var/local/eggs/zdaemon-2.0.4-py2.6.egg',
+    '/var/local/eggs/ZConfig-2.8.0-py2.6.egg',
+    '/var/local/eggs/zc.lockfile-1.0.0-py2.6.egg',
+    '/var/local/eggs/zope.componentvocabulary-1.0.1-py2.6.egg',
+    '/var/local/eggs/zope.deprecation-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.cachedescriptors-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.app.pagetemplate-3.11.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.hookable-3.4.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.ptresource-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
+    '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
+    '/var/local/eggs/RestrictedPython-3.6.0-py2.6.egg',
+    '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
+    ]
+
 
 import z3c.recipe.i18n.i18nmergeall
 
 if __name__ == '__main__':
-    z3c.recipe.i18n.i18nmergeall.main(['i18nmergeall', '-l', '/var/local/ztfy-2.5/ztfy.utils/ztfy/utils/locales'])
+    z3c.recipe.i18n.i18nmergeall.main(['i18nmergeall', '-l', '/var/local/src/ztfy-bb/ztfy.utils/ztfy/utils/locales'])
diff -r 6ca775e44505 -r 658842861161 bin/i18nstats
--- a/bin/i18nstats	Mon Nov 07 12:38:27 2011 +0100
+++ b/bin/i18nstats	Mon Nov 07 13:02:19 2011 +0100
@@ -1,103 +1,94 @@
-#!/var/local/ztfy-2.5/bin/python2.5
+#!/var/local/env/bb-2.6/bin/python
 
 import sys
 sys.path[0:0] = [
-  '/var/local/ztfy-2.5/ztfy.utils',
-  '/var/local/eggs/zc.set-0.1dev_r75642-py2.5.egg',
-  '/var/local/eggs/zope.app.zapi-3.4.0-py2.5.egg',
-  '/var/local/eggs/zopyx.txng3.core-3.3.4-py2.5.egg',
-  '/var/local/eggs/hurry.query-0.9.2-py2.5.egg',
-  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
-  '/var/local/eggs/zope.app.locales-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.appsetup-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.applicationcontrol-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.tal-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.interface-3.4.1-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.i18nmessageid-3.4.3-py2.5-linux-i686.egg',
-  '/var/local/eggs/setuptools-0.6c9-py2.5.egg',
-  '/var/local/eggs/zope.configuration-3.4.0-py2.5.egg',
-  '/var/local/eggs/zc.recipe.egg-1.2.2-py2.5.egg',
-  '/var/local/eggs/zc.buildout-1.4.3-py2.5.egg',
-  '/var/local/eggs/zc.catalog-1.2.0-py2.5.egg',
-  '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.component-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.interface-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.publisher-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.traversing-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.folder-3.4.0-py2.5.egg',
-  '/var/local/eggs/ZODB3-3.9.5-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.security-3.4.1-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.event-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.error-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.publication-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.app.container-3.5.6-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.component-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.size-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.i18n-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.schema-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.deprecation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.testing-3.5.6-py2.5.egg',
-  '/var/local/eggs/zope.publisher-3.4.6-py2.5.egg',
-  '/var/local/eggs/zope.app.catalog-3.5.1-py2.5.egg',
-  '/var/local/eggs/pytz-2007k-py2.5.egg',
-  '/var/local/eggs/zope.deferredimport-3.4.0-py2.5.egg',
-  '/var/local/eggs/zodbcode-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.pagetemplate-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.location-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.datetime-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.contenttype-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.pagetemplate-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.proxy-3.4.2-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.security-3.5.2-py2.5.egg',
-  '/var/local/eggs/zope.app.authentication-3.4.4-py2.5.egg',
-  '/var/local/eggs/zope.dublincore-3.4.0-py2.5.egg',
-  '/var/local/eggs/zdaemon-2.0.2-py2.5.egg',
-  '/var/local/eggs/ZConfig-2.5.1-py2.5.egg',
-  '/var/local/eggs/zc.lockfile-1.0.0-py2.5.egg',
-  '/var/local/eggs/transaction-1.1.0-py2.5.egg',
-  '/var/local/eggs/zope.exceptions-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.exception-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.error-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.http-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.copypastemove-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.broken-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.filerepresentation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.lifecycleevent-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.dottedname-3.4.2-py2.5.egg',
-  '/var/local/eggs/zope.cachedescriptors-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.thread-3.4-py2.5.egg',
-  '/var/local/eggs/zope.formlib-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.annotation-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.testing-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.index-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.intid-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.tales-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.form-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.session-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.principalannotation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.zcmlfiles-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.hookable-3.4.0-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.dependable-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.debug-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.keyreference-3.4.1-py2.5.egg',
-  '/var/local/eggs/RestrictedPython-3.4.2-py2.5.egg',
-  '/var/local/eggs/zope.app.basicskin-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.minmax-1.1.0-py2.5.egg',
-  '/var/local/eggs/zope.app.schema-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.wsgi-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.rotterdam-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.zopeappgenerations-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.i18n-3.4.4-py2.5.egg',
-  '/var/local/eggs/zope.app.generations-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.content-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.modulealias-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.renderer-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.structuredtext-3.4.0-py2.5.egg',
-  '/var/local/eggs/docutils-0.4-py2.5.egg',
-  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
-  ]
+    '/var/local/src/ztfy-bb/ztfy.utils',
+    '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
+    '/var/local/eggs/zope.app.locales-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.app.appsetup-3.15.0-py2.6.egg',
+    '/var/local/eggs/zope.app.applicationcontrol-3.5.9-py2.6.egg',
+    '/var/local/eggs/zope.tal-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.interface-3.6.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18nmessageid-3.5.3-py2.6-linux-x86_64.egg',
+    '/var/local/env/bb-2.6/lib/python2.6/site-packages/distribute-0.6.19-py2.6.egg',
+    '/var/local/eggs/zope.configuration-3.7.4-py2.6.egg',
+    '/var/local/eggs/zc.recipe.egg-1.3.2-py2.6.egg',
+    '/var/local/eggs/zc.buildout-1.5.2-py2.6.egg',
+    '/var/local/eggs/zopyx.txng3.core-3.5.3-py2.6.egg',
+    '/var/local/eggs/zope.tales-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.session-3.9.4-py2.6.egg',
+    '/var/local/eggs/zope.security-3.8.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.app.authentication-3.9-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
+    '/var/local/eggs/zc.set-0.1dev_r75642-py2.6.egg',
+    '/var/local/eggs/z3c.form-2.4.3-py2.6.egg',
+    '/var/local/eggs/pytz-2011g-py2.6.egg',
+    '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
+    '/var/local/eggs/zope.traversing-3.14.0-py2.6.egg',
+    '/var/local/eggs/zope.site-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.processlifetime-1.0-py2.6.egg',
+    '/var/local/eggs/zope.event-3.5.0_1-py2.6.egg',
+    '/var/local/eggs/zope.error-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publication-3.12.0-py2.6.egg',
+    '/var/local/eggs/ZODB3-3.10.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.applicationcontrol-3.5.5-py2.6.egg',
+    '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.3-py2.6.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
+    '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
+    '/var/local/eggs/transaction-1.1.1-py2.6.egg',
+    '/var/local/eggs/zope.app.component-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.pluggableauth-1.2-py2.6.egg',
+    '/var/local/eggs/zope.password-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.formlib-4.0.5-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.contentprovider-3.7.2-py2.6.egg',
+    '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
+    '/var/local/eggs/zdaemon-2.0.4-py2.6.egg',
+    '/var/local/eggs/ZConfig-2.8.0-py2.6.egg',
+    '/var/local/eggs/zc.lockfile-1.0.0-py2.6.egg',
+    '/var/local/eggs/zope.componentvocabulary-1.0.1-py2.6.egg',
+    '/var/local/eggs/zope.deprecation-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.cachedescriptors-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.app.pagetemplate-3.11.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.hookable-3.4.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.ptresource-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
+    '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
+    '/var/local/eggs/RestrictedPython-3.6.0-py2.6.egg',
+    '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
+    ]
+
 
 import z3c.recipe.i18n.i18nstats
 
 if __name__ == '__main__':
-    z3c.recipe.i18n.i18nstats.main(['i18nstats', '-l', '/var/local/ztfy-2.5/ztfy.utils/ztfy/utils/locales'])
+    z3c.recipe.i18n.i18nstats.main(['i18nstats', '-l', '/var/local/src/ztfy-bb/ztfy.utils/ztfy/utils/locales'])
diff -r 6ca775e44505 -r 658842861161 bin/test
--- a/bin/test	Mon Nov 07 12:38:27 2011 +0100
+++ b/bin/test	Mon Nov 07 13:02:19 2011 +0100
@@ -1,106 +1,89 @@
-#!/var/local/ztfy-2.5/bin/python2.5
+#!/var/local/env/bb-2.6/bin/python
 
 import sys
 sys.path[0:0] = [
-  '/var/local/ztfy-2.5/ztfy.utils',
-  '/var/local/eggs/zope.testing-3.5.6-py2.5.egg',
-  '/var/local/eggs/setuptools-0.6c9-py2.5.egg',
-  '/var/local/eggs/hurry.query-0.9.2-py2.5.egg',
-  '/var/local/eggs/zopyx.txng3.core-3.3.4-py2.5.egg',
-  '/var/local/eggs/zc.set-0.1dev_r75642-py2.5.egg',
-  '/var/local/eggs/zope.app.zapi-3.4.0-py2.5.egg',
-  '/var/local/eggs/zc.catalog-1.2.0-py2.5.egg',
-  '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.component-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.interface-3.4.1-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.folder-3.4.0-py2.5.egg',
-  '/var/local/eggs/ZODB3-3.9.5-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.interface-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.publisher-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.traversing-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.security-3.4.1-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.schema-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.publisher-3.4.6-py2.5.egg',
-  '/var/local/eggs/zope.i18nmessageid-3.4.3-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.container-3.5.6-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.app.catalog-3.5.1-py2.5.egg',
-  '/var/local/eggs/pytz-2007k-py2.5.egg',
-  '/var/local/eggs/zope.event-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.deferredimport-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.deprecation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.security-3.5.2-py2.5.egg',
-  '/var/local/eggs/zope.app.component-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.authentication-3.4.4-py2.5.egg',
-  '/var/local/eggs/zope.dublincore-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.datetime-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.proxy-3.4.2-py2.5-linux-i686.egg',
-  '/var/local/eggs/zdaemon-2.0.2-py2.5.egg',
-  '/var/local/eggs/ZConfig-2.5.1-py2.5.egg',
-  '/var/local/eggs/zc.lockfile-1.0.0-py2.5.egg',
-  '/var/local/eggs/transaction-1.1.0-py2.5.egg',
-  '/var/local/eggs/zodbcode-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.pagetemplate-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.location-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.i18n-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.contenttype-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.configuration-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.publication-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.app.pagetemplate-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.applicationcontrol-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.exceptions-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.testing-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.copypastemove-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.broken-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.size-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.filerepresentation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.lifecycleevent-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.dottedname-3.4.2-py2.5.egg',
-  '/var/local/eggs/zope.cachedescriptors-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.index-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.intid-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.annotation-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.form-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.thread-3.4-py2.5.egg',
-  '/var/local/eggs/zope.formlib-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.session-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.tal-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.tales-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.exception-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.error-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.http-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.error-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.dependable-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.debug-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.principalannotation-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.appsetup-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.keyreference-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.basicskin-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.zcmlfiles-3.4.3-py2.5.egg',
-  '/var/local/eggs/zope.hookable-3.4.0-py2.5-linux-i686.egg',
-  '/var/local/eggs/zope.minmax-1.1.0-py2.5.egg',
-  '/var/local/eggs/RestrictedPython-3.4.2-py2.5.egg',
-  '/var/local/eggs/zope.app.schema-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.wsgi-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.rotterdam-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.zopeappgenerations-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.locales-3.5.1-py2.5.egg',
-  '/var/local/eggs/zope.app.i18n-3.4.4-py2.5.egg',
-  '/var/local/eggs/zope.app.generations-3.4.1-py2.5.egg',
-  '/var/local/eggs/zope.app.content-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.modulealias-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.app.renderer-3.4.0-py2.5.egg',
-  '/var/local/eggs/zope.structuredtext-3.4.0-py2.5.egg',
-  '/var/local/eggs/docutils-0.4-py2.5.egg',
-  ]
-
-import os
-sys.argv[0] = os.path.abspath(sys.argv[0])
-os.chdir('/var/local/ztfy-2.5/ztfy.utils/parts/test')
+    '/var/local/src/ztfy-bb/ztfy.utils',
+    '/var/local/eggs/zope.testrunner-4.0.3-py2.6.egg',
+    '/var/local/eggs/zope.interface-3.6.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/env/bb-2.6/lib/python2.6/site-packages/distribute-0.6.19-py2.6.egg',
+    '/var/local/eggs/zope.testing-3.10.2-py2.6.egg',
+    '/var/local/eggs/zopyx.txng3.core-3.5.3-py2.6.egg',
+    '/var/local/eggs/zope.tales-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.session-3.9.4-py2.6.egg',
+    '/var/local/eggs/zope.security-3.8.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.app.authentication-3.9-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
+    '/var/local/eggs/zc.set-0.1dev_r75642-py2.6.egg',
+    '/var/local/eggs/z3c.form-2.4.3-py2.6.egg',
+    '/var/local/eggs/pytz-2011g-py2.6.egg',
+    '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
+    '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.tal-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
+    '/var/local/eggs/zope.i18nmessageid-3.5.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/ZODB3-3.10.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.event-3.5.0_1-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.3-py2.6.egg',
+    '/var/local/eggs/zope.configuration-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.traversing-3.14.0-py2.6.egg',
+    '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
+    '/var/local/eggs/zope.site-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publication-3.12.0-py2.6.egg',
+    '/var/local/eggs/transaction-1.1.1-py2.6.egg',
+    '/var/local/eggs/zope.app.component-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.pluggableauth-1.2-py2.6.egg',
+    '/var/local/eggs/zope.password-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.formlib-4.0.5-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.contentprovider-3.7.2-py2.6.egg',
+    '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
+    '/var/local/eggs/zdaemon-2.0.4-py2.6.egg',
+    '/var/local/eggs/ZConfig-2.8.0-py2.6.egg',
+    '/var/local/eggs/zc.lockfile-1.0.0-py2.6.egg',
+    '/var/local/eggs/zope.error-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.componentvocabulary-1.0.1-py2.6.egg',
+    '/var/local/eggs/zope.deprecation-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.cachedescriptors-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.app.pagetemplate-3.11.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.hookable-3.4.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.ptresource-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
+    '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
+    '/var/local/eggs/RestrictedPython-3.6.0-py2.6.egg',
+    ]
 
 
-import zope.testing.testrunner
+import zope.testrunner
 
 if __name__ == '__main__':
-    zope.testing.testrunner.run([
-  '--test-path', '/var/local/ztfy-2.5/ztfy.utils',
-  ])
+    zope.testrunner.run([
+        '--test-path', '/var/local/src/ztfy-bb/ztfy.utils',
+        ])
diff -r 6ca775e44505 -r 658842861161 buildout.cfg
--- a/buildout.cfg	Mon Nov 07 12:38:27 2011 +0100
+++ b/buildout.cfg	Mon Nov 07 13:02:19 2011 +0100
@@ -1,14 +1,12 @@
 [buildout]
+extends = /var/local/env/bb-2.6/webapp/versions.cfg
+versions = versions
 develop = .
 parts = package i18n test
 
 [package]
 recipe = zc.recipe.egg
 eggs = ztfy.utils
-       zc.set
-       zope.app.zapi
-       zopyx.txng3.core
-       hurry.query
 
 [i18n]
 recipe = z3c.recipe.i18n:i18n
diff -r 6ca775e44505 -r 658842861161 setup.py
--- a/setup.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/setup.py	Mon Nov 07 13:02:19 2011 +0100
@@ -25,7 +25,7 @@
 README = os.path.join(DOCS, 'README.txt')
 HISTORY = os.path.join(DOCS, 'HISTORY.txt')
 
-version = '0.2.1'
+version = '0.3.2'
 long_description = open(README).read() + '\n\n' + open(HISTORY).read()
 
 tests_require = [
@@ -60,10 +60,28 @@
       install_requires=[
           'setuptools',
           # -*- Extra requirements: -*-
-          'zope.app.zapi',
+          'hurry.query',
+          'pytz',
+          'z3c.form',
           'zc.set',
+          'zope.annotation',
+          'zope.app.authentication',
+          'zope.app.file',
+          'zope.catalog',
+          'zope.component',
+          'zope.container',
+          'zope.datetime',
+          'zope.i18n',
+          'zope.index',
+          'zope.interface',
+          'zope.intid',
+          'zope.location',
+          'zope.publisher',
+          'zope.schema',
+          'zope.security',
+          'zope.session',
+          'zope.tales',
           'zopyx.txng3.core',
-          'hurry.query'
       ],
       entry_points="""
       # -*- Entry points: -*-
diff -r 6ca775e44505 -r 658842861161 ztfy.utils.egg-info/PKG-INFO
--- a/ztfy.utils.egg-info/PKG-INFO	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy.utils.egg-info/PKG-INFO	Mon Nov 07 13:02:19 2011 +0100
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: ztfy.utils
-Version: 0.2
+Version: 0.3.2
 Summary: ZTFY utility functions and classes for Zope3
 Home-page: http://trac.ztfy.org/ztfy.utils
 Author: Thierry Florac
@@ -41,6 +41,26 @@
         Changelog
         =========
         
+        0.3.2
+        -----
+        - Mark ztfy.utils.security functions and classes as deprecated
+        
+        0.3.1
+        -----
+        - Updated signature in ztfy.utils.catalog.index to match last hurry.query release
+        
+        0.3
+        ---
+        - Switched to ZTK-1.1.2
+        - Added "getAge" function in date module 
+        - Added session module and TALES adapter to get/set session values
+        - Check None value in catalog.getObjectId(...) and catalog.getObject(...) methods
+        
+        0.2.1
+        -----
+        - Added 'site.locateAndRegister' facility function
+        - Update ServerTimezoneUtility parent classes
+        
         0.2
         ---
         - Added 'data' namespace to access request data
diff -r 6ca775e44505 -r 658842861161 ztfy.utils.egg-info/SOURCES.txt
--- a/ztfy.utils.egg-info/SOURCES.txt	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy.utils.egg-info/SOURCES.txt	Mon Nov 07 13:02:19 2011 +0100
@@ -34,6 +34,7 @@
 ztfy/utils/profilehooks.py
 ztfy/utils/request.py
 ztfy/utils/security.py
+ztfy/utils/session.py
 ztfy/utils/site.py
 ztfy/utils/text.py
 ztfy/utils/traversing.py
@@ -56,6 +57,7 @@
 ztfy/utils/tal/html.py
 ztfy/utils/tal/interfaces.py
 ztfy/utils/tal/request.py
+ztfy/utils/tal/session.py
 ztfy/utils/tal/text.py
 ztfy/utils/tests/__init__.py
 ztfy/utils/tests/test_utilsdocs.py
diff -r 6ca775e44505 -r 658842861161 ztfy.utils.egg-info/requires.txt
--- a/ztfy.utils.egg-info/requires.txt	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy.utils.egg-info/requires.txt	Mon Nov 07 13:02:19 2011 +0100
@@ -1,8 +1,26 @@
 setuptools
-zope.app.zapi
+hurry.query
+pytz
+z3c.form
 zc.set
+zope.annotation
+zope.app.authentication
+zope.app.file
+zope.catalog
+zope.component
+zope.container
+zope.datetime
+zope.i18n
+zope.index
+zope.interface
+zope.intid
+zope.location
+zope.publisher
+zope.schema
+zope.security
+zope.session
+zope.tales
 zopyx.txng3.core
-hurry.query
 
 [test]
 zope.testing
\ No newline at end of file
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/catalog/__init__.py
--- a/ztfy/utils/catalog/__init__.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/catalog/__init__.py	Mon Nov 07 13:02:19 2011 +0100
@@ -19,15 +19,15 @@
 
 # import Zope3 interfaces
 from zope.annotation.interfaces import IAnnotations
-from zope.app.catalog.interfaces import ICatalog
-from zope.app.container.interfaces import IContainer
 from zope.app.file.interfaces import IFile
-from zope.app.intid.interfaces import IIntIds
+from zope.catalog.interfaces import ICatalog
+from zope.container.interfaces import IContainer
+from zope.intid.interfaces import IIntIds
 
 # import local interfaces
 
 # import Zope3 packages
-from zope.app import zapi
+from zope.component import queryUtility, getAllUtilitiesRegisteredFor
 
 # import local packages
 from ztfy.utils import request as request_utils
@@ -45,7 +45,7 @@
         request = request_utils.getRequest()
     intids = request_utils.getRequestData('IntIdsUtility::' + name, request)
     if intids is None:
-        intids = zapi.queryUtility(IIntIds, name, context=context)
+        intids = queryUtility(IIntIds, name, context=context)
         if intids is not None:
             request_utils.setRequestData('IntIdsUtility::' + name, intids, request)
     return intids
@@ -81,7 +81,7 @@
 
 def queryCatalog(name='', context=None):
     """Look for a registered catalog"""
-    return zapi.queryUtility(ICatalog, name, context=context)
+    return queryUtility(ICatalog, name, context=context)
 
 
 def indexObject(object, catalog_name='', index_name='', request=None, context=None):
@@ -157,8 +157,8 @@
     """Reindex a whole container properties and contents (including annotations) into site's catalogs"""
     if context is None:
         context = object
-    intids = zapi.queryUtility(IIntIds, context=context)
+    intids = queryUtility(IIntIds, context=context)
     if intids is not None:
-        catalogs = zapi.getAllUtilitiesRegisteredFor(ICatalog, context)
+        catalogs = getAllUtilitiesRegisteredFor(ICatalog, context)
         if catalogs:
             _indexAllObject(object, intids, catalogs)
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/catalog/configure.zcml
--- a/ztfy/utils/catalog/configure.zcml	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/catalog/configure.zcml	Mon Nov 07 13:02:19 2011 +0100
@@ -4,9 +4,9 @@
 
 	<class class=".index.TextIndexNG">
 		<require
-			interface="zope.app.catalog.interfaces.IAttributeIndex
+			interface="zope.catalog.interfaces.IAttributeIndex
 					   zope.index.interfaces.IStatistics"
-			set_schema="zope.app.catalog.interfaces.IAttributeIndex"
+			set_schema="zope.catalog.interfaces.IAttributeIndex"
 			permission="zope.ManageServices" />
 	</class>
 
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/catalog/index.py
--- a/ztfy/utils/catalog/index.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/catalog/index.py	Mon Nov 07 13:02:19 2011 +0100
@@ -28,9 +28,9 @@
 # import local interfaces
 
 # import Zope3 packages
-from zope.app import zapi
-from zope.app.catalog.attribute import AttributeIndex
-from zope.app.container.contained import Contained
+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
 from zopyx.txng3.core.index import Index
@@ -40,7 +40,7 @@
 
 
 class TextIndexNG(AttributeIndex, Persistent, Contained):
-    """Adaptation of zopyx.txng3.core for use zope.app.catalog index"""
+    """Adaptation of zopyx.txng3.core for use zope.catalog index"""
 
     implements(IInjection, IStatistics, IIndexSearch, ITingIndex)
 
@@ -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)
@@ -142,11 +142,11 @@
         super(Text, self).__init__(index_id)
         self.text = text
 
-    def getIndex(self):
-        index = super(Text, self).getIndex()
+    def getIndex(self, context=None):
+        index = super(Text, self).getIndex(context)
         assert ITingIndex.providedBy(index)
         return index
 
-    def apply(self):
-        index = self.getIndex()
+    def apply(self, context=None):
+        index = self.getIndex(context)
         return IFBTree.IFSet(index.apply(self.text))
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/docs/HISTORY.txt
--- a/ztfy/utils/docs/HISTORY.txt	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/docs/HISTORY.txt	Mon Nov 07 13:02:19 2011 +0100
@@ -1,6 +1,21 @@
 Changelog
 =========
 
+0.3.2
+-----
+- Mark ztfy.utils.security functions and classes as deprecated
+
+0.3.1
+-----
+- Updated signature in ztfy.utils.catalog.index to match last hurry.query release
+
+0.3
+---
+- Switched to ZTK-1.1.2
+- Added "getAge" function in date module 
+- Added session module and TALES adapter to get/set session values
+- Check None value in catalog.getObjectId(...) and catalog.getObject(...) methods
+
 0.2.1
 -----
 - Added 'site.locateAndRegister' facility function
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/file.py
--- a/ztfy/utils/file.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/file.py	Mon Nov 07 13:02:19 2011 +0100
@@ -18,16 +18,13 @@
 
 # import Zope3 interfaces
 from z3c.form.interfaces import IFileWidget
-from zope.app.file.interfaces import IFile
 from zope.schema.interfaces import IBytes
 
 # import local interfaces
 
 # import Zope3 packages
 from z3c.form.converter import FileUploadDataConverter as BaseDataConverter
-from zope.app.file import File
 from zope.component import adapts
-from zope.schema.fieldproperty import FieldProperty
 
 # import local packages
 
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/html.py
--- a/ztfy/utils/html.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/html.py	Mon Nov 07 13:02:19 2011 +0100
@@ -23,7 +23,6 @@
 # import local interfaces
 
 # import Zope3 packages
-from zope.app import zapi
 
 # import local packages
 
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/locales/en/LC_MESSAGES/ztfy.utils.mo
Binary file ztfy/utils/locales/en/LC_MESSAGES/ztfy.utils.mo has changed
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/locales/en/LC_MESSAGES/ztfy.utils.po
--- a/ztfy/utils/locales/en/LC_MESSAGES/ztfy.utils.po	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/locales/en/LC_MESSAGES/ztfy.utils.po	Mon Nov 07 13:02:19 2011 +0100
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZTFY.utils\n"
-"POT-Creation-Date: Tue Dec  7 17:25:11 2010\n"
+"POT-Creation-Date: Sun Oct 30 02:43:20 2011\n"
 "PO-Revision-Date: 2009-08-14 18:14+0200\n"
 "Last-Translator: Thierry Florac <tflorac@ulthar.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.mo
Binary file ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.mo has changed
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.po
--- a/ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.po	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.po	Mon Nov 07 13:02:19 2011 +0100
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZTFY.utils\n"
-"POT-Creation-Date: Tue Dec  7 17:25:11 2010\n"
+"POT-Creation-Date: Sun Oct 30 02:43:20 2011\n"
 "PO-Revision-Date: 2009-08-14 18:14+0200\n"
 "Last-Translator: Thierry Florac <tflorac@ulthar.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -61,11 +61,11 @@
 msgid "No Request in interaction !"
 msgstr "Pas de requête en cours !"
 
-#: ztfy/utils/security.py:63
+#: ztfy/utils/security.py:64
 msgid "< missing principal %s>"
 msgstr "< utilisateur inconnu %s >"
 
-#: ztfy/utils/security.py:67
+#: ztfy/utils/security.py:68
 msgid "This principal can't be found in any authentication utility..."
 msgstr "Cet utilisateur ne peut pas être trouvé"
 
@@ -76,4 +76,3 @@
 #: ztfy/utils/timezone/interfaces.py:36
 msgid "Default server timezone"
 msgstr "Fuseau horaire par défaut du serveur"
-
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/locales/ztfy.utils.pot
--- a/ztfy/utils/locales/ztfy.utils.pot	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/locales/ztfy.utils.pot	Mon Nov 07 13:02:19 2011 +0100
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003-2004 Zope Corporation and Contributors.
+# Copyright (c) 2003-2004 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -13,11 +13,11 @@
 ##############################################################################
 msgid ""
 msgstr ""
-"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Tue Dec  7 17:25:11 2010\n"
+"Project-Id-Version: Meaningless\n"
+"POT-Creation-Date: Sun Oct 30 02:43:20 2011\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Zope 3 Developers <zope3-dev@zope.org>\n"
+"Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,11 +59,11 @@
 msgid "No Request in interaction !"
 msgstr ""
 
-#: ztfy/utils/security.py:63
+#: ztfy/utils/security.py:64
 msgid "< missing principal %s>"
 msgstr ""
 
-#: ztfy/utils/security.py:67
+#: ztfy/utils/security.py:68
 msgid "This principal can't be found in any authentication utility..."
 msgstr ""
 
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/profilehooks.py
--- a/ztfy/utils/profilehooks.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/profilehooks.py	Mon Nov 07 13:02:19 2011 +0100
@@ -158,7 +158,7 @@
         return decorator
     # @profile syntax -- we are a decorator.
     fp = FuncProfile(fn, skip=skip, filename=filename, immediate=immediate)
-         # or HotShotFuncProfile
+    # or HotShotFuncProfile
     # We cannot return fp or fp.__call__ directly as that would break method
     # definitions, instead we need to return a plain function.
     def new_fn(*args, **kw):
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/security.py
--- a/ztfy/utils/security.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/security.py	Mon Nov 07 13:02:19 2011 +0100
@@ -19,13 +19,15 @@
 from persistent.dict import PersistentDict
 
 # import Zope3 interfaces
-from zope.app.authentication.interfaces import IPrincipalInfo
+from zope.authentication.interfaces import IAuthentication
+from zope.pluggableauth.interfaces import IPrincipalInfo
 
 # import local interfaces
 
 # import Zope3 packages
 from zc.set import Set
-from zope.app import zapi
+from zope.component import getUtility
+from zope.deprecation.deprecation import deprecate
 from zope.interface import implements
 from zope.security.proxy import removeSecurityProxy
 
@@ -51,6 +53,7 @@
     return result
 
 
+@deprecate("ztfy.utils.security.MissingPrincipal is deprecated. Use ztfy.security.search.MissingPrincipal class instead.")
 class MissingPrincipal(object):
 
     implements(IPrincipalInfo)
@@ -67,8 +70,9 @@
         return _("This principal can't be found in any authentication utility...")
 
 
+@deprecate("ztfy.utils.security.getPrincipal is deprecated. Use ztfy.security.search.getPrincipal function instead.")
 def getPrincipal(uid):
-    principals = zapi.principals()
+    principals = getUtility(IAuthentication)
     try:
         return principals.getPrincipal(uid)
     except:
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/site.py
--- a/ztfy/utils/site.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/site.py	Mon Nov 07 13:02:19 2011 +0100
@@ -18,13 +18,13 @@
 # import standard packages
 
 # import Zope3 interfaces
-from zope.app.intid.interfaces import IIntIds
+from zope.intid.interfaces import IIntIds
 
 # import local interfaces
-from interfaces import INewSiteManagerEvent
+from ztfy.utils.interfaces import INewSiteManagerEvent
 
 # import Zope3 packages
-from zope.app import zapi
+from zope.component import getUtility
 from zope.interface import implements
 from zope.location import locate
 
@@ -43,6 +43,6 @@
 def locateAndRegister(contained, parent, key, intids=None):
     locate(contained, parent)
     if intids is None:
-        intids = zapi.getUtility(IIntIds)
+        intids = getUtility(IIntIds)
     intids.register(contained)
     parent[key] = contained
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/tal/html.py
--- a/ztfy/utils/tal/html.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/tal/html.py	Mon Nov 07 13:02:19 2011 +0100
@@ -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
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/tal/request.py
--- a/ztfy/utils/tal/request.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/tal/request.py	Mon Nov 07 13:02:19 2011 +0100
@@ -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
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/tal/session.py
--- a/ztfy/utils/tal/session.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/tal/session.py	Mon Nov 07 13:02:19 2011 +0100
@@ -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
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/tal/text.py
--- a/ztfy/utils/tal/text.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/tal/text.py	Mon Nov 07 13:02:19 2011 +0100
@@ -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
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/tests/test_utilsdocs.py
--- a/ztfy/utils/tests/test_utilsdocs.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/tests/test_utilsdocs.py	Mon Nov 07 13:02:19 2011 +0100
@@ -23,7 +23,6 @@
 import sys
 import os
 
-from zope.testing import doctest
 
 current_dir = os.path.dirname(__file__)
 
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/tests/test_utilsdocstrings.py
--- a/ztfy/utils/tests/test_utilsdocstrings.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/tests/test_utilsdocstrings.py	Mon Nov 07 13:02:19 2011 +0100
@@ -23,7 +23,6 @@
 import sys
 import os
 
-from zope.testing import doctest
 
 current_dir = os.path.abspath(os.path.dirname(__file__))
 
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/text.py
--- a/ztfy/utils/text.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/text.py	Mon Nov 07 13:02:19 2011 +0100
@@ -22,11 +22,10 @@
 # import local interfaces
 
 # import Zope3 packages
-from zope.app import zapi
-from zope.component import createObject
+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):
@@ -54,7 +53,7 @@
     if request is None:
         request = getRequest()
     formatter = createObject(renderer, text)
-    renderer = zapi.queryMultiAdapter((formatter, request), name=u'')
+    renderer = queryMultiAdapter((formatter, request), name=u'')
     return renderer.render()
 
 
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/timezone/__init__.py
--- a/ztfy/utils/timezone/__init__.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/timezone/__init__.py	Mon Nov 07 13:02:19 2011 +0100
@@ -23,11 +23,10 @@
 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.app import zapi
-from zope.component import adapter
+from zope.component import adapter, queryUtility
 from zope.interface import implementer
 
 # import local packages
@@ -40,7 +39,7 @@
 @implementer(ITZInfo)
 @adapter(IBrowserRequest)
 def tzinfo(request=None):
-    util = zapi.queryUtility(IServerTimezone)
+    util = queryUtility(IServerTimezone)
     if util is not None:
         return pytz.timezone(util.timezone)
     return GMT
diff -r 6ca775e44505 -r 658842861161 ztfy/utils/timezone/utility.py
--- a/ztfy/utils/timezone/utility.py	Mon Nov 07 12:38:27 2011 +0100
+++ b/ztfy/utils/timezone/utility.py	Mon Nov 07 13:02:19 2011 +0100
@@ -21,10 +21,10 @@
 # import Zope3 interfaces
 
 # import local interfaces
-from interfaces import IServerTimezone
+from ztfy.utils.timezone.interfaces import IServerTimezone
 
 # import Zope3 packages
-from zope.app.container.contained import Contained
+from zope.container.contained import Contained
 from zope.interface import implements
 from zope.schema.fieldproperty import FieldProperty