diff --git a/scrapy/trunk/scrapy/tests/test_utils_iterators.py b/scrapy/trunk/scrapy/tests/test_utils_iterators.py
index c1f0e4bcf..e9adaad40 100644
--- a/scrapy/trunk/scrapy/tests/test_utils_iterators.py
+++ b/scrapy/trunk/scrapy/tests/test_utils_iterators.py
@@ -8,18 +8,18 @@ from scrapy.http import Response
class UtilsXmlTestCase(unittest.TestCase):
### NOTE: Encoding issues have been found with BeautifulSoup for utf-16 files, utf-16 test removed ###
def test_iterator(self):
- body = """
-
-
- Type 1
- Name 1
-
-
- Type 2
- Name 2
-
-
- """
+ body = """\
+ \
+ \
+ Type 1\
+ Name 1\
+ \
+ \
+ Type 2\
+ Name 2\
+ \
+ """
+
response = Response(domain="example.com", url="http://example.com", body=body)
attrs = []
for x in xmliter(response, 'product'):
@@ -35,7 +35,7 @@ class UtilsXmlTestCase(unittest.TestCase):
[[u'one'], [u'two']])
def test_iterator_namespaces(self):
- body = """
+ body = """\
@@ -50,14 +50,6 @@ class UtilsXmlTestCase(unittest.TestCase):
ITEM_1
400
- -
- Item 2
- This is item 2
- http://www.mydummycompany.com/items/2
- http://www.mydummycompany.com/images/item2.jpg
- ITEM_2
- 100
-
"""
@@ -72,14 +64,9 @@ class UtilsXmlTestCase(unittest.TestCase):
self.assertEqual(node.x('g:image_link/text()').extract(), ['http://www.mydummycompany.com/images/item1.jpg'])
self.assertEqual(node.x('g:id/text()').extract(), ['ITEM_1'])
self.assertEqual(node.x('g:price/text()').extract(), ['400'])
-
- node = my_iter.next()
- self.assertEqual(node.x('title/text()').extract(), ['Item 2'])
- self.assertEqual(node.x('description/text()').extract(), ['This is item 2'])
- self.assertEqual(node.x('link/text()').extract(), ['http://www.mydummycompany.com/items/2'])
- self.assertRaises(libxml2.xpathError, node.x, 'g:image_link/text()')
- self.assertRaises(libxml2.xpathError, node.x, 'g:id/text()')
- self.assertRaises(libxml2.xpathError, node.x, 'g:price/text()')
+ self.assertEqual(node.x('image_link/text()').extract(), [])
+ self.assertEqual(node.x('id/text()').extract(), [])
+ self.assertEqual(node.x('price/text()').extract(), [])
def test_iterator_exception(self):
body = u"""onetwo"""