Thu Oct 11 15:35:09 2012 UTC ()
Update to 1.0.5
Based on PR #46593 submitted by Wen Heping(myself)

Upstream changes:
v1.0.5 - 2012-09-03
made automatic protocol links more strict: Only whitespace before and at the end are allowed.
Bugfix: Don't allow ftp:/broken (Only one slash) to be a link.

v1.0.4
html2rest: Handle double link/image substitution and raise better error messages
Bugfix in unittests (include test README file in python package). Thanks to Wen Heping for reporting this.

v1.0.3
Bugfix: AttributeError: 'module' object has no attribute 'interesting_cdata' from HTMLParser patch. Thanks to Wen Heping for reporting this.
Fix a bug in get_long_description() ReSt test for Py3k and his unittests.
Use Travis CI, too.

v1.0.2
Fix "AttributeError: 'NoneType' object has no attribute 'parent'" in html2creole.

v1.0.1
Fix "TypeError: expected string or buffer" in rest2html.
Bugfix in exception handling.

v1.0.0
Change API: Replace 'parser_kwargs' and 'emitter_kwargs' with separate arguments. (More information on API Wiki Page)

v0.9.2
Turn zip_safe in setup.py on and change unittests API.

v0.9.1
Many Bugfixes, tested with CPython 2.6, 2.7, 3.2 and PyPy v1.6

