Hello community, here is the log from the commit of package python3-html2text for openSUSE:Factory checked in at 2015-06-06 09:54:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-html2text (Old) and /work/SRC/openSUSE:Factory/.python3-html2text.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-html2text" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-html2text/python3-html2text.changes 2015-04-15 16:24:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-html2text.new/python3-html2text.changes 2015-06-06 09:54:37.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Jun 5 15:45:24 UTC 2015 - [email protected] + +- update to version 2015.6.6: + * Fix #24: 3.200.3 vs 2014.7.3 output quirks. + * Fix #61. Malformed links in markdown output. + * Feature #62: Automatic version number. + * Fix #63: Nested code, anchor bug. + * Fix #64: Proper handling of anchors with content that starts with + tags. + * Feature #67: Documentation all over the module. + * Feature #70: Adding tests for the module. + * Fix #73: Typo in config documentation. + +------------------------------------------------------------------- Old: ---- html2text-2015.4.14.tar.gz New: ---- html2text-2015.6.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-html2text.spec ++++++ --- /var/tmp/diff_new_pack.79tFf3/_old 2015-06-06 09:54:38.000000000 +0200 +++ /var/tmp/diff_new_pack.79tFf3/_new 2015-06-06 09:54:38.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-html2text -Version: 2015.4.14 +Version: 2015.6.6 Release: 0 Url: https://github.com/Alir3z4/html2text/ Summary: Turn HTML into equivalent Markdown-structured text ++++++ html2text-2015.4.14.tar.gz -> html2text-2015.6.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/AUTHORS.rst new/html2text-2015.6.6/AUTHORS.rst --- old/html2text-2015.4.14/AUTHORS.rst 2015-04-13 17:48:22.000000000 +0200 +++ new/html2text-2015.6.6/AUTHORS.rst 2015-06-04 17:19:23.000000000 +0200 @@ -14,6 +14,8 @@ * Miguel Tavares <[email protected]> * Scott Blackburn <[email protected]> * Peter Wu <[email protected]> +* Arjoonn Sharma <gh: theSage21> +* Ali Mohammad <gh: alawibaba> Maintainer: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/ChangeLog.rst new/html2text-2015.6.6/ChangeLog.rst --- old/html2text-2015.4.14/ChangeLog.rst 2015-04-14 19:05:05.000000000 +0200 +++ new/html2text-2015.6.6/ChangeLog.rst 2015-06-05 09:37:52.000000000 +0200 @@ -1,3 +1,16 @@ +2015.6.6 +======== + +* Fix #24: ``3.200.3`` vs ``2014.7.3`` output quirks. +* Fix #61. Malformed links in markdown output. +* Feature #62: Automatic version number. +* Fix #63: Nested code, anchor bug. +* Fix #64: Proper handling of anchors with content that starts with tags. +* Feature #67: Documentation all over the module. +* Feature #70: Adding tests for the module. +* Fix #73: Typo in config documentation. + + 2015.4.14 ========= ---- @@ -16,7 +29,7 @@ 2015.2.18 -========== +========= ---- * Fix #38: Anchor tags with empty text or with `<img>` tags inside are no longer stripped. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/PKG-INFO new/html2text-2015.6.6/PKG-INFO --- old/html2text-2015.4.14/PKG-INFO 2015-04-14 19:09:30.000000000 +0200 +++ new/html2text-2015.6.6/PKG-INFO 2015-06-05 09:38:46.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: html2text -Version: 2015.4.14 +Version: 2015.6.6 Summary: Turn HTML into equivalent Markdown-structured text. Home-page: https://github.com/Alir3z4/html2text/ Author: Alireza Savand diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/README.md new/html2text-2015.6.6/README.md --- old/html2text-2015.4.14/README.md 2015-04-14 19:05:05.000000000 +0200 +++ new/html2text-2015.6.6/README.md 2015-06-05 08:58:22.000000000 +0200 @@ -33,6 +33,8 @@ |`--escape-all` | Escape all special characters. Output is less readable, but avoids corner case formatting issues. | `--bypass-tables` | Format tables in HTML rather than Markdown syntax. | `--single-line-break` | Use a single line break after a block element rather than two. +| `--reference-links` | Use reference links instead of links to create markdown + Or you can use it from within `Python`: @@ -83,3 +85,7 @@ ## How to run unit tests PYTHONPATH=$PYTHONPATH:. coverage run --source=html2text setup.py test -v + +## Documentation + +Documentation lives [here](docs/index.md) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/html2text/__init__.py new/html2text-2015.6.6/html2text/__init__.py --- old/html2text-2015.4.14/html2text/__init__.py 2015-04-14 19:09:03.000000000 +0200 +++ new/html2text-2015.6.6/html2text/__init__.py 2015-06-05 09:38:14.000000000 +0200 @@ -29,7 +29,7 @@ skipwrap ) -__version__ = "2015.4.14" +__version__ = (2015, 6, 6) # TODO: @@ -69,6 +69,7 @@ self.emphasis_mark = '_' self.strong_mark = '**' self.single_line_break = config.SINGLE_LINE_BREAK + self.use_automatic_links = config.USE_AUTOMATIC_LINKS if out is None: self.out = self.outtextf @@ -275,6 +276,13 @@ else: attrs = dict(attrs) + # first thing inside the anchor tag is another tag that produces some output + if start and not self.maybe_automatic_link is None and \ + tag not in ['p', 'div', 'style', 'dl', 'dt'] and (tag != "img" or self.ignore_images): + self.o("[") + self.maybe_automatic_link = None + self.empty_link = False + if self.google_doc: # the attrs parameter is empty for a closing tag. in addition, we # need the attributes of the parent nodes in order to get a @@ -555,6 +563,7 @@ self.pre = 0 self.p() + # TODO: Add docstring for these one letter functions def pbr(self): if self.p_p == 0: self.p_p = 1 @@ -677,7 +686,7 @@ if not self.maybe_automatic_link is None: href = self.maybe_automatic_link - if href == data and self.absolute_url_matcher.match(href): + if href == data and self.absolute_url_matcher.match(href) and self.use_automatic_links: self.o("<" + data + ">") self.empty_link = False return @@ -691,6 +700,7 @@ self.o(data, 1) def unknown_decl(self, data): + # TODO: what is this doing here? pass def charref(self, name): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/html2text/cli.py new/html2text-2015.6.6/html2text/cli.py --- old/html2text-2015.4.14/html2text/cli.py 2015-04-14 19:05:05.000000000 +0200 +++ new/html2text-2015.6.6/html2text/cli.py 2015-06-05 09:21:08.000000000 +0200 @@ -8,8 +8,10 @@ def main(): baseurl = '' - p = optparse.OptionParser('%prog [(filename|url) [encoding]]', - version='%prog ' + __version__) + p = optparse.OptionParser( + '%prog [(filename|url) [encoding]]', + version='%prog ' + ".".join(map(str, __version__)) + ) p.add_option( "--ignore-emphasis", dest="ignore_emphasis", @@ -18,6 +20,13 @@ help="don't include any formatting for emphasis" ) p.add_option( + "--reference-links", + dest="inline_links", + action="store_false", + default=config.INLINE_LINKS, + help="use reference style links instead of inline links" + ) + p.add_option( "--ignore-links", dest="ignore_links", action="store_true", @@ -180,5 +189,6 @@ h.escape_snob = options.escape_snob h.bypass_tables = options.bypass_tables h.single_line_break = options.single_line_break + h.inline_links = options.inline_links wrapwrite(h.handle(data)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/html2text/compat.py new/html2text-2015.6.6/html2text/compat.py --- old/html2text-2015.4.14/html2text/compat.py 2014-12-03 14:53:22.000000000 +0100 +++ new/html2text-2015.6.6/html2text/compat.py 2015-06-05 08:58:22.000000000 +0200 @@ -1,11 +1,11 @@ try: + import urllib.parse as urlparse + import html.entities as htmlentitydefs + import html.parser as HTMLParser +except ImportError: # Python2 import htmlentitydefs import urlparse import HTMLParser -except ImportError: # Python3 - import html.entities as htmlentitydefs - import urllib.parse as urlparse - import html.parser as HTMLParser try: # Python3 import urllib.request as urllib except ImportError: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/html2text/config.py new/html2text-2015.6.6/html2text/config.py --- old/html2text-2015.4.14/html2text/config.py 2015-04-14 19:05:05.000000000 +0200 +++ new/html2text-2015.6.6/html2text/config.py 2015-06-04 17:19:23.000000000 +0200 @@ -33,6 +33,9 @@ IMAGES_WITH_SIZE = False IGNORE_EMPHASIS = False +# Convert links with same href and text to <href> format if they are absolute links +USE_AUTOMATIC_LINKS = True + # For checking space-only lines on line 771 RE_SPACE = re.compile(r'\s\+') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/html2text/utils.py new/html2text-2015.6.6/html2text/utils.py --- old/html2text-2015.4.14/html2text/utils.py 2014-12-05 18:59:05.000000000 +0100 +++ new/html2text-2015.6.6/html2text/utils.py 2015-06-04 17:19:23.000000000 +0200 @@ -5,6 +5,7 @@ def name2cp(k): + """Return sname to codepoint""" if k == 'apos': return ord("'") return htmlentitydefs.name2codepoint[k] @@ -32,7 +33,10 @@ """ out = dict([(x.strip(), y.strip()) for x, y in [z.split(':', 1) for z in - style.split(';') if ':' in z]]) + style.split(';') if ':' in z + ] + ] + ) return out diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/html2text.egg-info/PKG-INFO new/html2text-2015.6.6/html2text.egg-info/PKG-INFO --- old/html2text-2015.4.14/html2text.egg-info/PKG-INFO 2015-04-14 19:09:30.000000000 +0200 +++ new/html2text-2015.6.6/html2text.egg-info/PKG-INFO 2015-06-05 09:38:46.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: html2text -Version: 2015.4.14 +Version: 2015.6.6 Summary: Turn HTML into equivalent Markdown-structured text. Home-page: https://github.com/Alir3z4/html2text/ Author: Alireza Savand diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/html2text.egg-info/SOURCES.txt new/html2text-2015.6.6/html2text.egg-info/SOURCES.txt --- old/html2text-2015.4.14/html2text.egg-info/SOURCES.txt 2015-04-14 19:09:30.000000000 +0200 +++ new/html2text-2015.6.6/html2text.egg-info/SOURCES.txt 2015-06-05 09:38:46.000000000 +0200 @@ -21,12 +21,24 @@ test/GoogleDocSaved.html test/GoogleDocSaved.md test/__init__.py +test/abbr_tag.html +test/abbr_tag.md test/anchor-undefined-href.html test/anchor-undefined-href.md +test/anchors.html +test/anchors.md +test/apos_element.html +test/apos_element.md +test/blockquote_example.html +test/blockquote_example.md test/bodywidth_newline.html test/bodywidth_newline.md +test/bold_inside_link.html +test/bold_inside_link.md test/css_import_no_semicolon.html test/css_import_no_semicolon.md +test/dl_tag_example.html +test/dl_tag_example.md test/doc_with_table.html test/doc_with_table.md test/doc_with_table_bypass.html @@ -35,6 +47,10 @@ test/emdash-para.md test/empty-link.html test/empty-link.md +test/header_tags.html +test/header_tags.md +test/horizontal_rule.html +test/horizontal_rule.md test/html-escaping.html test/html-escaping.md test/images_to_alt.html @@ -49,6 +65,12 @@ test/nbsp.md test/nbsp_unicode.html test/nbsp_unicode.md +test/no_inline_links_example.html +test/no_inline_links_example.md +test/no_inline_links_images_to_alt.html +test/no_inline_links_images_to_alt.md +test/no_inline_links_nested.html +test/no_inline_links_nested.md test/normal.html test/normal.md test/normal_escape_snob.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/setup.py new/html2text-2015.6.6/setup.py --- old/html2text-2015.4.14/setup.py 2015-04-14 19:08:44.000000000 +0200 +++ new/html2text-2015.6.6/setup.py 2015-06-05 09:12:13.000000000 +0200 @@ -34,7 +34,7 @@ setup( name="html2text", - version="2015.4.14", + version=".".join(map(str, __import__('html2text').__version__)), description="Turn HTML into equivalent Markdown-structured text.", author="Aaron Swartz", author_email="[email protected]", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/GoogleDocMassDownload.html new/html2text-2015.6.6/test/GoogleDocMassDownload.html --- old/html2text-2015.4.14/test/GoogleDocMassDownload.html 2014-07-12 09:53:40.000000000 +0200 +++ new/html2text-2015.6.6/test/GoogleDocMassDownload.html 2015-06-05 08:58:22.000000000 +0200 @@ -6,7 +6,7 @@ @import url(https://themes.googleusercontent.com/fonts/css?kit=lhDjYqiy3mZ0x6ROQEUoUw);</STYLE> </HEAD> <BODY style="width:468pt;background-color:#ffffff;padding:72pt 72pt 72pt 72pt"> - <H1 style="padding-left:0;padding-right:0;padding-top:24pt;color:#000000;direction:ltr;font-size:24pt;margin:0;font-family:Arial;font-weight:bold;padding-bottom:6pt"> + <H1 style="padding-left:0;padding-right:0;padding-top:24pt;color:#000000;direction:ltr;font-size:24pt;margin:0;font-family:Arial;font-weight:bold;padding-bottom:6pt;text-decoration:underline"> <A name="h.xdvi2xfx4hkq"> </A> <SPAN> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/abbr_tag.html new/html2text-2015.6.6/test/abbr_tag.html --- old/html2text-2015.4.14/test/abbr_tag.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/abbr_tag.html 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1 @@ +<abbr title="Three Letter Acronym">TLA</abbr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/abbr_tag.md new/html2text-2015.6.6/test/abbr_tag.md --- old/html2text-2015.4.14/test/abbr_tag.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/abbr_tag.md 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,4 @@ +TLA + + *[TLA]: Three Letter Acronym + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/anchors.html new/html2text-2015.6.6/test/anchors.html --- old/html2text-2015.4.14/test/anchors.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/anchors.html 2015-06-04 17:19:23.000000000 +0200 @@ -0,0 +1,7 @@ +<h1>Processing hyperlinks</h1> + +<p>Additional hyperlink tests!</p> + +<a href="http://some.link"><b>Bold Link</b></a> +<a href="http://some.link/filename.py"><code>filename.py</code></a> +<a href="http://some.link/magicsources.py">The source code is called <code>magic.py</code></a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/anchors.md new/html2text-2015.6.6/test/anchors.md --- old/html2text-2015.4.14/test/anchors.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/anchors.md 2015-06-04 17:19:23.000000000 +0200 @@ -0,0 +1,8 @@ +# Processing hyperlinks + +Additional hyperlink tests! + +[**Bold Link**](http://some.link) +[`filename.py`](http://some.link/filename.py) [The source code is called +`magic.py`](http://some.link/magicsources.py) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/apos_element.html new/html2text-2015.6.6/test/apos_element.html --- old/html2text-2015.4.14/test/apos_element.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/apos_element.html 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,5 @@ +<html> + <body> + ' + </body> +</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/apos_element.md new/html2text-2015.6.6/test/apos_element.md --- old/html2text-2015.4.14/test/apos_element.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/apos_element.md 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,2 @@ +' + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/blockquote_example.html new/html2text-2015.6.6/test/blockquote_example.html --- old/html2text-2015.4.14/test/blockquote_example.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/blockquote_example.html 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,3 @@ +<blockquote> +The time has come, the Walrus said, to speak of many things. +</blockquote> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/blockquote_example.md new/html2text-2015.6.6/test/blockquote_example.md --- old/html2text-2015.4.14/test/blockquote_example.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/blockquote_example.md 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,2 @@ +> The time has come, the Walrus said, to speak of many things. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/bold_inside_link.html new/html2text-2015.6.6/test/bold_inside_link.html --- old/html2text-2015.4.14/test/bold_inside_link.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/bold_inside_link.html 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,2 @@ +<a href="link.htm"><b>Text</b></a> +<a href='/nothing/'><b>sample</b></a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/bold_inside_link.md new/html2text-2015.6.6/test/bold_inside_link.md --- old/html2text-2015.4.14/test/bold_inside_link.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/bold_inside_link.md 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,2 @@ +[**Text**](link.htm) [**sample**](/nothing/) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/dl_tag_example.html new/html2text-2015.6.6/test/dl_tag_example.html --- old/html2text-2015.4.14/test/dl_tag_example.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/dl_tag_example.html 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,22 @@ +<dl> +<dt>Definition List</dt> +<dd>A list of terms and their definitions/descriptions.</dd> +<dt>Ordered List</dt> +<dd>A numbered list.</dd> +<dt>Unordered List</dt> +<dd>An unnumbered list.</dd> +</dl> + +<h4>Example 2</h4> +<dl> +<dt>Vocals</dt> +<dd>Bruce Dickinson</dd> +<dt>Guitar</dt> +<dd>Adrian Smith</dd> +<dd>Dave Murray</dd> +<dd>Janick Gers</dd> +<dt>Bass</dt> +<dd>Steve Harris</dd> +<dt>Drums</dt> +<dd>Nicko McBrain</dd> +</dl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/dl_tag_example.md new/html2text-2015.6.6/test/dl_tag_example.md --- old/html2text-2015.4.14/test/dl_tag_example.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/dl_tag_example.md 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,27 @@ +Definition List + + A list of terms and their definitions/descriptions. +Ordered List + + A numbered list. +Unordered List + + An unnumbered list. + +#### Example 2 + +Vocals + + Bruce Dickinson +Guitar + + Adrian Smith + Dave Murray + Janick Gers +Bass + + Steve Harris +Drums + + Nicko McBrain + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/header_tags.html new/html2text-2015.6.6/test/header_tags.html --- old/html2text-2015.4.14/test/header_tags.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/header_tags.html 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,17 @@ +<html> + <body> + <h1>H1</h1> + <h2>H1</h2> + <h3>H1</h3> + <h4>H1</h4> + <h5>H1</h5> + <h6>H1</h6> + <h7>H1</h7> + <h8>H1</h8> + <h9>H1</h9> + <h10>H1</h10> + <h11>H1</h11> + <h12>H1</h12> + <h>NO number</h> + </body> +</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/header_tags.md new/html2text-2015.6.6/test/header_tags.md --- old/html2text-2015.4.14/test/header_tags.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/header_tags.md 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,20 @@ +# H1 + +## H1 + +### H1 + +#### H1 + +##### H1 + +###### H1 + +####### H1 + +######## H1 + +######### H1 + +H1 H1 H1 NO number + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/horizontal_rule.html new/html2text-2015.6.6/test/horizontal_rule.html --- old/html2text-2015.4.14/test/horizontal_rule.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/horizontal_rule.html 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,5 @@ +<html> + <body> + <hr> + </body> +</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/horizontal_rule.md new/html2text-2015.6.6/test/horizontal_rule.md --- old/html2text-2015.4.14/test/horizontal_rule.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/horizontal_rule.md 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,2 @@ +* * * + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/no_inline_links_example.html new/html2text-2015.6.6/test/no_inline_links_example.html --- old/html2text-2015.4.14/test/no_inline_links_example.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/no_inline_links_example.html 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1 @@ +<a href='http://google.com'>Googler</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/no_inline_links_example.md new/html2text-2015.6.6/test/no_inline_links_example.md --- old/html2text-2015.4.14/test/no_inline_links_example.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/no_inline_links_example.md 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,4 @@ +[Googler][1] + + [1]: http://google.com + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/no_inline_links_images_to_alt.html new/html2text-2015.6.6/test/no_inline_links_images_to_alt.html --- old/html2text-2015.4.14/test/no_inline_links_images_to_alt.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/no_inline_links_images_to_alt.html 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,7 @@ +<a href="http://example.com"> +<img src="http://example.com/img.png" alt="ALT TEXT" /> +</a> +<br> +<a href="http://example.com"><img src="http://example.com/img.png" alt="ALT TEXT" /></a> +<br> +<a href="http://example.com"><img src="http://example.com/img.png" alt="http://example.com" /></a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/no_inline_links_images_to_alt.md new/html2text-2015.6.6/test/no_inline_links_images_to_alt.md --- old/html2text-2015.4.14/test/no_inline_links_images_to_alt.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/no_inline_links_images_to_alt.md 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,8 @@ +[ ![ALT TEXT][1] ][2] +[![ALT TEXT][1]][2] +[![http://example.com][1]][2] + + [1]: http://example.com/img.png + + [2]: http://example.com + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/no_inline_links_nested.html new/html2text-2015.6.6/test/no_inline_links_nested.html --- old/html2text-2015.4.14/test/no_inline_links_nested.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/no_inline_links_nested.html 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1 @@ +<a href='http://google.com'><a href='/test2/'>this</a>that</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/no_inline_links_nested.md new/html2text-2015.6.6/test/no_inline_links_nested.md --- old/html2text-2015.4.14/test/no_inline_links_nested.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.6/test/no_inline_links_nested.md 2015-06-05 08:58:22.000000000 +0200 @@ -0,0 +1,6 @@ +[[this][1]that][2] + + [1]: /test2/ + + [2]: http://google.com + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.4.14/test/test_html2text.py new/html2text-2015.6.6/test/test_html2text.py --- old/html2text-2015.4.14/test/test_html2text.py 2015-04-14 19:05:05.000000000 +0200 +++ new/html2text-2015.6.6/test/test_html2text.py 2015-06-05 08:58:22.000000000 +0200 @@ -93,7 +93,7 @@ def test_cmd(self): # Because there is no command-line option to control unicode_snob - if not 'unicode_snob' in module_args: + if 'unicode_snob' not in module_args: self.maxDiff = None result, actual = test_command(fn, *cmdline_args) self.assertEqual(result, actual) @@ -123,7 +123,7 @@ cmdline_args.append('--bypass-tables') if base_fn.startswith('bodywidth'): - #module_args['unicode_snob'] = True + # module_args['unicode_snob'] = True module_args['body_width'] = 0 cmdline_args.append('--body-width=0') @@ -145,6 +145,10 @@ module_args['single_line_break'] = True cmdline_args.append('--single-line-break') + if base_fn.startswith('no_inline_links'): + module_args['inline_links'] = False + cmdline_args.append('--reference-links') + return test_mod, test_cmd # Originally from http://stackoverflow.com/questions/32899/\
