# HG changeset patch # User borax # Date 1250025885 -7200 # Node ID 974354a28adcd9dff42ce10a205d251290f697d1 # Parent 312df6e5dff69a2a9c53ea059046b68f5da850b0 (no commit message) diff -r 312df6e5dff6 -r 974354a28adc bin/buildout --- a/bin/buildout Tue Feb 17 21:52:58 2009 +0100 +++ b/bin/buildout Tue Aug 11 23:24:45 2009 +0200 @@ -1,9 +1,9 @@ -#!/usr/bin/python +#!/var/local/ztfy/bin/python2.4 import sys sys.path[0:0] = [ - '/var/local/src/ztfy/eggs/setuptools-0.6c9-py2.5.egg', - '/var/local/src/ztfy/eggs/zc.buildout-1.1.1-py2.5.egg', + '/var/local/ztfy/eggs/setuptools-0.6c9-py2.4.egg', + '/var/local/ztfy/eggs/zc.buildout-1.3.0-py2.4.egg', ] import zc.buildout.buildout diff -r 312df6e5dff6 -r 974354a28adc bin/test --- a/bin/test Tue Feb 17 21:52:58 2009 +0100 +++ b/bin/test Tue Aug 11 23:24:45 2009 +0200 @@ -1,96 +1,95 @@ -#!/usr/bin/python +#!/var/local/ztfy/bin/python2.4 import sys sys.path[0:0] = [ - '/var/local/src/ztfy/ztfy.utils', - '/var/local/src/ztfy/eggs/zope.testing-3.7.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.interface-3.4.1-py2.5-linux-i686.egg', - '/var/local/src/ztfy/eggs/setuptools-0.6c9-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.zapi-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.interface-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.publisher-3.5.1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.traversing-3.5.0a4-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.component-3.5.1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.security-3.5.2-py2.5-linux-i686.egg', - '/var/local/src/ztfy/eggs/zodbcode-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/ZODB3-3.9.0_dev_r77011-py2.5-linux-i686.egg', - '/var/local/src/ztfy/eggs/zope.schema-3.5.0a1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.publisher-3.5.4-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.pagetemplate-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.location-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.i18n-3.5.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.deprecation-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.deferredimport-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.datetime-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.contenttype-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.configuration-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.publication-3.5.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.pagetemplate-3.4.1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.container-3.6.1-py2.5-linux-i686.egg', - '/var/local/src/ztfy/eggs/zope.app.component-3.5.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.proxy-3.4.2-py2.5-linux-i686.egg', - '/var/local/src/ztfy/eggs/zope.i18nmessageid-3.4.3-py2.5-linux-i686.egg', - '/var/local/src/ztfy/eggs/zope.event-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.exceptions-3.5.2-py2.5.egg', - '/var/local/src/ztfy/eggs/pytz-2008h-py2.5.egg', - '/var/local/src/ztfy/eggs/zdaemon-2.0.2-py2.5.egg', - '/var/local/src/ztfy/eggs/ZConfig-2.6.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.tal-3.5.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.tales-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.security-3.5.2-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.exception-3.4.1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.error-3.5.1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.applicationcontrol-3.4.3-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.http-3.4.1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.error-3.5.1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.size-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.dublincore-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.copypastemove-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.broken-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.filerepresentation-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.lifecycleevent-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.dottedname-3.4.2-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.cachedescriptors-3.4.1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.thread-3.4-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.formlib-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.annotation-3.4.1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.form-3.6.3-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.authentication-3.4.3-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.appsetup-3.8.0-py2.5.egg', - '/var/local/src/ztfy/eggs/RestrictedPython-3.4.2-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.testing-3.5.6-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.hookable-3.4.0-py2.5-linux-i686.egg', - '/var/local/src/ztfy/eggs/zope.app.principalannotation-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.zcmlfiles-3.4.3-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.basicskin-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.session-3.5.1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.folder-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.dependable-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.debug-3.4.1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.schema-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.wsgi-3.4.1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.rotterdam-3.4.1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.zopeappgenerations-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.locales-3.4.5-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.i18n-3.4.4-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.generations-3.4.1-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.content-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.modulealias-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.session-3.7.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.minmax-1.1.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.app.renderer-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/zope.structuredtext-3.4.0-py2.5.egg', - '/var/local/src/ztfy/eggs/docutils-0.5-py2.5.egg', + '/var/local/ztfy/ztfy.utils', + '/var/local/ztfy/eggs/zope.testing-3.5.6-py2.4.egg', + '/var/local/ztfy/eggs/setuptools-0.6c9-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.zapi-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.interface-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.publisher-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.traversing-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.component-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.interface-3.4.1-py2.4-linux-i686.egg', + '/var/local/ztfy/eggs/zope.security-3.4.1-py2.4-linux-i686.egg', + '/var/local/ztfy/eggs/zodbcode-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/ZODB3-3.8.1-py2.4-linux-i686.egg', + '/var/local/ztfy/eggs/zope.schema-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.publisher-3.4.6-py2.4.egg', + '/var/local/ztfy/eggs/zope.pagetemplate-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.location-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.i18n-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.deprecation-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.deferredimport-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.datetime-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.contenttype-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.configuration-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.publication-3.4.3-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.pagetemplate-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.container-3.5.6-py2.4-linux-i686.egg', + '/var/local/ztfy/eggs/zope.app.component-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.proxy-3.4.2-py2.4-linux-i686.egg', + '/var/local/ztfy/eggs/zope.i18nmessageid-3.4.3-py2.4-linux-i686.egg', + '/var/local/ztfy/eggs/zope.app.applicationcontrol-3.4.3-py2.4.egg', + '/var/local/ztfy/eggs/zope.event-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.exceptions-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/pytz-2007k-py2.4.egg', + '/var/local/ztfy/eggs/zdaemon-2.0.2-py2.4.egg', + '/var/local/ztfy/eggs/ZConfig-2.5.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.testing-3.4.3-py2.4.egg', + '/var/local/ztfy/eggs/zope.tal-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.tales-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.security-3.5.2-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.exception-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.error-3.5.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.http-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.error-3.5.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.size-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.dublincore-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.copypastemove-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.broken-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.filerepresentation-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.lifecycleevent-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.dottedname-3.4.2-py2.4.egg', + '/var/local/ztfy/eggs/zope.cachedescriptors-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.thread-3.4-py2.4.egg', + '/var/local/ztfy/eggs/zope.formlib-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.annotation-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.folder-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.dependable-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.debug-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.authentication-3.4.4-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.form-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.appsetup-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/RestrictedPython-3.4.2-py2.4.egg', + '/var/local/ztfy/eggs/zope.hookable-3.4.0-py2.4-linux-i686.egg', + '/var/local/ztfy/eggs/zope.app.principalannotation-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.zcmlfiles-3.4.3-py2.4.egg', + '/var/local/ztfy/eggs/zope.session-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.basicskin-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.schema-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.wsgi-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.rotterdam-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.zopeappgenerations-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.locales-3.4.5-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.i18n-3.4.4-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.generations-3.4.1-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.content-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.modulealias-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.minmax-1.1.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.app.renderer-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/zope.structuredtext-3.4.0-py2.4.egg', + '/var/local/ztfy/eggs/docutils-0.4-py2.4.egg', ] import os sys.argv[0] = os.path.abspath(sys.argv[0]) -os.chdir('/var/local/src/ztfy/ztfy.utils/parts/test') +os.chdir('/var/local/ztfy/ztfy.utils/parts/test') import zope.testing.testrunner if __name__ == '__main__': zope.testing.testrunner.run([ - '--test-path', '/var/local/src/ztfy/ztfy.utils', + '--test-path', '/var/local/ztfy/ztfy.utils', ]) diff -r 312df6e5dff6 -r 974354a28adc buildout.cfg --- a/buildout.cfg Tue Feb 17 21:52:58 2009 +0100 +++ b/buildout.cfg Tue Aug 11 23:24:45 2009 +0200 @@ -3,7 +3,7 @@ parts = package test find-links = http://download.zope.org/distribution/ newest = false -eggs-directory = /var/local/src/ztfy/eggs +eggs-directory = /var/local/ztfy/eggs [package] recipe = zc.recipe.egg diff -r 312df6e5dff6 -r 974354a28adc ztfy.utils.egg-info/SOURCES.txt --- a/ztfy.utils.egg-info/SOURCES.txt Tue Feb 17 21:52:58 2009 +0100 +++ b/ztfy.utils.egg-info/SOURCES.txt Tue Aug 11 23:24:45 2009 +0200 @@ -23,4 +23,4 @@ ztfy/utils/doctests/README.txt ztfy/utils/tests/__init__.py ztfy/utils/tests/test_utilsdocs.py -ztfy/utils/tests/test_utilsdocstrings.py +ztfy/utils/tests/test_utilsdocstrings.py \ No newline at end of file diff -r 312df6e5dff6 -r 974354a28adc ztfy/utils/security.py --- a/ztfy/utils/security.py Tue Feb 17 21:52:58 2009 +0100 +++ b/ztfy/utils/security.py Tue Aug 11 23:24:45 2009 +0200 @@ -30,11 +30,11 @@ if isinstance(value, list): result = [] for v in value: - result.append(removeSecurityProxy(v)) + result.append(unproxied(v)) elif isinstance(value, dict): result = value.copy() for v in value: - result[v] = removeSecurityProxy(value[v]) + result[v] = unproxied(value[v]) else: result = removeSecurityProxy(value) return result