Merge lp:~stefanor/beautifulsoup/python3.4 into lp:beautifulsoup

[Stefano Rivera]

Handle the new warnings in Python 3.4, that cause LP: #1375721.

This fixes the bug.

=== modified file 'bs4/builder/_htmlparser.py'
--- bs4/builder/_htmlparser.py	2013-10-02 01:55:22 +0000
+++ bs4/builder/_htmlparser.py	2014-10-17 01:55:41 +0000
@@ -19,10 +19,8 @@
 # At the end of this file, we monkeypatch HTMLParser so that
 # strict=True works well on Python 3.2.2.
 major, minor, release = sys.version_info[:3]
-CONSTRUCTOR_TAKES_STRICT = (
-    major > 3
-    or (major == 3 and minor > 2)
-    or (major == 3 and minor == 2 and release >= 3))
+CONSTRUCTOR_TAKES_STRICT = major == 3 and minor == 2 and release >= 3
+CONSTRUCTOR_TAKES_CONVERT_CHARREFS = major == 3 and minor >= 4
 
 from bs4.element import (
     CData,
@@ -63,7 +61,7 @@
 
     def handle_charref(self, name):
         # XXX workaround for a bug in HTMLParser. Remove this once
-        # it's fixed.
+        # it's fixed. http://bugs.python.org/issue13633
         if name.startswith('x'):
             real_name = int(name.lstrip('x'), 16)
         elif name.startswith('X'):
@@ -133,6 +131,8 @@
     def __init__(self, *args, **kwargs):
         if CONSTRUCTOR_TAKES_STRICT:
             kwargs['strict'] = False
+        if CONSTRUCTOR_TAKES_CONVERT_CHARREFS:
+            kwargs['convert_charrefs'] = False
         self.parser_args = (args, kwargs)
 
     def prepare_markup(self, markup, user_specified_encoding=None,