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

Improved warning messages a little

This commit is contained in:
D R Siddhartha 2020-10-04 02:09:21 +05:30
parent 35e2d25689
commit 0c24cdb257
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scrapy/pipelines/images.py
View File

@ -135,7 +135,7 @@ class ImagesPipeline(FilesPipeline):
if self._deprecated_convert_image is None:
self._deprecated_convert_image = 'response_body' not in get_func_args(self.convert_image)
if self._deprecated_convert_image:
warnings.warn('ImagesPipeline.convert_image() method overriden in a deprecated way, '
warnings.warn(f'{self.__class__.__name__}.convert_image() method overriden in a deprecated way, '
'overriden method does not accept response_body argument.',
category=ScrapyDeprecationWarning)
@ -155,7 +155,7 @@ class ImagesPipeline(FilesPipeline):
def convert_image(self, image, size=None, response_body=None):
if response_body is None:
warnings.warn('ImagesPipeline.convert_image() method called in a deprecated way, '
warnings.warn(f'{self.__class__.__name__}.convert_image() method called in a deprecated way, '
'method called without response_body argument.',
category=ScrapyDeprecationWarning, stacklevel=2)

4
tests/test_pipeline_images.py
View File

@ -162,7 +162,7 @@ class ImagesPipelineTestCase(unittest.TestCase):
self.assertEqual(orig_im.getcolors(), thumb_img.getcolors())
self.assertEqual(buf.getvalue(), thumb_buf.getvalue())
expected_warning_msg = ('ImagesPipeline.convert_image() method overriden in a deprecated way, '
expected_warning_msg = ('.convert_image() method overriden in a deprecated way, '
'overriden method does not accept response_body argument.')
self.assertEqual(len([warning for warning in w if expected_warning_msg in str(warning.message)]), 1)
@ -199,7 +199,7 @@ class ImagesPipelineTestCase(unittest.TestCase):
self.assertEqual(converted.getcolors(), [(10000, (205, 230, 255))])
# ensure that we recieved deprecation warnings
expected_warning_msg = 'ImagesPipeline.convert_image() method called in a deprecated way'
expected_warning_msg = '.convert_image() method called in a deprecated way'
self.assertTrue(len([warning for warning in w if expected_warning_msg in str(warning.message)]) == 4)
def test_convert_image_new(self):