From 268a37cb7b40737a855e217e3ebe8a2b91238dba Mon Sep 17 00:00:00 2001 From: Mabel Villalba Date: Wed, 26 Jun 2019 13:23:10 +0200 Subject: [PATCH] [itemloader-errors] updated Compose and MapCompose function names #3836 --- scrapy/loader/processors.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/scrapy/loader/processors.py b/scrapy/loader/processors.py index 4b6d8624c..468aec2cc 100644 --- a/scrapy/loader/processors.py +++ b/scrapy/loader/processors.py @@ -28,12 +28,10 @@ class MapCompose(object): try: next_values += arg_to_iter(func(v)) except Exception as e: - type_name = type(func).__name__ - _name = (func.__name__ if type_name == 'function' - else type_name) raise ValueError("Error in MapCompose with " - "function %s value=%r error='%s: %s'" % - (_name, value, type(e).__name__, str(e))) + "%s value=%r error='%s: %s'" % + (str(func), value, type(e).__name__, + str(e))) values = next_values return values @@ -57,12 +55,9 @@ class Compose(object): try: value = func(value) except Exception as e: - type_name = type(func).__name__ - _name = (func.__name__ if type_name == 'function' - else type_name) raise ValueError("Error in Compose with " - "function %s value=%r error='%s: %s'" % - (_name, value, type(e).__name__, str(e))) + "%s value=%r error='%s: %s'" % + (str(func), value, type(e).__name__, str(e))) return value