RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better marker name to detect overridden methods

This commit is contained in:
Max Arnold 2013-12-17 22:44:12 +07:00
parent c29939862a
commit 86a6d6898b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scrapy/contrib/pipeline/files.py
View File

@ -283,7 +283,7 @@ class FilesPipeline(MediaPipeline):
url = request.url
# detect if file_key() method has been overridden
if not hasattr(self.file_key, '_overridden'):
if not hasattr(self.file_key, '_base'):
_warn()
return self.file_key(url)
## end of deprecation warning block
@ -295,4 +295,4 @@ class FilesPipeline(MediaPipeline):
# deprecated
def file_key(self, url):
return self.file_path(url)
file_key._overridden = False
file_key._base = True

12
scrapy/contrib/pipeline/images.py
View File

@ -125,10 +125,10 @@ class ImagesPipeline(FilesPipeline):
url = request.url
# detect if file_key() or image_key() methods have been overridden
if not hasattr(self.file_key, '_overridden'):
if not hasattr(self.file_key, '_base'):
_warn()
return self.file_key(url)
elif not hasattr(self.image_key, '_overridden'):
elif not hasattr(self.image_key, '_base'):
_warn()
return self.image_key(url)
## end of deprecation warning block
@ -153,7 +153,7 @@ class ImagesPipeline(FilesPipeline):
url = request.url
# detect if thumb_key() method has been overridden
if not hasattr(self.thumb_key, '_overridden'):
if not hasattr(self.thumb_key, '_base'):
_warn()
return self.thumb_key(url, thumb_id)
## end of deprecation warning block
@ -164,14 +164,14 @@ class ImagesPipeline(FilesPipeline):
# deprecated
def file_key(self, url):
return self.image_key(url)
file_key._overridden = False
file_key._base = True
# deprecated
def image_key(self, url):
return self.file_path(url)
image_key._overridden = False
image_key._base = True
# deprecated
def thumb_key(self, url, thumb_id):
return self.thumb_path(url, thumb_id)
thumb_key._overridden = False
thumb_key._base = True