Merge lp:~stefanor/ibid/html5lib-524660 into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

[Michael Gorven (mgorven)]

 review approve

review: Approve

[marcog (marco-gallotta)]

Query: exchange 1 usd to zar
ERROR:scripts.ibid-plugin:Exception occured in Currency processor of conversions plugin
Traceback (most recent call last):
  File "/home/marco/ibid/html5lib-524660/scripts/ibid-plugin", line 129, in <module>
    processor.process(event)
  File "./ibid/plugins/__init__.py", line 119, in process
    method(event, *match.groups())
  File "./ibid/plugins/conversions.py", line 368, in exchange
    self._load_currencies()
  File "./ibid/plugins/conversions.py", line 303, in _load_currencies
    etree = get_html_parse_tree('http://www.xe.com/iso4217.php', headers=self.headers, treetype='etree')
  File "./ibid/utils/html.py", line 55, in get_html_parse_tree
    namespaceHTMLElements=False)
TypeError: __init__() got an unexpected keyword argument 'namespaceHTMLElements'

review: Needs Fixing

[lp:~stefanor/ibid/html5lib-524660]

891. By Stefano Rivera on 2010-02-21

Support old html5libs too

[Stefano Rivera (stefanor)]

> TypeError: __init__() got an unexpected keyword argument
> 'namespaceHTMLElements'

Fixed in r891.

[marcog (marco-gallotta)]

review: Approve

[Jonathan Hitchcock (vhata)]

Nice.

review: Approve

=== modified file 'ibid/utils/html.py'
--- ibid/utils/html.py	2010-01-21 14:19:42 +0000
+++ ibid/utils/html.py	2010-02-21 10:14:15 +0000
@@ -2,6 +2,7 @@
 # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
 
 import cgi
+import inspect
 import zlib
 import urllib2
 from gzip import GzipFile
@@ -50,11 +51,14 @@
     if treetype == "beautifulsoup":
         return BeautifulSoup(data, convertEntities=BeautifulSoup.HTML_ENTITIES)
     elif treetype == "etree":
-        treebuilder = treebuilders.getTreeBuilder("etree", ElementTree)
+        kwargs = {'tree': treebuilders.getTreeBuilder('etree', ElementTree)}
+        # http://code.google.com/p/html5lib/issues/detail?id=138
+        if ('namespaceHTMLElements'
+                in inspect.getargspec(HTMLParser.__init__)[0]):
+            kwargs['namespaceHTMLElements'] = False
+        parser = HTMLParser(**kwargs)
     else:
-        treebuilder = treebuilders.getTreeBuilder(treetype)
-
-    parser = HTMLParser(tree=treebuilder)
+        parser = HTMLParser(tree=treebuilders.getTreeBuilder(treetype))
 
     return parser.parse(data, encoding = encoding)