Merge lp:~noskcaj/ubuntu/vivid/beautifulsoup4/merge into lp:ubuntu/vivid/beautifulsoup4

[Jackson Doak]

Merge from debian

[Daniel Holbach (dholbach)]

Looks like it has been uploaded, but not imported yet.

http://changelogs.ubuntu.com/changelogs/pool/main/b/beautifulsoup4/beautifulsoup4_4.3.2-1ubuntu1/changelog
https://code.launchpad.net/~ubuntu-branches/ubuntu/vivid/beautifulsoup4/vivid

review: Approve

Unmerged revisions

16. By Jackson Doak on 2014-10-26

* Merge from debian. Remaining changes:
  - debian/control, debian/rules: Disable pypy-bs4 and Build-Depends on
    pypy since the latter is in universe, while beautifulsoup4 is being
    pulled into main via webtest.
* Patch +python3.4-warnings: Squash new warnings under Python 3.4, fixing
  the test suite, and preparing for Python 3.5. (Closes: #765142)
* Bump Standards-Version to 3.9.6, no changes needed.

=== removed file '.pc/applied-patches'
=== modified file 'debian/changelog'
--- debian/changelog	2014-05-29 19:50:43 +0000
+++ debian/changelog	2014-10-26 03:02:04 +0000
@@ -1,3 +1,20 @@
+beautifulsoup4 (4.3.2-2ubuntu1) vivid; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - debian/control, debian/rules: Disable pypy-bs4 and Build-Depends on
+      pypy since the latter is in universe, while beautifulsoup4 is being
+      pulled into main via webtest.
+
+ -- Jackson Doak <[e-mail]>  Sun, 26 Oct 2014 13:41:16 +1100
+
+beautifulsoup4 (4.3.2-2) unstable; urgency=medium
+
+  * Patch +python3.4-warnings: Squash new warnings under Python 3.4, fixing
+    the test suite, and preparing for Python 3.5. (Closes: #765142)
+  * Bump Standards-Version to 3.9.6, no changes needed.
+
+ -- Stefano Rivera <[e-mail]>  Thu, 16 Oct 2014 22:57:41 -0700
+
 beautifulsoup4 (4.3.2-1ubuntu1) utopic; urgency=medium
 
   * Merge from debian. Remaining changes:

=== modified file 'debian/control'
--- debian/control	2014-05-29 19:50:43 +0000
+++ debian/control	2014-10-26 03:02:04 +0000
@@ -15,7 +15,7 @@
  python3-lxml,
  python3-pkg-resources
 X-Python-Version: >= 2.6
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://www.crummy.com/software/BeautifulSoup
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/beautifulsoup4/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/beautifulsoup4/trunk/

=== added directory 'debian/patches'
=== added file 'debian/patches/python3.4-warnings'
--- debian/patches/python3.4-warnings	1970-01-01 00:00:00 +0000
+++ debian/patches/python3.4-warnings	2014-10-26 03:02:04 +0000
@@ -0,0 +1,46 @@
+Description: Avoid warnings under Python 3.4
+ Python 3.5 is tidying up the HTMLParser module a bit, and 3.4 is raising some
+ warnings in preparation for the backwards-incompatible changes.
+ .
+ This squashes the warnings by specifically requesting the behaviour we want.
+ .
+ As there were tests, checking for an absense of warnings, this also gets the
+ test suite passing, again, under 3.4.
+Author: Stefano Rivera <[e-mail]>
+Bug-Debian: https://bugs.debian.org/765142
+Bug-Upstream: https://bugs.launchpad.net/beautifulsoup/+bug/1375721
+Forwarded: https://code.launchpad.net/~stefanor/beautifulsoup/python3.4/+merge/238642
+
+--- a/bs4/builder/_htmlparser.py
++++ b/bs4/builder/_htmlparser.py
+@@ -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,

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-10-26 03:02:04 +0000
@@ -0,0 +1,1 @@
+python3.4-warnings