From 186d0e93b0614abab27c77c9e40f122ec4044f71 Mon Sep 17 00:00:00 2001 From: Daniel Grana Date: Fri, 27 Mar 2009 06:46:06 +0000 Subject: [PATCH] Revert "added rule shorthand, for creating CrawlSpider rules" This reverts commit r863. This is not the place for this shorthand, and it hasn't the blessing of BDFL. I look forward for the return of this shorthand. --HG-- extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%401023 --- scrapy/trunk/scrapy/contrib/spiders/__init__.py | 2 +- scrapy/trunk/scrapy/contrib/spiders/crawl.py | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/scrapy/trunk/scrapy/contrib/spiders/__init__.py b/scrapy/trunk/scrapy/contrib/spiders/__init__.py index fdd68948e..6a310dd44 100644 --- a/scrapy/trunk/scrapy/contrib/spiders/__init__.py +++ b/scrapy/trunk/scrapy/contrib/spiders/__init__.py @@ -1,2 +1,2 @@ -from scrapy.contrib.spiders.crawl import CrawlSpider, Rule, rule +from scrapy.contrib.spiders.crawl import CrawlSpider, Rule from scrapy.contrib.spiders.feed import XMLFeedSpider, CSVFeedSpider diff --git a/scrapy/trunk/scrapy/contrib/spiders/crawl.py b/scrapy/trunk/scrapy/contrib/spiders/crawl.py index f62cef294..8d4a97b08 100644 --- a/scrapy/trunk/scrapy/contrib/spiders/crawl.py +++ b/scrapy/trunk/scrapy/contrib/spiders/crawl.py @@ -10,7 +10,6 @@ import copy from scrapy.http import Request from scrapy.spider import BaseSpider from scrapy.conf import settings -from scrapy.link.extractors import RegexLinkExtractor class Rule(object): """ @@ -46,14 +45,6 @@ class Rule(object): else: self.follow = follow - -def rule(regex, callback=None, exclude=None, follow=None): - """Shorthand for creating CrawlSpider rules""" - deny = [exclude] if exclude else [] - link_extractor = RegexLinkExtractor(allow=[regex], deny=deny) - return Rule(link_extractor, callback=callback, follow=follow) - - class CrawlSpider(BaseSpider): """ Class for spiders that crawl over web pages and extract/parse their links