From ae95c1df68486f7e897f8b57b5f88a97fcbad568 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Wed, 14 Jan 2009 23:31:24 +0000 Subject: [PATCH] removed unused (and broken) prepend_callback Request method --HG-- extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40728 --- scrapy/trunk/scrapy/contrib/history/scheduler.py | 7 ++++++- scrapy/trunk/scrapy/http/request.py | 8 -------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/scrapy/trunk/scrapy/contrib/history/scheduler.py b/scrapy/trunk/scrapy/contrib/history/scheduler.py index 7dd517154..14137c2f5 100644 --- a/scrapy/trunk/scrapy/contrib/history/scheduler.py +++ b/scrapy/trunk/scrapy/contrib/history/scheduler.py @@ -1,3 +1,7 @@ +""" +WARNING: This Scheduler code is obsolete and needs to be rewritten +""" + from datetime import datetime from twisted.internet import defer @@ -90,6 +94,7 @@ class RulesScheduler(Scheduler): d = defer.Deferred() d.addCallbacks(callback, errback) - request.prepend_callback(d) + # prepend_callback Request method was removed (it never worked properly anyways) + #request.prepend_callback(d) return request diff --git a/scrapy/trunk/scrapy/http/request.py b/scrapy/trunk/scrapy/http/request.py index e808911c7..2e2e71feb 100644 --- a/scrapy/trunk/scrapy/http/request.py +++ b/scrapy/trunk/scrapy/http/request.py @@ -58,14 +58,6 @@ class Request(object): return chain_deferred(self.deferred, callback) return self.deferred.addCallback(callback, *args, **kwargs) - def prepend_callback(self, func, *args, **kwargs): - if callable(func): - func = defer.Deferred().addCallback(func, *args, **kwargs) - assert isinstance(func, defer.Deferred), \ - 'prepend_callback expects a callable or defer.Deferred instance, got %s' % type(func) - self.deferred = chain_deferred(func, self.deferred) - return self.deferred - def set_url(self, url): assert isinstance(url, basestring), \ 'Request url argument must be str or unicode, got %s:' % type(url).__name__