Gael Pasgrimaud avatar Gael Pasgrimaud committed 89e4ea9

all to pass this in filter callback

Comments (0)

Files changed (1)

pyquery/pyquery.py

 from copy import deepcopy
 from lxml import etree
 import lxml.html
+import inspect
 import sys
 
 PY3k = sys.version_info >= (3,)
             [<p>]
             >>> d('p').filter(lambda i: PyQuery(this).text() == 'Hi')
             [<p.hello>]
+            >>> d('p').filter(lambda i, this: PyQuery(this).text() == 'Hi')
+            [<p.hello>]
         """
         if not hasattr(selector, '__call__'):
             return self._filter_only(selector, self)
         else:
             elements = []
+            args = inspect.getargspec(callback).args
             try:
                 for i, this in enumerate(self):
-                    func_globals(selector)['this'] = this
-                    if callback(selector, i):
+                    if len(args) == 1:
+                        func_globals(selector)['this'] = this
+                    if callback(selector, i, this):
                         elements.append(this)
             finally:
                 f_globals = func_globals(selector)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.