diff --git a/scrapy/trunk/scrapy/tests/test_utils_markup.py b/scrapy/trunk/scrapy/tests/test_utils_markup.py index b466dce88..01121133e 100644 --- a/scrapy/trunk/scrapy/tests/test_utils_markup.py +++ b/scrapy/trunk/scrapy/tests/test_utils_markup.py @@ -7,10 +7,6 @@ from scrapy.utils.markup import unquote_markup class UtilsMarkupTest(unittest.TestCase): def test_remove_entities(self): - # make sure it always return uncode - assert isinstance(remove_entities('no entities'), unicode) - assert isinstance(remove_entities('Price: £100!'), unicode) - # regular conversions self.assertEqual(remove_entities(u'As low as £100!'), u'As low as \xa3100!') @@ -31,9 +27,6 @@ class UtilsMarkupTest(unittest.TestCase): def test_replace_tags(self): - # make sure it always return uncode - assert isinstance(replace_tags('no entities'), unicode) - self.assertEqual(replace_tags(u'This text contains some tag'), u'This text contains some tag') @@ -45,10 +38,6 @@ class UtilsMarkupTest(unittest.TestCase): u'Click here') def test_remove_comments(self): - # make sure it always return unicode - assert isinstance(remove_comments('without comments'), unicode) - assert isinstance(remove_comments(''), unicode) - # text without comments self.assertEqual(remove_comments(u'text without comments'), u'text without comments') @@ -57,13 +46,6 @@ class UtilsMarkupTest(unittest.TestCase): self.assertEqual(remove_comments(u'Hello'),u'Hello') def test_remove_tags(self): - # make sure it always return unicode - assert isinstance(remove_tags('no tags'), unicode) - assert isinstance(remove_tags('no tags', which_ones=('p',)), unicode) - assert isinstance(remove_tags('
one tag
'), unicode) - assert isinstance(remove_tags('one tag
', which_ones=('p')), unicode) - assert isinstance(remove_tags('link', which_ones=('b',)), unicode) - # text without tags self.assertEqual(remove_tags(u'no tags'), u'no tags') self.assertEqual(remove_tags(u'no tags', which_ones=('p','b',)), u'no tags') @@ -81,12 +63,6 @@ class UtilsMarkupTest(unittest.TestCase): u'texty
') def test_remove_tags_with_content(self): - # make sure it always return unicode - assert isinstance(remove_tags_with_content('no tags'), unicode) - assert isinstance(remove_tags_with_content('no tags', which_ones=('p',)), unicode) - assert isinstance(remove_tags_with_content('one tag
', which_ones=('p',)), unicode) - assert isinstance(remove_tags_with_content('link', which_ones=('b',)), unicode) - # text without tags self.assertEqual(remove_tags_with_content(u'no tags'), u'no tags') self.assertEqual(remove_tags_with_content(u'no tags', which_ones=('p','b',)), u'no tags') @@ -99,10 +75,6 @@ class UtilsMarkupTest(unittest.TestCase): u'not will removed') def test_remove_escape_chars(self): - # make sure it always return unicode - assert isinstance(remove_escape_chars('no ec'), unicode) - assert isinstance(remove_escape_chars('no ec', which_ones=('\n','\t',)), unicode) - # text without escape chars self.assertEqual(remove_escape_chars(u'no ec'), u'no ec') self.assertEqual(remove_escape_chars(u'no ec', which_ones=('\n',)), u'no ec') @@ -118,10 +90,6 @@ class UtilsMarkupTest(unittest.TestCase): sample_txt2 = u'