Skip to content

Commit dcf9cbc

Browse files
authored
Merge pull request #191 from carbonblack/process-max-children
Fixed function overwrite in Process Query
2 parents c36f43c + 2bf3b90 commit dcf9cbc

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
'pika',
2525
'prompt_toolkit',
2626
'pygments',
27-
'pytest',
27+
'pytest<=5.0',
2828
'python-dateutil',
2929
'protobuf',
3030
'solrq',
31-
'validators',
31+
'validators'
3232
]
3333

3434
if sys.version_info < (2, 7):

src/cbapi/response/models.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1384,7 +1384,7 @@ def create_watchlist(self, watchlist_name):
13841384
class ProcessQuery(WatchlistEnabledQuery):
13851385
def __init__(self, doc_class, cb, query=None, raw_query=None):
13861386
super(ProcessQuery, self).__init__(doc_class, cb, query, raw_query)
1387-
1387+
self.num_children = 15
13881388
if cb._has_legacy_partitions:
13891389
self._default_args["cb.legacy_5x_mode"] = True
13901390

@@ -1424,12 +1424,12 @@ def max_children(self, num_children):
14241424
except ValueError:
14251425
num_children = 15
14261426

1427-
nq.max_children = num_children
1427+
nq.num_children = num_children
14281428
return nq
14291429

14301430
def _perform_query(self, start=0, numrows=0):
14311431
for item in self._search(start=start, rows=numrows):
1432-
yield self._doc_class.new_object(self._cb, item, self.max_children)
1432+
yield self._doc_class.new_object(self._cb, item, self.num_children)
14331433

14341434
def set_legacy_mode(self, new_value=True):
14351435
self._default_args["cb.legacy_5x_mode"] = new_value

0 commit comments

Comments
 (0)