# HG changeset patch
# User borax
# Date 1306096652 -7200
# Node ID 82d8de021806e059fa654144fdfccaf50a166572
# Parent  ddab9a29b54be2dc9b7f89ea212a141af0fe1b9b
Starting 'ZTK-1.1' branch

diff -r ddab9a29b54b -r 82d8de021806 .pydevproject
--- a/.pydevproject	Tue Dec 07 17:27:24 2010 +0100
+++ b/.pydevproject	Sun May 22 22:37:32 2011 +0200
@@ -2,32 +2,37 @@
 <?eclipse-pydev version="1.0"?>
 
 <pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/ZTFY.utils/ztfy</path>
+<path>/ztfy.utils</path>
 </pydev_pathproperty>
+
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Python 2.6 (BB)</pydev_property>
 <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>
+<path>/var/local/eggs/zope.testing-3.10.2-py2.6.egg</path>
+<path>/var/local/eggs/zope.tales-3.5.1-py2.6.egg</path>
+<path>/var/local/eggs/zope.interface-3.6.1-py2.6-linux-x86_64.egg</path>
+<path>/var/local/eggs/zope.app.zapi-3.5.0-py2.6.egg</path>
+<path>/var/local/eggs/zope.datetime-3.4.0-py2.6.egg</path>
+<path>/var/local/eggs/zope.i18n-3.7.4-py2.6.egg</path>
+<path>/var/local/eggs/z3c.form-2.4.3-py2.6.egg</path>
+<path>/var/local/eggs/zope.app.file-3.6.1-py2.6.egg</path>
+<path>/var/local/eggs/zope.schema-3.7.1-py2.6.egg</path>
+<path>/var/local/eggs/zope.component-3.10.0-py2.6.egg</path>
+<path>/var/local/eggs/zope.annotation-3.5.0-py2.6.egg</path>
+<path>/var/local/eggs/zope.catalog-3.8.1-py2.6.egg</path>
+<path>/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg</path>
+<path>/var/local/eggs/zope.intid-3.7.2-py2.6.egg</path>
+<path>/var/local/eggs/zope.publisher-3.12.6-py2.6.egg</path>
+<path>/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.egg</path>
+<path>/var/local/eggs/ZODB3-3.10.2-py2.6-linux-x86_64.egg</path>
+<path>/var/local/eggs/zc.set-0.1dev_r75642-py2.6.egg</path>
+<path>/var/local/eggs/zope.app.authentication-3.9-py2.6.egg</path>
+<path>/var/local/eggs/zope.session-3.9.3-py2.6.egg</path>
+<path>/var/local/eggs/zope.location-3.9.0-py2.6.egg</path>
+<path>/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg</path>
+<path>/var/local/eggs/zopyx.txng3.core-3.5.3-py2.6.egg</path>
+<path>/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg</path>
+<path>/var/local/eggs/hurry.query-1.1.0-py2.6.egg</path>
 </pydev_pathproperty>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Python 2.5</pydev_property>
 </pydev_project>
diff -r ddab9a29b54b -r 82d8de021806 .settings/org.eclipse.core.resources.prefs
--- a/.settings/org.eclipse.core.resources.prefs	Tue Dec 07 17:27:24 2010 +0100
+++ b/.settings/org.eclipse.core.resources.prefs	Sun May 22 22:37:32 2011 +0200
@@ -1,4 +1,4 @@
-#Fri Aug 27 09:08:36 CEST 2010
+#Fri Nov 12 14:48:38 CET 2010
 eclipse.preferences.version=1
 encoding//ztfy/utils/__init__.py=utf-8
 encoding//ztfy/utils/catalog/__init__.py=utf-8
