Merge pull request #648 from DocNow/max_results_with_no_context_annotations

edsu · web-flow · commit 89dc89357876 · 2022-07-18T07:20:52.000-04:00
Fix bug where --max-results could not be set with --no-context-annota…
diff --git a/twarc/command2.py b/twarc/command2.py
@@ -423,7 +423,7 @@ def _validate_max_results(context, parameter, value):
             )
         if value < 10 or value > 500:
             raise click.BadParameter("--max-results must be between 10 and 500")
-        if value > 100 and has_context_annotations:
+        if value > 100 and (has_context_annotations and not no_context_annotations_set):
             raise click.BadParameter(
                 "--max-results cannot be greater than 100 when using context annotations. Set --no-context-annotations to remove them, or don't specify them in --tweet-fields."
             )

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ def _validate_max_results(context, parameter, value):`
`423`	`423`	`)`
`424`	`424`	`if value < 10 or value > 500:`
`425`	`425`	`raise click.BadParameter("--max-results must be between 10 and 500")`
`426`		`- if value > 100 and has_context_annotations:`
	`426`	`+ if value > 100 and (has_context_annotations and not no_context_annotations_set):`
`427`	`427`	`raise click.BadParameter(`
`428`	`428`	`"--max-results cannot be greater than 100 when using context annotations. Set --no-context-annotations to remove them, or don't specify them in --tweet-fields."`
`429`	`429`	`)`