v0.9.0
Add Python v3 support (like http://python3porting.com/noconv.html strategy)
move unittests into creole/tests/
Tested with Python 2.7.1, 3.2 and PyPy v1.6.1 15798ab8cf48 jit

v0.8.5
Bugfix in html2creole: ignore links without href

v0.8.4
Bugfix in html parser if list tag has attributes: https://code.google.com/p/python-creole/issues/detail?id=19#c4

v0.8.3
Better error message if given string is not unicode: https://code.google.com/p/python-creole/issues/detail?id=19

v0.8.2
Bugfix in get_long_description() error handling (local variable 'long_description_origin' referenced before assignment)

v0.8.1
Bugfix for installation under python 2.5
Note: setup helper changed: rename GetLongDescription(...) to get_long_description(...)

v0.8
New GetLongDescription() helper for setup.py, see: https://code.google.com/p/python-creole/wiki/UseInSetup

v0.7.3
Bugfix in html2rest:
table without <th> header
new line after table
create reference hyperlinks in table cells intead of embedded urls.
Don't always use raise_unknown_node()
Add child content to raise_unknown_node()

v0.7.2
Activate ---- to <hr> in html2rest
Update demo.py

v0.7.1
Bugfix if docutils are not installed
API change: rest2html is now here: from creole.rest2html.clean_writer import rest2html

v0.7.0
NEW: Add a html2reStructuredText converter (only a subset of reSt supported)

v0.6.1
Bugfix: separate lines with one space in "wiki style line breaks" mode

v0.6
NEW: html2textile converter
some API changed!

v0.5
API changed:
Html2CreoleEmitter optional argument 'unknown_emit' takes now a callable for handle unknown html tags.
No macros used as default in creole2html converting.
We remove the support for callable macros. Only dict and modules are allowed.
remove unknown html tags is default behaviour in html2creole converting.

restructure and cleanup sourcecode files.

v0.4
only emit children of empty tags like div and span (contributed by Eric O'Connell)
remove inter wiki links and doesn't check the protocol

v0.3.3
Use  when {{{ ... }}} is inline and not <pre>, see: PyLucid Forum Thread
Bugfix in html2creole: insert newline before new list. TODO: apply to all block tags: issues 16

v0.3.2
Bugfix for spaces after Headline: issues 15

v0.3.1
Make argument 'block_rules' in Parser() optional

v0.3.0
creole2html() has the optional parameter 'blog_line_breaks' to switch from default blog to wiki line breaks

v0.2.8
bugfix in setup.py

v0.2.7
handle obsolete non-closed <br> tag

v0.2.6
bugfix in setup.py
Cleanup DocStrings
add unittests


(wen)
diff -r1.4 -r1.5 pkgsrc/textproc/py-creole/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/textproc/py-creole/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/textproc/py-creole/distinfo
diff -r0 -r1.1 pkgsrc/textproc/py-creole/patches/patch-setup.py
cvs diff -r1.4 -r1.5 pkgsrc/textproc/py-creole/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-creole/Makefile 2012/10/04 00:22:01 1.4
+++ pkgsrc/textproc/py-creole/Makefile 2012/10/11 15:35:09 1.5
@@ -1,25 +1,57 @@ @@ -1,25 +1,57 @@
1# $NetBSD: Makefile,v 1.4 2012/10/04 00:22:01 cheusov Exp $ 1# $NetBSD: Makefile,v 1.5 2012/10/11 15:35:09 wen Exp $
2# 2#
3 3
4VERS= 0.2.5 4VERS= 1.0.5
5DISTNAME= python-creole-${VERS} 5DISTNAME= python-creole-${VERS}
6PKGNAME= ${PYPKGPREFIX}-creole-${VERS} 6PKGNAME= ${PYPKGPREFIX}-creole-${VERS}
7PKGREVISION= 1 
8EGG_NAME= python_creole-${VERS} 7EGG_NAME= python_creole-${VERS}
9CATEGORIES= textproc www python 8CATEGORIES= textproc www python
10MASTER_SITES= http://pypi.python.org/packages/source/p/python-creole/ 9MASTER_SITES= http://pypi.python.org/packages/source/p/python-creole/
11 10
12MAINTAINER= joerg@NetBSD.org 11MAINTAINER= joerg@NetBSD.org
13HOMEPAGE= http://code.google.com/p/python-creole/ 12HOMEPAGE= http://code.google.com/p/python-creole/
14COMMENT= Creole <-> HTML converter 13COMMENT= Creole <-> HTML converter
15 14
16LICENSE= gnu-gpl-v3 15LICENSE= gnu-gpl-v3
17 16
18PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
19 18
 19DEPENDS+= ${PYPKGPREFIX}-docutils>=0:../../textproc/py-docutils
 20DEPENDS+= ${PYPKGPREFIX}-textile>=0:../../textproc/py-textile
 21
20USE_LANGUAGES= #none 22USE_LANGUAGES= #none
21 23
 24SUBST_CLASSES+= env
 25SUBST_SED.env= -e "s,\#! */usr/bin/env *python[0-9.]*,\#!${PYTHONBIN},"
 26SUBST_MESSAGE.env= Fixing path to python.
 27SUBST_STAGE.env= post-patch
 28SUBST_FILES.env= creole/exceptions.py
 29SUBST_FILES.env+= creole/html2creole/emitter.py
 30SUBST_FILES.env+= creole/html2rest/emitter.py
 31SUBST_FILES.env+= creole/html2textile/emitter.py
 32SUBST_FILES.env+= creole/html_parser/parser.py
 33SUBST_FILES.env+= creole/html_tools/deentity.py
 34SUBST_FILES.env+= creole/html_tools/strip_html.py
 35SUBST_FILES.env+= creole/html_tools/text_tools.py
 36SUBST_FILES.env+= creole/rest2html/clean_writer.py
 37SUBST_FILES.env+= creole/shared/base_emitter.py
 38SUBST_FILES.env+= creole/shared/document_tree.py
 39SUBST_FILES.env+= creole/shared/unknown_tags.py
 40SUBST_FILES.env+= creole/tests/__init__.py
 41SUBST_FILES.env+= creole/tests/all_tests.py
 42SUBST_FILES.env+= creole/tests/test_creole2html.py
 43SUBST_FILES.env+= creole/tests/test_cross_compare_all.py
 44SUBST_FILES.env+= creole/tests/test_cross_compare_creole.py
 45SUBST_FILES.env+= creole/tests/test_cross_compare_rest.py
 46SUBST_FILES.env+= creole/tests/test_cross_compare_textile.py
 47SUBST_FILES.env+= creole/tests/test_html2creole.py
 48SUBST_FILES.env+= creole/tests/test_html2rest.py
 49SUBST_FILES.env+= creole/tests/test_html2textile.py
 50SUBST_FILES.env+= creole/tests/test_rest2html.py
 51SUBST_FILES.env+= creole/tests/test_setup_utils.py
 52SUBST_FILES.env+= creole/tests/test_utils.py
 53
22PYTHON_SELF_CONFLICT= yes 54PYTHON_SELF_CONFLICT= yes
23 55
24.include "../../lang/python/egg.mk" 56.include "../../lang/python/egg.mk"
25.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/textproc/py-creole/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/py-creole/PLIST 2010/02/11 13:01:54 1.1.1.1
+++ pkgsrc/textproc/py-creole/PLIST 2012/10/11 15:35:09 1.2
@@ -1,45 +1,158 @@ @@ -1,45 +1,158 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/11 13:01:54 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.2 2012/10/11 15:35:09 wen Exp $
2${PYSITELIB}/creole/__init__.py 2${PYSITELIB}/creole/__init__.py
3${PYSITELIB}/creole/__init__.pyc 3${PYSITELIB}/creole/__init__.pyc
4${PYSITELIB}/creole/__init__.pyo 4${PYSITELIB}/creole/__init__.pyo
5${PYSITELIB}/creole/creole2html.py 5${PYSITELIB}/creole/creole2html/__init__.py
6${PYSITELIB}/creole/creole2html.pyc 6${PYSITELIB}/creole/creole2html/__init__.pyc
7${PYSITELIB}/creole/creole2html.pyo 7${PYSITELIB}/creole/creole2html/__init__.pyo
8${PYSITELIB}/creole/creole_parser.py 8${PYSITELIB}/creole/creole2html/emitter.py
9${PYSITELIB}/creole/creole_parser.pyc 9${PYSITELIB}/creole/creole2html/emitter.pyc
10${PYSITELIB}/creole/creole_parser.pyo 10${PYSITELIB}/creole/creole2html/emitter.pyo
11${PYSITELIB}/creole/default_macros.py 11${PYSITELIB}/creole/creole2html/parser.py
12${PYSITELIB}/creole/default_macros.pyc 12${PYSITELIB}/creole/creole2html/parser.pyc
13${PYSITELIB}/creole/default_macros.pyo 13${PYSITELIB}/creole/creole2html/parser.pyo
14${PYSITELIB}/creole/html2creole.py 14${PYSITELIB}/creole/creole2html/rules.py
15${PYSITELIB}/creole/html2creole.pyc 15${PYSITELIB}/creole/creole2html/rules.pyc
16${PYSITELIB}/creole/html2creole.pyo 16${PYSITELIB}/creole/creole2html/rules.pyo
 17${PYSITELIB}/creole/exceptions.py
 18${PYSITELIB}/creole/exceptions.pyc
 19${PYSITELIB}/creole/exceptions.pyo
 20${PYSITELIB}/creole/html2creole/__init__.py
 21${PYSITELIB}/creole/html2creole/__init__.pyc
 22${PYSITELIB}/creole/html2creole/__init__.pyo
 23${PYSITELIB}/creole/html2creole/emitter.py
 24${PYSITELIB}/creole/html2creole/emitter.pyc
 25${PYSITELIB}/creole/html2creole/emitter.pyo
 26${PYSITELIB}/creole/html2rest/__init__.py
 27${PYSITELIB}/creole/html2rest/__init__.pyc
 28${PYSITELIB}/creole/html2rest/__init__.pyo
 29${PYSITELIB}/creole/html2rest/emitter.py
 30${PYSITELIB}/creole/html2rest/emitter.pyc
 31${PYSITELIB}/creole/html2rest/emitter.pyo
 32${PYSITELIB}/creole/html2textile/__init__.py
 33${PYSITELIB}/creole/html2textile/__init__.pyc
 34${PYSITELIB}/creole/html2textile/__init__.pyo
 35${PYSITELIB}/creole/html2textile/emitter.py
 36${PYSITELIB}/creole/html2textile/emitter.pyc
 37${PYSITELIB}/creole/html2textile/emitter.pyo
 38${PYSITELIB}/creole/html_parser/__init__.py
 39${PYSITELIB}/creole/html_parser/__init__.pyc
 40${PYSITELIB}/creole/html_parser/__init__.pyo
 41${PYSITELIB}/creole/html_parser/config.py
 42${PYSITELIB}/creole/html_parser/config.pyc
 43${PYSITELIB}/creole/html_parser/config.pyo
 44${PYSITELIB}/creole/html_parser/parser.py
 45${PYSITELIB}/creole/html_parser/parser.pyc
 46${PYSITELIB}/creole/html_parser/parser.pyo
 47${PYSITELIB}/creole/html_tools/__init__.py
 48${PYSITELIB}/creole/html_tools/__init__.pyc
 49${PYSITELIB}/creole/html_tools/__init__.pyo
 50${PYSITELIB}/creole/html_tools/deentity.py
 51${PYSITELIB}/creole/html_tools/deentity.pyc
 52${PYSITELIB}/creole/html_tools/deentity.pyo
 53${PYSITELIB}/creole/html_tools/strip_html.py
 54${PYSITELIB}/creole/html_tools/strip_html.pyc
 55${PYSITELIB}/creole/html_tools/strip_html.pyo
 56${PYSITELIB}/creole/html_tools/text_tools.py
 57${PYSITELIB}/creole/html_tools/text_tools.pyc
 58${PYSITELIB}/creole/html_tools/text_tools.pyo
 59${PYSITELIB}/creole/py3compat.py
 60${PYSITELIB}/creole/py3compat.pyc
 61${PYSITELIB}/creole/py3compat.pyo
 62${PYSITELIB}/creole/rest2html/__init__.py
 63${PYSITELIB}/creole/rest2html/__init__.pyc
 64${PYSITELIB}/creole/rest2html/__init__.pyo
 65${PYSITELIB}/creole/rest2html/clean_writer.py
 66${PYSITELIB}/creole/rest2html/clean_writer.pyc
 67${PYSITELIB}/creole/rest2html/clean_writer.pyo
 68${PYSITELIB}/creole/setup_utils.py
 69${PYSITELIB}/creole/setup_utils.pyc
 70${PYSITELIB}/creole/setup_utils.pyo
 71${PYSITELIB}/creole/shared/HTMLParsercompat.py
 72${PYSITELIB}/creole/shared/HTMLParsercompat.pyc
 73${PYSITELIB}/creole/shared/HTMLParsercompat.pyo
 74${PYSITELIB}/creole/shared/__init__.py
 75${PYSITELIB}/creole/shared/__init__.pyc
 76${PYSITELIB}/creole/shared/__init__.pyo
 77${PYSITELIB}/creole/shared/base_emitter.py
 78${PYSITELIB}/creole/shared/base_emitter.pyc
 79${PYSITELIB}/creole/shared/base_emitter.pyo
 80${PYSITELIB}/creole/shared/document_tree.py
 81${PYSITELIB}/creole/shared/document_tree.pyc
 82${PYSITELIB}/creole/shared/document_tree.pyo
 83${PYSITELIB}/creole/shared/example_macros.py
 84${PYSITELIB}/creole/shared/example_macros.pyc
 85${PYSITELIB}/creole/shared/example_macros.pyo
 86${PYSITELIB}/creole/shared/html_parser.py
 87${PYSITELIB}/creole/shared/html_parser.pyc
 88${PYSITELIB}/creole/shared/html_parser.pyo
 89${PYSITELIB}/creole/shared/markup_table.py
 90${PYSITELIB}/creole/shared/markup_table.pyc
 91${PYSITELIB}/creole/shared/markup_table.pyo
 92${PYSITELIB}/creole/shared/unknown_tags.py
 93${PYSITELIB}/creole/shared/unknown_tags.pyc
 94${PYSITELIB}/creole/shared/unknown_tags.pyo
 95${PYSITELIB}/creole/shared/utils.py
 96${PYSITELIB}/creole/shared/utils.pyc
 97${PYSITELIB}/creole/shared/utils.pyo
 98${PYSITELIB}/creole/tests/__init__.py
 99${PYSITELIB}/creole/tests/__init__.pyc
 100${PYSITELIB}/creole/tests/__init__.pyo
 101${PYSITELIB}/creole/tests/all_tests.py
 102${PYSITELIB}/creole/tests/all_tests.pyc
 103${PYSITELIB}/creole/tests/all_tests.pyo
 104${PYSITELIB}/creole/tests/test_README.creole
 105${PYSITELIB}/creole/tests/test_TODOs.py
 106${PYSITELIB}/creole/tests/test_TODOs.pyc
 107${PYSITELIB}/creole/tests/test_TODOs.pyo
 108${PYSITELIB}/creole/tests/test_creole2html.py
 109${PYSITELIB}/creole/tests/test_creole2html.pyc
 110${PYSITELIB}/creole/tests/test_creole2html.pyo
 111${PYSITELIB}/creole/tests/test_cross_compare_all.py
 112${PYSITELIB}/creole/tests/test_cross_compare_all.pyc
 113${PYSITELIB}/creole/tests/test_cross_compare_all.pyo
 114${PYSITELIB}/creole/tests/test_cross_compare_creole.py
 115${PYSITELIB}/creole/tests/test_cross_compare_creole.pyc
 116${PYSITELIB}/creole/tests/test_cross_compare_creole.pyo
 117${PYSITELIB}/creole/tests/test_cross_compare_rest.py
 118${PYSITELIB}/creole/tests/test_cross_compare_rest.pyc
 119${PYSITELIB}/creole/tests/test_cross_compare_rest.pyo
 120${PYSITELIB}/creole/tests/test_cross_compare_textile.py
 121${PYSITELIB}/creole/tests/test_cross_compare_textile.pyc
 122${PYSITELIB}/creole/tests/test_cross_compare_textile.pyo
 123${PYSITELIB}/creole/tests/test_html2creole.py
 124${PYSITELIB}/creole/tests/test_html2creole.pyc
 125${PYSITELIB}/creole/tests/test_html2creole.pyo
 126${PYSITELIB}/creole/tests/test_html2rest.py
 127${PYSITELIB}/creole/tests/test_html2rest.pyc
 128${PYSITELIB}/creole/tests/test_html2rest.pyo
 129${PYSITELIB}/creole/tests/test_html2textile.py
 130${PYSITELIB}/creole/tests/test_html2textile.pyc
 131${PYSITELIB}/creole/tests/test_html2textile.pyo
 132${PYSITELIB}/creole/tests/test_macros.py
 133${PYSITELIB}/creole/tests/test_macros.pyc
 134${PYSITELIB}/creole/tests/test_macros.pyo
 135${PYSITELIB}/creole/tests/test_rest2html.py
 136${PYSITELIB}/creole/tests/test_rest2html.pyc
 137${PYSITELIB}/creole/tests/test_rest2html.pyo
 138${PYSITELIB}/creole/tests/test_setup_utils.py
 139${PYSITELIB}/creole/tests/test_setup_utils.pyc
 140${PYSITELIB}/creole/tests/test_setup_utils.pyo
 141${PYSITELIB}/creole/tests/test_utils.py
 142${PYSITELIB}/creole/tests/test_utils.pyc
 143${PYSITELIB}/creole/tests/test_utils.pyo
 144${PYSITELIB}/creole/tests/utils/__init__.py
 145${PYSITELIB}/creole/tests/utils/__init__.pyc
 146${PYSITELIB}/creole/tests/utils/__init__.pyo
 147${PYSITELIB}/creole/tests/utils/base_unittest.py
 148${PYSITELIB}/creole/tests/utils/base_unittest.pyc
 149${PYSITELIB}/creole/tests/utils/base_unittest.pyo
 150${PYSITELIB}/creole/tests/utils/utils.py
 151${PYSITELIB}/creole/tests/utils/utils.pyc
 152${PYSITELIB}/creole/tests/utils/utils.pyo
17${PYSITELIB}/${EGG_INFODIR}/PKG-INFO 153${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
18${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt 154${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
19${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt 155${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
20${PYSITELIB}/${EGG_INFODIR}/top_level.txt 156${PYSITELIB}/${EGG_INFODIR}/top_level.txt
21${PYSITELIB}/${EGG_INFODIR}/zip-safe 157${PYSITELIB}/${EGG_INFODIR}/zip-safe
22${PYSITELIB}/tests/__init__.py 158share/doc/py-creole/README.creole
23${PYSITELIB}/tests/__init__.pyc 
24${PYSITELIB}/tests/__init__.pyo 
25${PYSITELIB}/tests/run_all_tests.py 
26${PYSITELIB}/tests/run_all_tests.pyc 
27${PYSITELIB}/tests/run_all_tests.pyo 
28${PYSITELIB}/tests/test_creole2html.py 
29${PYSITELIB}/tests/test_creole2html.pyc 
30${PYSITELIB}/tests/test_creole2html.pyo 
31${PYSITELIB}/tests/test_cross_compare.py 
32${PYSITELIB}/tests/test_cross_compare.pyc 
33${PYSITELIB}/tests/test_cross_compare.pyo 
34${PYSITELIB}/tests/test_html2creole.py 
35${PYSITELIB}/tests/test_html2creole.pyc 
36${PYSITELIB}/tests/test_html2creole.pyo 
37${PYSITELIB}/tests/utils/__init__.py 
38${PYSITELIB}/tests/utils/__init__.pyc 
39${PYSITELIB}/tests/utils/__init__.pyo 
40${PYSITELIB}/tests/utils/base_unittest.py 
41${PYSITELIB}/tests/utils/base_unittest.pyc 
42${PYSITELIB}/tests/utils/base_unittest.pyo 
43${PYSITELIB}/tests/utils/utils.py 
44${PYSITELIB}/tests/utils/utils.pyc 
45${PYSITELIB}/tests/utils/utils.pyo 
cvs diff -r1.1.1.1 -r1.2 pkgsrc/textproc/py-creole/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/py-creole/distinfo 2010/02/11 13:01:54 1.1.1.1
+++ pkgsrc/textproc/py-creole/distinfo 2012/10/11 15:35:09 1.2
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.1.1.1 2010/02/11 13:01:54 joerg Exp $ 1$NetBSD: distinfo,v 1.2 2012/10/11 15:35:09 wen Exp $
2 2
3SHA1 (python-creole-0.2.5.tar.gz) = cdc05b235a1ec66153b4078b7cbfea2efebfa248 3SHA1 (python-creole-1.0.5.tar.gz) = fabef2732acdca81704f16f29222006d8b9e95a3
4RMD160 (python-creole-0.2.5.tar.gz) = 05f5e579a5b886402bd832ed64b3b66b5536641d 4RMD160 (python-creole-1.0.5.tar.gz) = c7079a6f46e2e726058944f12b204d9b174f32df
5Size (python-creole-0.2.5.tar.gz) = 31024 bytes 5Size (python-creole-1.0.5.tar.gz) = 66232 bytes
 6SHA1 (patch-setup.py) = 87fedc68753bd108c6c87b0ce6d5187e3627371b
File Added: pkgsrc/textproc/py-creole/patches/Attic/patch-setup.py
$NetBSD: patch-setup.py,v 1.1 2012/10/11 15:35:09 wen Exp $

Install README.creole into right directory.

--- setup.py.orig	2012-10-11 06:13:34.000000000 +0000
+++ setup.py
@@ -44,7 +44,7 @@ setup(
     url='http://code.google.com/p/python-creole/',
     packages=find_packages(),
     include_package_data=True, # include package data under svn source control
-    data_files=[("", ["README.creole"])], # README used in unittest test_setup_utils.py
+    data_files=[("share/doc/py-creole", ["README.creole"])], # README used in unittest test_setup_utils.py
     zip_safe=True, # http://packages.python.org/distribute/setuptools.html#setting-the-zip-safe-flag
     keywords="creole markup creole2html html2creole rest2html html2rest html2textile",
     classifiers=[