Changeset 1937:1b7656adef5d

Timestamp:

02/24/10 15:43:09 (5 months ago)

Author:

Daniel Grana <dangra@…>

Children:

1938:79f7da288813, 1944:29080aae4808

Branch:

default

Message:

Add missing priority and errback arguments to Request.replace method signature

Location:

scrapy

Files:

• http/request/__init__.py (modified) (2 diffs)
• tests/test_http_request.py (modified) (2 diffs)

scrapy/http/request/__init__.py

@@ -97 +97 @@
         return self.replace()
 
-    def replace(self, url=None, callback=None, method=None, headers=None, body=None, 
-                cookies=None, meta=None, encoding=None, dont_filter=None):
+    def replace(self, url=None, callback=None, method=None, headers=None, body=None, \
+                cookies=None, meta=None, encoding=None, priority=None, \
+                dont_filter=None, errback=None):
         """Create a new Request with the same attributes except for those
         given new values.
@@ -110 +111 @@
                               meta=self.meta if meta is None else meta,
                               encoding=self.encoding if encoding is None else encoding,
-                              dont_filter=self.dont_filter if dont_filter is None else dont_filter)
+                              priority=self.priority if priority is None else priority,
+                              dont_filter=self.dont_filter if dont_filter is None else dont_filter,
+                              errback=errback)

scrapy/tests/test_http_request.py

@@ -3 +3 @@
 import unittest
 import xmlrpclib
+from inspect import getargspec
 from cStringIO import StringIO
 from urlparse import urlparse
@@ -171 +172 @@
         assert r4.dont_filter is False
 
+        # __init__ and replace() signatures must be equal unles *args,**kwargs is used
+        i_args, i_varargs, i_varkwargs, _ = getargspec(self.request_class.__init__)
+        self.assertFalse(bool(i_varargs) ^ bool(i_varkwargs))
+        if not i_varargs:
+            r_args, _, _, _ = getargspec(self.request_class.replace)
+            self.assertEqual(i_args, r_args)
+
     def test_weakref_slots(self):
         """Check that classes are using slots and are weak-referenceable"""