Skip to content

Scrapy, a fast high-level web crawling & scraping framework for Python.

Use regex to check for private methods

Andrew Baxter144afcee7973
diff --git a/scrapy/utils/reqser.py b/scrapy/utils/reqser.py
index 8c99763cf..07c51aaff 100644
--- a/scrapy/utils/reqser.py
+++ b/scrapy/utils/reqser.py
@@ -2,12 +2,16 @@
Helper functions for serializing (and deserializing) requests.
"""
import six
+import re
from scrapy.http import Request
from scrapy.utils.python import to_unicode, to_native_str
from scrapy.utils.misc import load_object
+private_name_regex = re.compile('^__[^_](.*[^_])?_?$')
+
+
def request_to_dict(request, spider=None):
"""Convert Request object to a dict.
@@ -76,7 +80,7 @@ def _find_method(obj, func):
else:
if func_self is obj:
name = six.get_method_function(func).__name__
- if name.startswith('__'):
+ if private_name_regex.search(name):
classname = obj.__class__.__name__.lstrip('_')
name = '_%s%s' % (classname, name)
return name