[Python-modules-commits] r20466 - in packages/beautifulsoup4/tags (7 files)
stefanor at users.alioth.debian.org
stefanor at users.alioth.debian.org
Wed Feb 15 18:04:30 UTC 2012
Date: Wednesday, February 15, 2012 @ 18:04:28
Author: stefanor
Revision: 20466
[svn-buildpackage] Tagging beautifulsoup4 4.0.0~b5-1
Added:
packages/beautifulsoup4/tags/4.0.0~b5-1/
packages/beautifulsoup4/tags/4.0.0~b5-1/debian/changelog
(from rev 20465, packages/beautifulsoup4/trunk/debian/changelog)
packages/beautifulsoup4/tags/4.0.0~b5-1/debian/control
(from rev 20465, packages/beautifulsoup4/trunk/debian/control)
packages/beautifulsoup4/tags/4.0.0~b5-1/debian/patches/unittest2
(from rev 20465, packages/beautifulsoup4/trunk/debian/patches/unittest2)
Deleted:
packages/beautifulsoup4/tags/4.0.0~b5-1/debian/changelog
packages/beautifulsoup4/tags/4.0.0~b5-1/debian/control
packages/beautifulsoup4/tags/4.0.0~b5-1/debian/patches/unittest2
Deleted: packages/beautifulsoup4/tags/4.0.0~b5-1/debian/changelog
===================================================================
--- packages/beautifulsoup4/trunk/debian/changelog 2012-02-15 10:55:01 UTC (rev 20464)
+++ packages/beautifulsoup4/tags/4.0.0~b5-1/debian/changelog 2012-02-15 18:04:28 UTC (rev 20466)
@@ -1,184 +0,0 @@
-beautifulsoup4 (4.0.0~b4-1) UNRELEASED; urgency=low
-
- * New upstream beta.
- * Drop failing-tests patch, incorporated upstream.
- * Patch no-install-data: Don't install documentation from setup.py.
- * Update watch file to new download location.
- * Build sphinx documentation.
- - New package: python-bs4-doc
- - B-D on python-sphinx.
-
- -- Stefano Rivera <stefanor at debian.org> Thu, 09 Feb 2012 17:50:59 +0200
-
-beautifulsoup4 (4.0.0~b3-1) unstable; urgency=low
-
- * New upstream release with an incompatible API.
- - In a new source package, beautifulsoup4.
- - Building python-bs4 and python3-bs4
- * Update copyright years, and licence to Expatish.
- * B-D on python{,3}-lxml, python{,3}pkg-resources for unittests.
- * B-D on python-unit2 for unittests under 2.6.
- Patch unittest2.
- * B-D on python3-all for python3 package.
- * Patch failing-tests: Skip a test that's looking for a bug in HTMLParser in
- python (it fails on 2.7).
- * Recommend python-html5lib | python-lxml and python3-lxml (there's no py3k
- html5lib yet).
-
- -- Stefano Rivera <stefanor at debian.org> Wed, 08 Feb 2012 12:06:52 +0200
-
-beautifulsoup (3.2.0-2) unstable; urgency=low
-
- * Rebuild for Python transition.
- * Remove Breaks: ${python:Breaks}, no longer used by dh_python2.
- * Bump standards version to 3.9.2, no changes needed.
-
- -- Stefano Rivera <stefanor at debian.org> Mon, 14 Feb 2011 15:21:40 +0200
-
-beautifulsoup (3.2.0-1) unstable; urgency=low
-
- * Adopting beautifulsoup for Debian Python Modules Team. (Closes: #612875)
- * New upstream version.
- - The 3.2 release reverts back to the 3.0 SGMLParser approach.
- (Closes: #564160, LP: #392968)
- - <script> blocks are correctly handled again
- (Closes: #516824, LP: #357067)
- - Upstream no longer ships a changelog. (Closes: #530408)
- * Bump standards version to 3.9.1. Moved into python section.
- * Switch to Source Format 3.0 (quilt).
- * Switch to dh_python2.
- - Use X-Python-Version.
- * debian/control:
- - Drop -XB-Python-Version. Deprecated.
- - Drop Provides, Replaces, Conflicts. Versioned package names for Python
- modules are deprecated. No supported releases have packages requiring
- them.
- - Add Homepage.
- - Add Vcs- URLs.
- - Recommend python-chardet.
- * Bump debhelper dependency and compat level to 8.
- * Use DEP5 format debian/copyright.
- * Add watch file. (Closes: #607864)
- * Don't install tests as an example.
- * debian/rules:
- - Use minimal dh 7 style.
- - Run test suite during build.
-
- -- Stefano Rivera <stefanor at debian.org> Mon, 14 Feb 2011 15:15:21 +0200
-
-beautifulsoup (3.1.0.1-2) unstable; urgency=low
-
- * Disable installation of test scripts (Closes: #528430)
-
- -- Decklin Foster <decklin at red-bean.com> Sun, 24 May 2009 15:00:59 -0400
-
-beautifulsoup (3.1.0.1-1) unstable; urgency=low
-
- * New Upstream Version
-
- -- Decklin Foster <decklin at red-bean.com> Tue, 06 Jan 2009 18:59:51 -0500
-
-beautifulsoup (3.0.7-1) unstable; urgency=low
-
- * New upstream version, fixes UnicodeDecodeError (Closes: #483579, #479414)
-
- -- Decklin Foster <decklin at red-bean.com> Mon, 30 Jun 2008 19:04:07 -0400
-
-beautifulsoup (3.0.6-1) unstable; urgency=low
-
- * New upstream version (Closes: #487180)
-
- -- Decklin Foster <decklin at red-bean.com> Thu, 19 Jun 2008 22:19:12 -0400
-
-beautifulsoup (3.0.5-1) unstable; urgency=low
-
- * New upstream release
- * Updated debian/copyright with new license (dammit).
-
- -- Decklin Foster <decklin at red-bean.com> Sun, 17 Feb 2008 17:45:34 -0500
-
-beautifulsoup (3.0.4-1) unstable; urgency=low
-
- * New upstream release (Closes: #401849)
- * Remove dh_python and other cruft.
-
- -- Decklin Foster <decklin at red-bean.com> Mon, 21 May 2007 13:26:19 -0400
-
-beautifulsoup (3.0.3-1) unstable; urgency=low
-
- * New upstream release
- - Correctly read in keyword arguments to findAll (Closes: #418432)
- * Remove obsolete mention of separate packages built for Python 2.3 and 2.4
- from long description and Provides: (Closes: #399931, #413695)
-
- -- Decklin Foster <decklin at red-bean.com> Mon, 26 Mar 2007 22:12:59 -0400
-
-beautifulsoup (3.0.1-2) unstable; urgency=low
-
- * Build with python-support. No more python2.3-beautifulsoup or
- python2.4-beautifulsoup.
- * Move python from B-D-I to B-D.
-
- -- Decklin Foster <decklin at red-bean.com> Sun, 18 Jun 2006 12:42:42 -0400
-
-beautifulsoup (3.0.1-1) unstable; urgency=low
-
- * New upstream release
- - Fixed documentation (Closes: #349609)
- * Move debhelper from Build-Depends-Indep to Build-Depends.
- * Standards-Version: 3.7.2.
-
- -- Decklin Foster <decklin at red-bean.com> Thu, 1 Jun 2006 09:49:46 -0400
-
-beautifulsoup (2.1.1-5) unstable; urgency=low
-
- * Fix typo in description: (Closes: #345289)
- * Add Conflicts: on uld unsplit package (Closes: #345088)
-
- -- Decklin Foster <decklin at red-bean.com> Mon, 2 Jan 2006 22:52:38 -0500
-
-beautifulsoup (2.1.1-4) unstable; urgency=low
-
- * Match version in short description with long desc (Closes: #343480)
-
- -- Decklin Foster <decklin at red-bean.com> Thu, 15 Dec 2005 17:02:29 -0500
-
-beautifulsoup (2.1.1-3) unstable; urgency=low
-
- * Fix Description (argh).
-
- -- Decklin Foster <decklin at red-bean.com> Tue, 13 Dec 2005 21:52:35 -0500
-
-beautifulsoup (2.1.1-2) unstable; urgency=low
-
- * Install BeautifulSoupTests.py as an example rather than a regular doc.
- * Split python-beautifulsoup into python2.3-beautifulsoup and
- python2.4-beautifulsoup (Closes: #339997)
-
- -- Decklin Foster <decklin at red-bean.com> Sat, 10 Dec 2005 11:04:56 -0500
-
-beautifulsoup (2.1.1-1) unstable; urgency=low
-
- * New upstream release.
- * Bump Standards-Version to 3.6.2.
-
- -- Decklin Foster <decklin at red-bean.com> Mon, 19 Sep 2005 03:26:41 -0400
-
-beautifulsoup (2.1.0-1) unstable; urgency=low
-
- * New upstream release. (Closes: #309580)
-
- -- Decklin Foster <decklin at red-bean.com> Fri, 27 May 2005 10:12:14 -0400
-
-beautifulsoup (1.2+cvs20041017-1) unstable; urgency=low
-
- * Corrected version number and repacked the orig.tar.gz to go with it.
-
- -- Decklin Foster <decklin at red-bean.com> Wed, 16 Mar 2005 16:15:36 -0500
-
-beautifulsoup (1.2-1) unstable; urgency=low
-
- * Initial release.
-
- -- Decklin Foster <decklin at red-bean.com> Thu, 10 Feb 2005 13:57:09 -0500
-
Copied: packages/beautifulsoup4/tags/4.0.0~b5-1/debian/changelog (from rev 20465, packages/beautifulsoup4/trunk/debian/changelog)
===================================================================
--- packages/beautifulsoup4/tags/4.0.0~b5-1/debian/changelog (rev 0)
+++ packages/beautifulsoup4/tags/4.0.0~b5-1/debian/changelog 2012-02-15 18:04:28 UTC (rev 20466)
@@ -0,0 +1,187 @@
+beautifulsoup4 (4.0.0~b5-1) unstable; urgency=low
+
+ * New upstream beta.
+ * Refresh patches.
+ * Drop failing-tests patch, incorporated upstream.
+ * Patch no-install-data: Don't install documentation from setup.py.
+ * Update watch file to new download location.
+ * Swap alternative dependency order for html5lib | lxml, lxml is now
+ preferred, upstream.
+ * Build sphinx documentation.
+ - New package: python-bs4-doc
+ - B-D on python-sphinx.
+
+ -- Stefano Rivera <stefanor at debian.org> Wed, 15 Feb 2012 19:58:57 +0200
+
+beautifulsoup4 (4.0.0~b3-1) unstable; urgency=low
+
+ * New upstream release with an incompatible API.
+ - In a new source package, beautifulsoup4.
+ - Building python-bs4 and python3-bs4
+ * Update copyright years, and licence to Expatish.
+ * B-D on python{,3}-lxml, python{,3}pkg-resources for unittests.
+ * B-D on python-unit2 for unittests under 2.6.
+ Patch unittest2.
+ * B-D on python3-all for python3 package.
+ * Patch failing-tests: Skip a test that's looking for a bug in HTMLParser in
+ python (it fails on 2.7).
+ * Recommend python-html5lib | python-lxml and python3-lxml (there's no py3k
+ html5lib yet).
+
+ -- Stefano Rivera <stefanor at debian.org> Wed, 08 Feb 2012 12:06:52 +0200
+
+beautifulsoup (3.2.0-2) unstable; urgency=low
+
+ * Rebuild for Python transition.
+ * Remove Breaks: ${python:Breaks}, no longer used by dh_python2.
+ * Bump standards version to 3.9.2, no changes needed.
+
+ -- Stefano Rivera <stefanor at debian.org> Mon, 14 Feb 2011 15:21:40 +0200
+
+beautifulsoup (3.2.0-1) unstable; urgency=low
+
+ * Adopting beautifulsoup for Debian Python Modules Team. (Closes: #612875)
+ * New upstream version.
+ - The 3.2 release reverts back to the 3.0 SGMLParser approach.
+ (Closes: #564160, LP: #392968)
+ - <script> blocks are correctly handled again
+ (Closes: #516824, LP: #357067)
+ - Upstream no longer ships a changelog. (Closes: #530408)
+ * Bump standards version to 3.9.1. Moved into python section.
+ * Switch to Source Format 3.0 (quilt).
+ * Switch to dh_python2.
+ - Use X-Python-Version.
+ * debian/control:
+ - Drop -XB-Python-Version. Deprecated.
+ - Drop Provides, Replaces, Conflicts. Versioned package names for Python
+ modules are deprecated. No supported releases have packages requiring
+ them.
+ - Add Homepage.
+ - Add Vcs- URLs.
+ - Recommend python-chardet.
+ * Bump debhelper dependency and compat level to 8.
+ * Use DEP5 format debian/copyright.
+ * Add watch file. (Closes: #607864)
+ * Don't install tests as an example.
+ * debian/rules:
+ - Use minimal dh 7 style.
+ - Run test suite during build.
+
+ -- Stefano Rivera <stefanor at debian.org> Mon, 14 Feb 2011 15:15:21 +0200
+
+beautifulsoup (3.1.0.1-2) unstable; urgency=low
+
+ * Disable installation of test scripts (Closes: #528430)
+
+ -- Decklin Foster <decklin at red-bean.com> Sun, 24 May 2009 15:00:59 -0400
+
+beautifulsoup (3.1.0.1-1) unstable; urgency=low
+
+ * New Upstream Version
+
+ -- Decklin Foster <decklin at red-bean.com> Tue, 06 Jan 2009 18:59:51 -0500
+
+beautifulsoup (3.0.7-1) unstable; urgency=low
+
+ * New upstream version, fixes UnicodeDecodeError (Closes: #483579, #479414)
+
+ -- Decklin Foster <decklin at red-bean.com> Mon, 30 Jun 2008 19:04:07 -0400
+
+beautifulsoup (3.0.6-1) unstable; urgency=low
+
+ * New upstream version (Closes: #487180)
+
+ -- Decklin Foster <decklin at red-bean.com> Thu, 19 Jun 2008 22:19:12 -0400
+
+beautifulsoup (3.0.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Updated debian/copyright with new license (dammit).
+
+ -- Decklin Foster <decklin at red-bean.com> Sun, 17 Feb 2008 17:45:34 -0500
+
+beautifulsoup (3.0.4-1) unstable; urgency=low
+
+ * New upstream release (Closes: #401849)
+ * Remove dh_python and other cruft.
+
+ -- Decklin Foster <decklin at red-bean.com> Mon, 21 May 2007 13:26:19 -0400
+
+beautifulsoup (3.0.3-1) unstable; urgency=low
+
+ * New upstream release
+ - Correctly read in keyword arguments to findAll (Closes: #418432)
+ * Remove obsolete mention of separate packages built for Python 2.3 and 2.4
+ from long description and Provides: (Closes: #399931, #413695)
+
+ -- Decklin Foster <decklin at red-bean.com> Mon, 26 Mar 2007 22:12:59 -0400
+
+beautifulsoup (3.0.1-2) unstable; urgency=low
+
+ * Build with python-support. No more python2.3-beautifulsoup or
+ python2.4-beautifulsoup.
+ * Move python from B-D-I to B-D.
+
+ -- Decklin Foster <decklin at red-bean.com> Sun, 18 Jun 2006 12:42:42 -0400
+
+beautifulsoup (3.0.1-1) unstable; urgency=low
+
+ * New upstream release
+ - Fixed documentation (Closes: #349609)
+ * Move debhelper from Build-Depends-Indep to Build-Depends.
+ * Standards-Version: 3.7.2.
+
+ -- Decklin Foster <decklin at red-bean.com> Thu, 1 Jun 2006 09:49:46 -0400
+
+beautifulsoup (2.1.1-5) unstable; urgency=low
+
+ * Fix typo in description: (Closes: #345289)
+ * Add Conflicts: on uld unsplit package (Closes: #345088)
+
+ -- Decklin Foster <decklin at red-bean.com> Mon, 2 Jan 2006 22:52:38 -0500
+
+beautifulsoup (2.1.1-4) unstable; urgency=low
+
+ * Match version in short description with long desc (Closes: #343480)
+
+ -- Decklin Foster <decklin at red-bean.com> Thu, 15 Dec 2005 17:02:29 -0500
+
+beautifulsoup (2.1.1-3) unstable; urgency=low
+
+ * Fix Description (argh).
+
+ -- Decklin Foster <decklin at red-bean.com> Tue, 13 Dec 2005 21:52:35 -0500
+
+beautifulsoup (2.1.1-2) unstable; urgency=low
+
+ * Install BeautifulSoupTests.py as an example rather than a regular doc.
+ * Split python-beautifulsoup into python2.3-beautifulsoup and
+ python2.4-beautifulsoup (Closes: #339997)
+
+ -- Decklin Foster <decklin at red-bean.com> Sat, 10 Dec 2005 11:04:56 -0500
+
+beautifulsoup (2.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Bump Standards-Version to 3.6.2.
+
+ -- Decklin Foster <decklin at red-bean.com> Mon, 19 Sep 2005 03:26:41 -0400
+
+beautifulsoup (2.1.0-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #309580)
+
+ -- Decklin Foster <decklin at red-bean.com> Fri, 27 May 2005 10:12:14 -0400
+
+beautifulsoup (1.2+cvs20041017-1) unstable; urgency=low
+
+ * Corrected version number and repacked the orig.tar.gz to go with it.
+
+ -- Decklin Foster <decklin at red-bean.com> Wed, 16 Mar 2005 16:15:36 -0500
+
+beautifulsoup (1.2-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Decklin Foster <decklin at red-bean.com> Thu, 10 Feb 2005 13:57:09 -0500
+
Deleted: packages/beautifulsoup4/tags/4.0.0~b5-1/debian/control
===================================================================
--- packages/beautifulsoup4/trunk/debian/control 2012-02-15 10:55:01 UTC (rev 20464)
+++ packages/beautifulsoup4/tags/4.0.0~b5-1/debian/control 2012-02-15 18:04:28 UTC (rev 20466)
@@ -1,56 +0,0 @@
-Source: beautifulsoup4
-Section: python
-Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Stefano Rivera <stefanor at debian.org>
-Build-Depends:
- debhelper (>= 8),
- python-all (>= 2.6.5-13~),
- python-lxml,
- python-pkg-resources,
- python-sphinx (>= 1.0.7+dfsg),
- python-unittest2,
- python3-all (>= 3.1.2),
- python3-lxml,
- python3-pkg-resources
-X-Python-Version: >= 2.6
-Standards-Version: 3.9.2
-Homepage: http://www.crummy.com/software/BeautifulSoup
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/beautifulsoup4/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/beautifulsoup4/trunk/
-
-Package: python-bs4
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
-Recommends: python-chardet, python-html5lib | python-lxml
-Description: error-tolerant HTML parser for Python
- Beautiful Soup is a Python library for pulling data out of HTML and XML files.
- It works with your favorite parser to provide idiomatic ways of navigating,
- searching, and modifying the parse tree. It commonly saves programmers hours
- or days of work.
- .
- This package contains BeautifulSoup 4, for Python 2.x.
-
-Package: python3-bs4
-Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
-Recommends: python3-chardet, python3-lxml
-Description: error-tolerant HTML parser for Python 3
- Beautiful Soup is a Python library for pulling data out of HTML and XML files.
- It works with your favorite parser to provide idiomatic ways of navigating,
- searching, and modifying the parse tree. It commonly saves programmers hours
- or days of work.
- .
- This package contains BeautifulSoup 4, for Python 3.x.
-
-Package: python-bs4-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Description: error-tolerant HTML parser for Python - documentation
- Beautiful Soup is a Python library for pulling data out of HTML and XML files.
- It works with your favorite parser to provide idiomatic ways of navigating,
- searching, and modifying the parse tree. It commonly saves programmers hours
- or days of work.
- .
- This package contains BeautifulSoup's documentation.
Copied: packages/beautifulsoup4/tags/4.0.0~b5-1/debian/control (from rev 20465, packages/beautifulsoup4/trunk/debian/control)
===================================================================
--- packages/beautifulsoup4/tags/4.0.0~b5-1/debian/control (rev 0)
+++ packages/beautifulsoup4/tags/4.0.0~b5-1/debian/control 2012-02-15 18:04:28 UTC (rev 20466)
@@ -0,0 +1,56 @@
+Source: beautifulsoup4
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Stefano Rivera <stefanor at debian.org>
+Build-Depends:
+ debhelper (>= 8),
+ python-all (>= 2.6.5-13~),
+ python-lxml,
+ python-pkg-resources,
+ python-sphinx (>= 1.0.7+dfsg),
+ python-unittest2,
+ python3-all (>= 3.1.2),
+ python3-lxml,
+ python3-pkg-resources
+X-Python-Version: >= 2.6
+Standards-Version: 3.9.2
+Homepage: http://www.crummy.com/software/BeautifulSoup
+Vcs-Svn: svn://svn.debian.org/python-modules/packages/beautifulsoup4/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/beautifulsoup4/trunk/
+
+Package: python-bs4
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Recommends: python-chardet, python-lxml | python-html5lib
+Description: error-tolerant HTML parser for Python
+ Beautiful Soup is a Python library for pulling data out of HTML and XML files.
+ It works with your favorite parser to provide idiomatic ways of navigating,
+ searching, and modifying the parse tree. It commonly saves programmers hours
+ or days of work.
+ .
+ This package contains BeautifulSoup 4, for Python 2.x.
+
+Package: python3-bs4
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Recommends: python3-chardet, python3-lxml
+Description: error-tolerant HTML parser for Python 3
+ Beautiful Soup is a Python library for pulling data out of HTML and XML files.
+ It works with your favorite parser to provide idiomatic ways of navigating,
+ searching, and modifying the parse tree. It commonly saves programmers hours
+ or days of work.
+ .
+ This package contains BeautifulSoup 4, for Python 3.x.
+
+Package: python-bs4-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: error-tolerant HTML parser for Python - documentation
+ Beautiful Soup is a Python library for pulling data out of HTML and XML files.
+ It works with your favorite parser to provide idiomatic ways of navigating,
+ searching, and modifying the parse tree. It commonly saves programmers hours
+ or days of work.
+ .
+ This package contains BeautifulSoup's documentation.
Deleted: packages/beautifulsoup4/tags/4.0.0~b5-1/debian/patches/unittest2
===================================================================
--- packages/beautifulsoup4/trunk/debian/patches/unittest2 2012-02-15 10:55:01 UTC (rev 20464)
+++ packages/beautifulsoup4/tags/4.0.0~b5-1/debian/patches/unittest2 2012-02-15 18:04:28 UTC (rev 20466)
@@ -1,73 +0,0 @@
-Description: Use unittest2 to run tests under Python 2.6
-Author: Stefano Rivera <stefanor at debian.org>
-Forwarded: not-needed
-Last-Update: 2012-02-07
-
---- a/bs4/tests/test_html5lib.py
-+++ b/bs4/tests/test_html5lib.py
-@@ -9,7 +9,10 @@
- TestLXMLBuilderInvalidMarkup,
- TestLXMLBuilderEncodingConversion,
- )
--import unittest
-+try:
-+ import unittest2 as unittest
-+except:
-+ import unittest
-
- @unittest.skipIf(
- not HTML5LIB_PRESENT,
---- a/bs4/testing.py
-+++ b/bs4/testing.py
-@@ -1,6 +1,9 @@
- """Helper classes for tests."""
-
--import unittest
-+try:
-+ import unittest2 as unittest
-+except ImportError:
-+ import unittest
- from bs4 import BeautifulSoup
- from bs4.element import Comment, SoupStrainer
- from bs4.builder import LXMLTreeBuilder
---- a/bs4/tests/test_builder_registry.py
-+++ b/bs4/tests/test_builder_registry.py
-@@ -1,6 +1,9 @@
- """Tests of the builder registry."""
-
--import unittest
-+try:
-+ import unittest2 as unittest
-+except ImportError:
-+ import unittest
-
- from bs4 import BeautifulSoup
- from bs4.builder import (
---- a/bs4/tests/test_docs.py
-+++ b/bs4/tests/test_docs.py
-@@ -12,7 +12,10 @@
- import os
- from pkg_resources import (
- resource_filename, resource_exists, resource_listdir, cleanup_resources)
--import unittest
-+try:
-+ import unittest2 as unittest
-+except ImportError:
-+ import unittest
-
- DOCTEST_FLAGS = (
- doctest.ELLIPSIS |
---- a/bs4/tests/test_soup.py
-+++ b/bs4/tests/test_soup.py
-@@ -1,7 +1,10 @@
- # -*- coding: utf-8 -*-
- """Tests of Beautiful Soup as a whole."""
-
--import unittest
-+try:
-+ import unittest2 as unittest
-+except ImportError:
-+ import unittest
- from bs4.element import SoupStrainer
- from bs4.dammit import EntitySubstitution, UnicodeDammit
- from bs4.testing import SoupTest
Copied: packages/beautifulsoup4/tags/4.0.0~b5-1/debian/patches/unittest2 (from rev 20465, packages/beautifulsoup4/trunk/debian/patches/unittest2)
===================================================================
--- packages/beautifulsoup4/tags/4.0.0~b5-1/debian/patches/unittest2 (rev 0)
+++ packages/beautifulsoup4/tags/4.0.0~b5-1/debian/patches/unittest2 2012-02-15 18:04:28 UTC (rev 20466)
@@ -0,0 +1,73 @@
+Description: Use unittest2 to run tests under Python 2.6
+Author: Stefano Rivera <stefanor at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-02-07
+
+--- a/bs4/tests/test_html5lib.py
++++ b/bs4/tests/test_html5lib.py
+@@ -9,7 +9,10 @@
+ TestLXMLBuilderInvalidMarkup,
+ TestLXMLBuilderEncodingConversion,
+ )
+-import unittest
++try:
++ import unittest2 as unittest
++except:
++ import unittest
+
+ @unittest.skipIf(
+ not HTML5LIB_PRESENT,
+--- a/bs4/testing.py
++++ b/bs4/testing.py
+@@ -1,6 +1,9 @@
+ """Helper classes for tests."""
+
+-import unittest
++try:
++ import unittest2 as unittest
++except ImportError:
++ import unittest
+ from bs4 import BeautifulSoup
+ from bs4.element import Comment, SoupStrainer
+ from bs4.builder import LXMLTreeBuilder
+--- a/bs4/tests/test_builder_registry.py
++++ b/bs4/tests/test_builder_registry.py
+@@ -1,6 +1,9 @@
+ """Tests of the builder registry."""
+
+-import unittest
++try:
++ import unittest2 as unittest
++except ImportError:
++ import unittest
+
+ from bs4 import BeautifulSoup
+ from bs4.builder import (
+--- a/bs4/tests/test_docs.py
++++ b/bs4/tests/test_docs.py
+@@ -12,7 +12,10 @@
+ import os
+ from pkg_resources import (
+ resource_filename, resource_exists, resource_listdir, cleanup_resources)
+-import unittest
++try:
++ import unittest2 as unittest
++except ImportError:
++ import unittest
+
+ DOCTEST_FLAGS = (
+ doctest.ELLIPSIS |
+--- a/bs4/tests/test_soup.py
++++ b/bs4/tests/test_soup.py
+@@ -1,7 +1,10 @@
+ # -*- coding: utf-8 -*-
+ """Tests of Beautiful Soup as a whole."""
+
+-import unittest
++try:
++ import unittest2 as unittest
++except ImportError:
++ import unittest
+ from bs4 import BeautifulSoup
+ from bs4.element import SoupStrainer
+ from bs4.dammit import EntitySubstitution, UnicodeDammit
More information about the Python-modules-commits
mailing list