[Erp5-report] r41726 jm - in /erp5/trunk/products/PortalTransforms: ./ libtransforms/ tests...

[nobody at svn.erp5.org]

Author: jm
Date: Thu Dec 23 17:37:57 2010
New Revision: 41726

URL: http://svn.erp5.org?rev=41726&view=rev
Log:
PortalTransforms: merge upstream 2.0

This fixes test_20_reStructuredText partially.

Conflicts:
	Products/PortalTransforms/TransformEngine.py
	Products/PortalTransforms/libtransforms/commandtransform.py
	Products/PortalTransforms/transforms/safe_html.py
	Products/PortalTransforms/utils.py

Modified:
    erp5/trunk/products/PortalTransforms/TransformEngine.py
    erp5/trunk/products/PortalTransforms/cache.py
    erp5/trunk/products/PortalTransforms/libtransforms/commandtransform.py
    erp5/trunk/products/PortalTransforms/libtransforms/utils.py
    erp5/trunk/products/PortalTransforms/tests/input/markdown.txt
    erp5/trunk/products/PortalTransforms/tests/input/test_safehtml.html
    erp5/trunk/products/PortalTransforms/tests/output/demo1.html
    erp5/trunk/products/PortalTransforms/tests/output/demo1.html.nofilename
    erp5/trunk/products/PortalTransforms/tests/output/markdown.html
    erp5/trunk/products/PortalTransforms/tests/output/rest2.out
    erp5/trunk/products/PortalTransforms/tests/output/rest3.out
    erp5/trunk/products/PortalTransforms/tests/output/test_safe.html
    erp5/trunk/products/PortalTransforms/tests/test_engine.py
    erp5/trunk/products/PortalTransforms/tests/test_graph.py
    erp5/trunk/products/PortalTransforms/tests/test_transforms.py
    erp5/trunk/products/PortalTransforms/tests/utils.py
    erp5/trunk/products/PortalTransforms/transforms/markdown_to_html.py
    erp5/trunk/products/PortalTransforms/transforms/office_wvware.py
    erp5/trunk/products/PortalTransforms/transforms/safe_html.py
    erp5/trunk/products/PortalTransforms/transforms/word_to_html.py
    erp5/trunk/products/PortalTransforms/unsafe_transforms/build_transforms.py
    erp5/trunk/products/PortalTransforms/utils.py

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: erp5/trunk/products/PortalTransforms/TransformEngine.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/TransformEngine.py?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/cache.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/cache.py?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/libtransforms/commandtransform.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/libtransforms/commandtransform.py?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/libtransforms/utils.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/libtransforms/utils.py?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/tests/input/markdown.txt
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/tests/input/markdown.txt?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/tests/input/test_safehtml.html
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/tests/input/test_safehtml.html?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/tests/output/demo1.html
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/tests/output/demo1.html?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/tests/output/demo1.html.nofilename
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/tests/output/demo1.html.nofilename?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/tests/output/markdown.html
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/tests/output/markdown.html?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/tests/output/rest2.out
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/tests/output/rest2.out?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/tests/output/rest3.out
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/tests/output/rest3.out?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/tests/output/test_safe.html
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/tests/output/test_safe.html?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/tests/test_engine.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/tests/test_engine.py?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/tests/test_graph.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/tests/test_graph.py?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/tests/test_transforms.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/tests/test_transforms.py?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/tests/utils.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/tests/utils.py?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/transforms/markdown_to_html.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/transforms/markdown_to_html.py?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/transforms/office_wvware.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/transforms/office_wvware.py?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/transforms/safe_html.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/transforms/safe_html.py?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/transforms/word_to_html.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/transforms/word_to_html.py?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/unsafe_transforms/build_transforms.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/unsafe_transforms/build_transforms.py?rev=41726&r1=41725&r2=41726&view=diff

Modified: erp5/trunk/products/PortalTransforms/utils.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/utils.py?rev=41726&r1=41725&r2=41726&view=diff