diff --git a/scrapy/trunk/examples/contrib_exp/googledir/googledir/items.py b/scrapy/trunk/examples/contrib_exp/googledir/googledir/items.py index 38d3722fc..c66c8070b 100644 --- a/scrapy/trunk/examples/contrib_exp/googledir/googledir/items.py +++ b/scrapy/trunk/examples/contrib_exp/googledir/googledir/items.py @@ -2,7 +2,7 @@ from scrapy.contrib_exp import newitem -from scrapy.contrib_exp.newitem.extractors import ItemExtractor, adaptor +from scrapy.contrib_exp.newitem.extractors import ItemAdaptor, adaptor from scrapy.contrib_exp.adaptors import extract, strip @@ -12,7 +12,7 @@ class GoogledirItem(newitem.Item): description = newitem.StringField() -class GoogledirItemExtractor(ItemExtractor): +class GoogledirItemAdaptor(ItemAdaptor): item_class = GoogledirItem name = adaptor(extract, strip) diff --git a/scrapy/trunk/examples/contrib_exp/googledir/googledir/spiders/google_directory.py b/scrapy/trunk/examples/contrib_exp/googledir/googledir/spiders/google_directory.py index 1f735f44a..7d7948f4e 100644 --- a/scrapy/trunk/examples/contrib_exp/googledir/googledir/spiders/google_directory.py +++ b/scrapy/trunk/examples/contrib_exp/googledir/googledir/spiders/google_directory.py @@ -5,7 +5,7 @@ from scrapy.xpath import HtmlXPathSelector from scrapy.contrib.spiders import CrawlSpider, rule from scrapy.utils.misc import items_to_csv -from googledir.items import GoogledirItem, GoogledirItemExtractor +from googledir.items import GoogledirItem, GoogledirItemAdaptor class GoogleDirectorySpider(CrawlSpider): domain_name = 'google.com' @@ -24,7 +24,7 @@ class GoogleDirectorySpider(CrawlSpider): links = hxs.x('//td[descendant::a[contains(@href, "#pagerank")]]/following-sibling::td/font') for link in links: - extractor = GoogledirItemExtractor() + extractor = GoogledirItemAdaptor() extractor.name = link.x('a/text()') extractor.url = link.x('a/@href') extractor.description = link.x('font[2]/text()') diff --git a/scrapy/trunk/scrapy/contrib_exp/newitem/extractors.py b/scrapy/trunk/scrapy/contrib_exp/newitem/extractors.py index fc22eb988..8bb61141c 100644 --- a/scrapy/trunk/scrapy/contrib_exp/newitem/extractors.py +++ b/scrapy/trunk/scrapy/contrib_exp/newitem/extractors.py @@ -1,7 +1,7 @@ from scrapy.utils.python import get_func_args -class ItemExtractor(object): +class ItemAdaptor(object): def __init__(self, response=None, item=None): if item: self.item_instance = item