# HG changeset patch # User Thierry Florac # Date 1270334880 -7200 # Node ID 6b70bf7c698f8e5758b9026199c78e421666b0c3 # Parent 40d3943c3846378201ec65c769d2163dfe6f9f9d Updates README files diff -r 40d3943c3846 -r 6b70bf7c698f .installed.cfg --- a/.installed.cfg Sat Apr 03 13:36:41 2010 +0200 +++ b/.installed.cfg Sun Apr 04 00:48:00 2010 +0200 @@ -1,45 +1,6 @@ [buildout] installed_develop_eggs = -parts = package i18n test - -[package] -__buildout_installed__ = -__buildout_signature__ = zc.recipe.egg-1.2.2-py2.5.egg setuptools-0.6c9-py2.5.egg zc.buildout-1.4.3-py2.5.egg -_b = /var/local/ztfy-2.5/ztfy.utils/bin -_d = /var/local/ztfy-2.5/ztfy.utils/develop-eggs -_e = /var/local/eggs -bin-directory = /var/local/ztfy-2.5/ztfy.utils/bin -develop-eggs-directory = /var/local/ztfy-2.5/ztfy.utils/develop-eggs -eggs = ztfy.utils - zc.set - zope.app.zapi -eggs-directory = /var/local/eggs -executable = /var/local/ztfy-2.5/bin/python2.5 -recipe = zc.recipe.egg - -[i18n] -__buildout_installed__ = /var/local/ztfy-2.5/ztfy.utils/bin/i18nextract - /var/local/ztfy-2.5/ztfy.utils/bin/i18nmergeall - /var/local/ztfy-2.5/ztfy.utils/bin/i18nstats - /var/local/ztfy-2.5/ztfy.utils/bin/i18ncompile -__buildout_signature__ = z3c.recipe.i18n-0.6.0-py2.5.egg zope.configuration-3.4.0-py2.5.egg zope.app.locales-3.5.1-py2.5.egg zope.app.appsetup-3.4.1-py2.5.egg zc.recipe.egg-1.2.2-py2.5.egg zc.buildout-1.4.3-py2.5.egg setuptools-0.6c9-py2.5.egg zope.schema-3.4.0-py2.5.egg zope.interface-qcu+DbU09jPKkiFRx30UrQ== zope.i18nmessageid-3.4.3-py2.5-linux-i686.egg zope.deprecation-3.4.0-py2.5.egg ZODB3-3.8.5-py2.5-linux-i686.egg zope.traversing-3.4.1-py2.5.egg zope.security-3.4.1-py2.5-linux-i686.egg zope.event-3.4.0-py2.5.egg zope.error-3.5.1-py2.5.egg zope.component-3.4.0-py2.5.egg zope.app.publication-3.4.3-py2.5.egg zope.app.folder-3.4.0-py2.5.egg zope.app.container-3.5.6-py2.5-linux-i686.egg zope.app.component-3.4.1-py2.5.egg zc.buildout-1.4.3-py2.5.egg zope.testing-3.5.6-py2.5.egg zdaemon-2.0.2-py2.5.egg ZConfig-2.5.1-py2.5.egg zope.proxy-3.4.2-py2.5-linux-i686.egg zope.publisher-3.4.6-py2.5.egg zope.i18n-3.4.0-py2.5.egg zope.app.applicationcontrol-3.4.3-py2.5.egg zope.proxy-3.4.2-py2.5-linux-i686.egg zope.location-3.4.0-py2.5.egg zope.exceptions-3.4.0-py2.5.egg zope.deferredimport-3.4.0-py2.5.egg pytz-2007k-py2.5.egg zope.app.security-3.5.2-py2.5.egg zope.app.exception-3.4.1-py2.5.egg zope.app.error-3.5.1-py2.5.egg zope.app.http-3.4.1-py2.5.egg zope.app.authentication-3.4.4-py2.5.egg zope.dublincore-3.4.0-py2.5.egg zope.datetime-3.4.0-py2.5.egg zope.copypastemove-3.4.0-py2.5.egg zope.app.broken-3.4.0-py2.5.egg zope.size-3.4.0-py2.5.egg zope.filerepresentation-3.4.0-py2.5.egg zope.lifecycleevent-3.4.0-py2.5.egg zope.dottedname-3.4.2-py2.5.egg zope.cachedescriptors-3.4.1-py2.5.egg zope.app.zapi-3.4.0-py2.5.egg zope.app.publisher-3.4.1-py2.5.egg zope.thread-3.4-py2.5.egg zope.location-3.4.0-py2.5.egg zope.formlib-3.4.0-py2.5.egg zope.component-3.4.0-py2.5.egg zope.app.pagetemplate-3.4.1-py2.5.egg zope.app.interface-3.4.0-py2.5.egg zope.annotation-3.4.1-py2.5.egg zope.app.testing-3.4.3-py2.5.egg zope.component-3.4.0-py2.5.egg zope.proxy-3.4.2-py2.5-linux-i686.egg zope.app.form-3.4.1-py2.5.egg zope.session-3.4.1-py2.5.egg zope.app.principalannotation-3.4.0-py2.5.egg zope.pagetemplate-3.4.0-py2.5.egg zope.contenttype-3.4.0-py2.5.egg zope.app.zcmlfiles-3.4.3-py2.5.egg zope.hookable-3.4.0-py2.5-linux-i686.egg zope.tales-3.4.0-py2.5.egg zope.security-3.4.1-py2.5-linux-i686.egg zodbcode-3.4.0-py2.5.egg zope.location-3.4.0-py2.5.egg zope.app.dependable-3.4.0-py2.5.egg zope.app.debug-3.4.1-py2.5.egg zope.app.basicskin-3.4.0-py2.5.egg zope.minmax-1.1.0-py2.5.egg zope.tal-3.4.1-py2.5.egg zope.app.schema-3.4.0-py2.5.egg zope.app.wsgi-3.4.1-py2.5.egg zope.app.rotterdam-3.4.1-py2.5.egg zope.app.zopeappgenerations-3.4.0-py2.5.egg zope.app.i18n-3.4.4-py2.5.egg zope.app.generations-3.4.1-py2.5.egg zope.app.content-3.4.0-py2.5.egg zope.modulealias-3.4.0-py2.5.egg RestrictedPython-3.4.2-py2.5.egg zope.app.renderer-3.4.0-py2.5.egg zope.structuredtext-3.4.0-py2.5.egg docutils-usGPx6KaiADRTcSG6hEZ/A== -_b = /var/local/ztfy-2.5/ztfy.utils/bin -_d = /var/local/ztfy-2.5/ztfy.utils/develop-eggs -_e = /var/local/eggs -bin-directory = /var/local/ztfy-2.5/ztfy.utils/bin -develop-eggs-directory = /var/local/ztfy-2.5/ztfy.utils/develop-eggs -domain = ztfy.utils -eggs = ztfy.utils - zc.set - zope.app.zapi - z3c.recipe.i18n - zope.app.locales [extract] -eggs-directory = /var/local/eggs -executable = /var/local/ztfy-2.5/bin/python2.5 -output = ztfy/utils/locales -packages = ztfy.utils -recipe = z3c.recipe.i18n:i18n -zcml = +parts = test package i18n [test] __buildout_installed__ = /var/local/ztfy-2.5/ztfy.utils/parts/test @@ -56,3 +17,61 @@ location = /var/local/ztfy-2.5/ztfy.utils/parts/test recipe = zc.recipe.testrunner script = /var/local/ztfy-2.5/ztfy.utils/bin/test + +[package] +__buildout_installed__ = +__buildout_signature__ = zc.recipe.egg-1.2.2-py2.5.egg setuptools-0.6c9-py2.5.egg zc.buildout-1.4.3-py2.5.egg +_b = /var/local/ztfy-2.5/ztfy.utils/bin +_d = /var/local/ztfy-2.5/ztfy.utils/develop-eggs +_e = /var/local/eggs +bin-directory = /var/local/ztfy-2.5/ztfy.utils/bin +develop-eggs-directory = /var/local/ztfy-2.5/ztfy.utils/develop-eggs +eggs = ztfy.utils + zc.set + zope.app.zapi + zopyx.txng3.core + hurry.query +eggs-directory = /var/local/eggs +executable = /var/local/ztfy-2.5/bin/python2.5 +recipe = zc.recipe.egg + +[i18n] +__buildout_installed__ = /var/local/ztfy-2.5/ztfy.utils/bin/i18nextract + /var/local/ztfy-2.5/ztfy.utils/bin/i18nmergeall + /var/local/ztfy-2.5/ztfy.utils/bin/i18nstats + /var/local/ztfy-2.5/ztfy.utils/bin/i18ncompile +__buildout_signature__ = z3c.recipe.i18n-0.6.0-py2.5.egg zope.configuration-3.4.0-py2.5.egg zope.app.locales-3.5.1-py2.5.egg zope.app.appsetup-3.4.1-py2.5.egg zc.recipe.egg-1.2.2-py2.5.egg zc.buildout-1.4.3-py2.5.egg setuptools-0.6c9-py2.5.egg zope.schema-3.4.0-py2.5.egg zope.interface-P4IMwSzhqLIahkBeJlTgeQ== zope.i18nmessageid-3.4.3-py2.5-linux-i686.egg zope.deprecation-3.4.0-py2.5.egg ZODB3-3.8.5-py2.5-linux-i686.egg zope.traversing-3.4.1-py2.5.egg zope.security-3.4.1-py2.5-linux-i686.egg zope.event-3.4.0-py2.5.egg zope.error-3.5.1-py2.5.egg zope.component-3.4.0-py2.5.egg zope.app.publication-3.4.3-py2.5.egg zope.app.folder-3.4.0-py2.5.egg zope.app.container-3.5.6-py2.5-linux-i686.egg zope.app.component-3.4.1-py2.5.egg zc.buildout-1.4.3-py2.5.egg zope.testing-3.5.6-py2.5.egg zdaemon-2.0.2-py2.5.egg ZConfig-2.5.1-py2.5.egg zope.proxy-3.4.2-py2.5-linux-i686.egg zope.publisher-3.4.6-py2.5.egg zope.i18n-3.4.0-py2.5.egg zope.app.applicationcontrol-3.4.3-py2.5.egg zope.proxy-3.4.2-py2.5-linux-i686.egg zope.location-3.4.0-py2.5.egg zope.exceptions-3.4.0-py2.5.egg zope.deferredimport-3.4.0-py2.5.egg pytz-2007k-py2.5.egg zope.app.security-3.5.2-py2.5.egg zope.app.exception-3.4.1-py2.5.egg zope.app.error-3.5.1-py2.5.egg zope.app.http-3.4.1-py2.5.egg zope.app.authentication-3.4.4-py2.5.egg zope.dublincore-3.4.0-py2.5.egg zope.datetime-3.4.0-py2.5.egg zope.copypastemove-3.4.0-py2.5.egg zope.app.broken-3.4.0-py2.5.egg zope.size-3.4.0-py2.5.egg zope.filerepresentation-3.4.0-py2.5.egg zope.lifecycleevent-3.4.0-py2.5.egg zope.dottedname-3.4.2-py2.5.egg zope.cachedescriptors-3.4.1-py2.5.egg zope.app.zapi-3.4.0-py2.5.egg zope.app.publisher-3.4.1-py2.5.egg zope.thread-3.4-py2.5.egg zope.location-3.4.0-py2.5.egg zope.formlib-3.4.0-py2.5.egg zope.component-3.4.0-py2.5.egg zope.app.pagetemplate-3.4.1-py2.5.egg zope.app.interface-3.4.0-py2.5.egg zope.annotation-3.4.1-py2.5.egg zope.app.testing-3.4.3-py2.5.egg zope.component-3.4.0-py2.5.egg zope.proxy-3.4.2-py2.5-linux-i686.egg zope.app.form-3.4.1-py2.5.egg zope.session-3.4.1-py2.5.egg zope.app.principalannotation-3.4.0-py2.5.egg zope.pagetemplate-3.4.0-py2.5.egg zope.contenttype-3.4.0-py2.5.egg zope.app.zcmlfiles-3.4.3-py2.5.egg zope.hookable-3.4.0-py2.5-linux-i686.egg zope.tales-3.4.0-py2.5.egg zope.security-3.4.1-py2.5-linux-i686.egg zodbcode-3.4.0-py2.5.egg zope.location-3.4.0-py2.5.egg zope.app.dependable-3.4.0-py2.5.egg zope.app.debug-3.4.1-py2.5.egg zope.app.basicskin-3.4.0-py2.5.egg zope.minmax-1.1.0-py2.5.egg zope.tal-3.4.1-py2.5.egg zope.app.schema-3.4.0-py2.5.egg zope.app.wsgi-3.4.1-py2.5.egg zope.app.rotterdam-3.4.1-py2.5.egg zope.app.zopeappgenerations-3.4.0-py2.5.egg zope.app.i18n-3.4.4-py2.5.egg zope.app.generations-3.4.1-py2.5.egg zope.app.content-3.4.0-py2.5.egg zope.modulealias-3.4.0-py2.5.egg RestrictedPython-3.4.2-py2.5.egg zope.app.renderer-3.4.0-py2.5.egg zope.structuredtext-3.4.0-py2.5.egg docutils-wEcCKMclBJoctedBefolSg== +_b = /var/local/ztfy-2.5/ztfy.utils/bin +_d = /var/local/ztfy-2.5/ztfy.utils/develop-eggs +_e = /var/local/eggs +bin-directory = /var/local/ztfy-2.5/ztfy.utils/bin +develop-eggs-directory = /var/local/ztfy-2.5/ztfy.utils/develop-eggs +domain = ztfy.utils +eggs = ztfy.utils + zc.set + zope.app.zapi + zopyx.txng3.core + hurry.query + z3c.recipe.i18n + zope.app.locales [extract] +eggs-directory = /var/local/eggs +executable = /var/local/ztfy-2.5/bin/python2.5 +output = ztfy/utils/locales +packages = ztfy.utils +recipe = z3c.recipe.i18n:i18n +zcml = + +[buildout] +parts = package i18n test + +[buildout] +installed_develop_eggs = + +[buildout] +parts = i18n test package + +[buildout] +parts = test package i18n + +[buildout] +parts = package i18n test diff -r 40d3943c3846 -r 6b70bf7c698f README.txt --- a/README.txt Sat Apr 03 13:36:41 2010 +0200 +++ b/README.txt Sun Apr 04 00:48:00 2010 +0200 @@ -11,4 +11,3 @@ This package is created and maintained by Thierry Florac_. .. _Thierry Florac: mailto:tflorac@ulthar.net - diff -r 40d3943c3846 -r 6b70bf7c698f bin/i18ncompile --- a/bin/i18ncompile Sat Apr 03 13:36:41 2010 +0200 +++ b/bin/i18ncompile Sun Apr 04 00:48:00 2010 +0200 @@ -5,6 +5,8 @@ '/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', @@ -16,10 +18,12 @@ '/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.component-3.4.0-py2.5.egg', '/var/local/eggs/zope.app.folder-3.4.0-py2.5.egg', '/var/local/eggs/ZODB3-3.8.5-py2.5-linux-i686.egg', '/var/local/eggs/zope.security-3.4.1-py2.5-linux-i686.egg', @@ -32,11 +36,14 @@ '/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.publisher-3.4.6-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.deferredimport-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', @@ -46,9 +53,7 @@ '/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/zope.testing-3.5.6-py2.5.egg', '/var/local/eggs/zope.exceptions-3.4.0-py2.5.egg', - '/var/local/eggs/pytz-2007k-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', @@ -62,6 +67,8 @@ '/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', @@ -70,6 +77,7 @@ '/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', diff -r 40d3943c3846 -r 6b70bf7c698f bin/i18nextract --- a/bin/i18nextract Sat Apr 03 13:36:41 2010 +0200 +++ b/bin/i18nextract Sun Apr 04 00:48:00 2010 +0200 @@ -5,6 +5,8 @@ '/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', @@ -16,10 +18,12 @@ '/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.component-3.4.0-py2.5.egg', '/var/local/eggs/zope.app.folder-3.4.0-py2.5.egg', '/var/local/eggs/ZODB3-3.8.5-py2.5-linux-i686.egg', '/var/local/eggs/zope.security-3.4.1-py2.5-linux-i686.egg', @@ -32,11 +36,14 @@ '/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.publisher-3.4.6-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.deferredimport-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', @@ -46,9 +53,7 @@ '/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/zope.testing-3.5.6-py2.5.egg', '/var/local/eggs/zope.exceptions-3.4.0-py2.5.egg', - '/var/local/eggs/pytz-2007k-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', @@ -62,6 +67,8 @@ '/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', @@ -70,6 +77,7 @@ '/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', diff -r 40d3943c3846 -r 6b70bf7c698f bin/i18nmergeall --- a/bin/i18nmergeall Sat Apr 03 13:36:41 2010 +0200 +++ b/bin/i18nmergeall Sun Apr 04 00:48:00 2010 +0200 @@ -5,6 +5,8 @@ '/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', @@ -16,10 +18,12 @@ '/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.component-3.4.0-py2.5.egg', '/var/local/eggs/zope.app.folder-3.4.0-py2.5.egg', '/var/local/eggs/ZODB3-3.8.5-py2.5-linux-i686.egg', '/var/local/eggs/zope.security-3.4.1-py2.5-linux-i686.egg', @@ -32,11 +36,14 @@ '/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.publisher-3.4.6-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.deferredimport-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', @@ -46,9 +53,7 @@ '/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/zope.testing-3.5.6-py2.5.egg', '/var/local/eggs/zope.exceptions-3.4.0-py2.5.egg', - '/var/local/eggs/pytz-2007k-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', @@ -62,6 +67,8 @@ '/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', @@ -70,6 +77,7 @@ '/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', diff -r 40d3943c3846 -r 6b70bf7c698f bin/i18nstats --- a/bin/i18nstats Sat Apr 03 13:36:41 2010 +0200 +++ b/bin/i18nstats Sun Apr 04 00:48:00 2010 +0200 @@ -5,6 +5,8 @@ '/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', @@ -16,10 +18,12 @@ '/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.component-3.4.0-py2.5.egg', '/var/local/eggs/zope.app.folder-3.4.0-py2.5.egg', '/var/local/eggs/ZODB3-3.8.5-py2.5-linux-i686.egg', '/var/local/eggs/zope.security-3.4.1-py2.5-linux-i686.egg', @@ -32,11 +36,14 @@ '/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.publisher-3.4.6-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.deferredimport-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', @@ -46,9 +53,7 @@ '/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/zope.testing-3.5.6-py2.5.egg', '/var/local/eggs/zope.exceptions-3.4.0-py2.5.egg', - '/var/local/eggs/pytz-2007k-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', @@ -62,6 +67,8 @@ '/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', @@ -70,6 +77,7 @@ '/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', diff -r 40d3943c3846 -r 6b70bf7c698f bin/test --- a/bin/test Sat Apr 03 13:36:41 2010 +0200 +++ b/bin/test Sun Apr 04 00:48:00 2010 +0200 @@ -5,69 +5,77 @@ '/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.8.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.component-3.4.0-py2.5.egg', - '/var/local/eggs/zope.interface-3.4.1-py2.5-linux-i686.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.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.app.authentication-3.4.4-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.event-3.4.0-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/zdaemon-2.0.2-py2.5.egg', '/var/local/eggs/ZConfig-2.5.1-py2.5.egg', '/var/local/eggs/zope.proxy-3.4.2-py2.5-linux-i686.egg', '/var/local/eggs/zodbcode-3.4.0-py2.5.egg', - '/var/local/eggs/zope.publisher-3.4.6-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.deprecation-3.4.0-py2.5.egg', - '/var/local/eggs/zope.deferredimport-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.i18nmessageid-3.4.3-py2.5-linux-i686.egg', '/var/local/eggs/zope.app.applicationcontrol-3.4.3-py2.5.egg', - '/var/local/eggs/zope.app.form-3.4.1-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.exceptions-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.annotation-3.4.1-py2.5.egg', '/var/local/eggs/zope.session-3.4.1-py2.5.egg', - '/var/local/eggs/pytz-2007k-py2.5.egg', - '/var/local/eggs/zope.app.testing-3.4.3-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.basicskin-3.4.0-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/zope.app.dependable-3.4.0-py2.5.egg', - '/var/local/eggs/zope.app.debug-3.4.1-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', diff -r 40d3943c3846 -r 6b70bf7c698f setup.cfg --- a/setup.cfg Sat Apr 03 13:36:41 2010 +0200 +++ b/setup.cfg Sun Apr 04 00:48:00 2010 +0200 @@ -1,7 +1,6 @@ [egg_info] -tag_build = dev +tag_build = tag_svn_revision = true [aliases] -iw_upload = register sdist bdist_egg upload -r http://products.ingeniweb.com/catalog - +iw_upload = register sdist bdist_egg upload diff -r 40d3943c3846 -r 6b70bf7c698f ztfy.utils.egg-info/PKG-INFO --- a/ztfy.utils.egg-info/PKG-INFO Sat Apr 03 13:36:41 2010 +0200 +++ b/ztfy.utils.egg-info/PKG-INFO Sun Apr 04 00:48:00 2010 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: ztfy.utils -Version: 1.0dev +Version: 1.0 Summary: ZTFY utility functions and classes for Zope3 Home-page: UNKNOWN Author: Thierry Florac @@ -21,9 +21,15 @@ - date : convert dates to unicode ISO format, parse ISO datetime, convert date to datetime - request : get current request, get request annotations, get and set request data via annotations - security : get unproxied value of a given object ; can be applied to lists or dicts - - timezone : convert datetime to a given timezone + - timezone : convert datetime to a given timezone ; provides a server default timezone utility - traversing : get object parents until a given interface is implemented - unicode : convert any text to unicode for easy storage + - protocol : utility functions and modules for several nerwork protocols + - catalog : TextIndexNG index for Zope catalog and hurry.query "Text" query item + - text : simple text operations and text to HTML conversion + - html : HTML parser and HTML to text converter + - file : file upload data converter + - tal : text and HTML conversions for use from within TAL How to use ztfy.utils ? diff -r 40d3943c3846 -r 6b70bf7c698f ztfy/utils/docs/README.txt --- a/ztfy/utils/docs/README.txt Sat Apr 03 13:36:41 2010 +0200 +++ b/ztfy/utils/docs/README.txt Sun Apr 04 00:48:00 2010 +0200 @@ -13,10 +13,16 @@ - date : convert dates to unicode ISO format, parse ISO datetime, convert date to datetime - request : get current request, get request annotations, get and set request data via annotations - security : get unproxied value of a given object ; can be applied to lists or dicts - - timezone : convert datetime to a given timezone + - timezone : convert datetime to a given timezone ; provides a server default timezone utility - traversing : get object parents until a given interface is implemented - unicode : convert any text to unicode for easy storage - + - protocol : utility functions and modules for several nerwork protocols + - catalog : TextIndexNG index for Zope catalog and hurry.query "Text" query item + - text : simple text operations and text to HTML conversion + - html : HTML parser and HTML to text converter + - file : file upload data converter + - tal : text and HTML conversions for use from within TAL + How to use ztfy.utils ? ======================= diff -r 40d3943c3846 -r 6b70bf7c698f ztfy/utils/doctests/README.txt --- a/ztfy/utils/doctests/README.txt Sat Apr 03 13:36:41 2010 +0200 +++ b/ztfy/utils/doctests/README.txt Sun Apr 04 00:48:00 2010 +0200 @@ -103,14 +103,15 @@ TZ data was to store every datetime value in GMT timezone. As far as I know, there is no easy way to know the user's timezone from his request settings. So you can: - store this timezone in user's profile, -- define a static server's timezone :-/ +- define a static server's timezone +- create and register a ServerTimezoneUtility to handle server default timezone. My current default user's timezone is set to 'Europe/Paris' ; you should probably update this setting in 'timezone.py' if you are located elsewhere. >>> from ztfy.utils import timezone >>> timezone.tztime(ddate) - datetime.datetime(2008, 3, 8, 20, 13, 20, tzinfo=) + datetime.datetime(2008, 3, 8, 19, 13, 20, tzinfo=) 'gmtime' function can be used to convert a datetime to GMT: