Merge lp://staging/~saschpe/beautifulsoup/beautifulsoup into lp://staging/beautifulsoup

Unmerged revisions

324. By tar_scm test suite <root@localhost> on 2014-01-08

Fix lxml deprecation warning tests.

The class BeautifulStoneSoup is instanciated first in
bs4.tests.test_soup:LXMLTreeBuilderSmokeTest.test_beautifulstonesoup_is_xml_parser
causing the UserWarning to be printed once. However, the deprecation test will
fail afterwards:

ERROR: test_beautifulstonesoup (bs4.tests.test_soup.TestDeprecatedConstructorArguments)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/root/Projects/python/beautifulsoup/bs4/tests/test_soup.py", line 69, in test_beautifulstonesoup
    self.assertTrue("BeautifulStoneSoup class is deprecated" in str(w[0].message))
IndexError: list index out of range

Instead, don't eat the UserWarning in the first test so that the second one can
catch it properly.

323. By tar_scm test suite <root@localhost> on 2014-01-08

Don't provide encoding for XML unicode tests with LXML.

ERROR: test_can_parse_unicode_document (bs4.tests.test_lxml.LXMLXMLTreeBuilderSmokeTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/root/Projects/python/beautifulsoup/bs4/testing.py", line 498, in test_can_parse_unicode_document
    self.assertEqual(u'Sacr\xe9 bleu!', soup.root.string)
AttributeError: 'NoneType' object has no attribute 'string'

As described at http://lxml.de/parsing.html#python-unicode-strings LXML doesn't like
Unicode XML that specifies a (wrong) encoding.