Skip to content

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

Merge remote-tracking branch 'upstream/master' into documentation-build

Adrián Chavesb2f4df5cb7f4
diff --cc docs/topics/contracts.rst
index c2699e59e,b8b3078c4..430720fe3
--- a/docs/topics/contracts.rst
+++ b/docs/topics/contracts.rst
@@@ -78,10 -78,10 +78,10 @@@ override three methods
.. module:: scrapy.contracts
- .. class:: Contract(method, \*args)
+ .. class:: Contract(method, *args)
:param method: callback function to which the contract is associated
- :type method: function
+ :type method: collections.abc.Callable
:param args: list of arguments passed into the docstring (whitespace
separated)
diff --cc docs/topics/request-response.rst
index 397632932,1dffd1d55..d0136137f
--- a/docs/topics/request-response.rst
+++ b/docs/topics/request-response.rst
@@@ -104,8 -106,8 +106,8 @@@ Request object
:param encoding: the encoding of this request (defaults to ``'utf-8'``).
This encoding will be used to percent-encode the URL and to convert the
- body to bytes if given as a string.
+ body to bytes (if given as a string).
- :type encoding: string
+ :type encoding: str
:param priority: the priority of this request (defaults to ``0``).
The priority is used by the scheduler to define the order used to process