@@ -10,10 +10,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 ddab9a29b54b -r 82d8de021806 bin/buildout
--- a/bin/buildout	Tue Dec 07 17:27:24 2010 +0100
+++ b/bin/buildout	Sun May 22 22:37:32 2011 +0200
@@ -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 ddab9a29b54b -r 82d8de021806 bin/i18ncompile
--- a/bin/i18ncompile	Tue Dec 07 17:27:24 2010 +0100
+++ b/bin/i18ncompile	Sun May 22 22:37:32 2011 +0200
@@ -1,103 +1,91 @@
-#!/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.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18nmessageid-3.5.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/distribute-0.6.14-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.app.zapi-3.5.0-py2.6.egg',
+    '/var/local/eggs/zope.app.session-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.app.intid-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.app.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zc.set-0.1dev_r75642-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.session-3.9.3-py2.6.egg',
+    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.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.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.app.publication-3.12.0-py2.6.egg',
+    '/var/local/eggs/ZODB3-3.10.2-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.applicationcontrol-3.5.5-py2.6.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.app.interface-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
+    '/var/local/eggs/zope.app.http-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.2-py2.6.egg',
+    '/var/local/eggs/transaction-1.1.1-py2.6.egg',
+    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-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.ptresource-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zodbcode-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/pytz-2010l-py2.6.egg',
+    '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-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 ddab9a29b54b -r 82d8de021806 bin/i18nextract
--- a/bin/i18nextract	Tue Dec 07 17:27:24 2010 +0100
+++ b/bin/i18nextract	Sun May 22 22:37:32 2011 +0200
@@ -1,108 +1,96 @@
-#!/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.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18nmessageid-3.5.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/distribute-0.6.14-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.app.zapi-3.5.0-py2.6.egg',
+    '/var/local/eggs/zope.app.session-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.app.intid-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.app.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zc.set-0.1dev_r75642-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.session-3.9.3-py2.6.egg',
+    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.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.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.app.publication-3.12.0-py2.6.egg',
+    '/var/local/eggs/ZODB3-3.10.2-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.applicationcontrol-3.5.5-py2.6.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.app.interface-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
+    '/var/local/eggs/zope.app.http-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.2-py2.6.egg',
+    '/var/local/eggs/transaction-1.1.1-py2.6.egg',
+    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-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.ptresource-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zodbcode-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/pytz-2010l-py2.6.egg',
+    '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-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 ddab9a29b54b -r 82d8de021806 bin/i18nmergeall
--- a/bin/i18nmergeall	Tue Dec 07 17:27:24 2010 +0100
+++ b/bin/i18nmergeall	Sun May 22 22:37:32 2011 +0200
@@ -1,103 +1,91 @@
-#!/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.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18nmessageid-3.5.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/distribute-0.6.14-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.app.zapi-3.5.0-py2.6.egg',
+    '/var/local/eggs/zope.app.session-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.app.intid-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.app.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zc.set-0.1dev_r75642-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.session-3.9.3-py2.6.egg',
+    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.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.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.app.publication-3.12.0-py2.6.egg',
+    '/var/local/eggs/ZODB3-3.10.2-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.applicationcontrol-3.5.5-py2.6.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.app.interface-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
+    '/var/local/eggs/zope.app.http-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.2-py2.6.egg',
+    '/var/local/eggs/transaction-1.1.1-py2.6.egg',
+    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-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.ptresource-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zodbcode-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/pytz-2010l-py2.6.egg',
+    '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-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 ddab9a29b54b -r 82d8de021806 bin/i18nstats
--- a/bin/i18nstats	Tue Dec 07 17:27:24 2010 +0100
+++ b/bin/i18nstats	Sun May 22 22:37:32 2011 +0200
@@ -1,103 +1,91 @@
-#!/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.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18nmessageid-3.5.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/distribute-0.6.14-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.app.zapi-3.5.0-py2.6.egg',
+    '/var/local/eggs/zope.app.session-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.app.intid-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.app.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zc.set-0.1dev_r75642-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.session-3.9.3-py2.6.egg',
+    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.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.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.app.publication-3.12.0-py2.6.egg',
+    '/var/local/eggs/ZODB3-3.10.2-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.applicationcontrol-3.5.5-py2.6.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.app.interface-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
+    '/var/local/eggs/zope.app.http-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.2-py2.6.egg',
+    '/var/local/eggs/transaction-1.1.1-py2.6.egg',
+    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-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.ptresource-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zodbcode-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/pytz-2010l-py2.6.egg',
+    '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-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 ddab9a29b54b -r 82d8de021806 bin/test
--- a/bin/test	Tue Dec 07 17:27:24 2010 +0100
+++ b/bin/test	Sun May 22 22:37:32 2011 +0200
@@ -1,106 +1,88 @@
-#!/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.1-py2.6.egg',
+    '/var/local/eggs/zope.interface-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/distribute-0.6.14-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.app.zapi-3.5.0-py2.6.egg',
+    '/var/local/eggs/zope.app.session-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.app.intid-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.app.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zc.set-0.1dev_r75642-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.component-3.10.0-py2.6.egg',
+    '/var/local/eggs/zope.tal-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.traversing-3.14.0-py2.6.egg',
+    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.app.interface-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.session-3.9.3-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.i18nmessageid-3.5.3-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.app.http-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.app.appsetup-3.15.0-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
+    '/var/local/eggs/ZODB3-3.10.2-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.site-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.event-3.5.0_1-py2.6.egg',
+    '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.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.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.componentvocabulary-1.0.1-py2.6.egg',
+    '/var/local/eggs/zope.ptresource-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.configuration-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zodbcode-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.processlifetime-1.0-py2.6.egg',
+    '/var/local/eggs/zope.error-3.7.2-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.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/pytz-2010l-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-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 ddab9a29b54b -r 82d8de021806 buildout.cfg
--- a/buildout.cfg	Tue Dec 07 17:27:24 2010 +0100
+++ b/buildout.cfg	Sun May 22 22:37:32 2011 +0200
@@ -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 ddab9a29b54b -r 82d8de021806 setup.py
--- a/setup.py	Tue Dec 07 17:27:24 2010 +0100
+++ b/setup.py	Sun May 22 22:37:32 2011 +0200
@@ -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'
 long_description = open(README).read() + '\n\n' + open(HISTORY).read()
 
 tests_require = [
@@ -60,10 +60,17 @@
       install_requires=[
           'setuptools',
           # -*- Extra requirements: -*-
-          'zope.app.zapi',
+          'hurry.query',
           'zc.set',
+          'zope.app.file',
+          'zope.app.zapi',
+          'zope.catalog',
+          'zope.container',
+          'zope.interface',
+          'zope.intid',
+          'zope.session',
+          'zope.tales',
           'zopyx.txng3.core',
-          'hurry.query'
       ],
       entry_points="""
       # -*- Entry points: -*-
diff -r ddab9a29b54b -r 82d8de021806 ztfy.utils.egg-info/PKG-INFO
--- a/ztfy.utils.egg-info/PKG-INFO	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy.utils.egg-info/PKG-INFO	Sun May 22 22:37:32 2011 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: ztfy.utils
-Version: 0.2
+Version: 0.3
 Summary: ZTFY utility functions and classes for Zope3
 Home-page: http://trac.ztfy.org/ztfy.utils
 Author: Thierry Florac
@@ -41,6 +41,17 @@
         Changelog
         =========
         
+        0.3
+        ---
+        - 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 ddab9a29b54b -r 82d8de021806 ztfy.utils.egg-info/SOURCES.txt
--- a/ztfy.utils.egg-info/SOURCES.txt	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy.utils.egg-info/SOURCES.txt	Sun May 22 22:37:32 2011 +0200
@@ -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 ddab9a29b54b -r 82d8de021806 ztfy.utils.egg-info/requires.txt
--- a/ztfy.utils.egg-info/requires.txt	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy.utils.egg-info/requires.txt	Sun May 22 22:37:32 2011 +0200
@@ -1,8 +1,15 @@
 setuptools
-zope.app.zapi
+hurry.query
 zc.set
+zope.app.file
+zope.app.zapi
+zope.catalog
+zope.container
+zope.interface
+zope.intid
+zope.session
+zope.tales
 zopyx.txng3.core
-hurry.query
 
 [test]
 zope.testing
\ No newline at end of file
diff -r ddab9a29b54b -r 82d8de021806 ztfy/utils/catalog/__init__.py
--- a/ztfy/utils/catalog/__init__.py	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy/utils/catalog/__init__.py	Sun May 22 22:37:32 2011 +0200
@@ -19,10 +19,10 @@
 
 # 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
 
diff -r ddab9a29b54b -r 82d8de021806 ztfy/utils/catalog/configure.zcml
--- a/ztfy/utils/catalog/configure.zcml	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy/utils/catalog/configure.zcml	Sun May 22 22:37:32 2011 +0200
@@ -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 ddab9a29b54b -r 82d8de021806 ztfy/utils/catalog/index.py
--- a/ztfy/utils/catalog/index.py	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy/utils/catalog/index.py	Sun May 22 22:37:32 2011 +0200
@@ -29,8 +29,8 @@
 
 # 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.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)
 
diff -r ddab9a29b54b -r 82d8de021806 ztfy/utils/docs/HISTORY.txt
--- a/ztfy/utils/docs/HISTORY.txt	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy/utils/docs/HISTORY.txt	Sun May 22 22:37:32 2011 +0200
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.3
+---
+- 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 ddab9a29b54b -r 82d8de021806 ztfy/utils/file.py
--- a/ztfy/utils/file.py	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy/utils/file.py	Sun May 22 22:37:32 2011 +0200
@@ -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 ddab9a29b54b -r 82d8de021806 ztfy/utils/html.py
--- a/ztfy/utils/html.py	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy/utils/html.py	Sun May 22 22:37:32 2011 +0200
@@ -23,7 +23,6 @@
 # import local interfaces
 
 # import Zope3 packages
-from zope.app import zapi
 
 # import local packages
 
diff -r ddab9a29b54b -r 82d8de021806 ztfy/utils/profilehooks.py
--- a/ztfy/utils/profilehooks.py	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy/utils/profilehooks.py	Sun May 22 22:37:32 2011 +0200
@@ -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 ddab9a29b54b -r 82d8de021806 ztfy/utils/site.py
--- a/ztfy/utils/site.py	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy/utils/site.py	Sun May 22 22:37:32 2011 +0200
@@ -18,7 +18,7 @@
 # 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
diff -r ddab9a29b54b -r 82d8de021806 ztfy/utils/tests/test_utilsdocs.py
--- a/ztfy/utils/tests/test_utilsdocs.py	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy/utils/tests/test_utilsdocs.py	Sun May 22 22:37:32 2011 +0200
@@ -23,7 +23,6 @@
 import sys
 import os
 
-from zope.testing import doctest
 
 current_dir = os.path.dirname(__file__)
 
diff -r ddab9a29b54b -r 82d8de021806 ztfy/utils/tests/test_utilsdocstrings.py
--- a/ztfy/utils/tests/test_utilsdocstrings.py	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy/utils/tests/test_utilsdocstrings.py	Sun May 22 22:37:32 2011 +0200
@@ -23,7 +23,6 @@
 import sys
 import os
 
-from zope.testing import doctest
 
 current_dir = os.path.abspath(os.path.dirname(__file__))
 
diff -r ddab9a29b54b -r 82d8de021806 ztfy/utils/timezone/utility.py
--- a/ztfy/utils/timezone/utility.py	Tue Dec 07 17:27:24 2010 +0100
+++ b/ztfy/utils/timezone/utility.py	Sun May 22 22:37:32 2011 +0200
@@ -24,14 +24,12 @@
 from 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
 
 # import local packages
 
-from ztfy.utils import _
-
 
 class ServerTimezoneUtility(Persistent, Contained):