From 682705cb07c5ed647be9694185ca4af7a3c42a2c Mon Sep 17 00:00:00 2001
From: Claudio Jolowicz <mail@claudiojolowicz.com>
Date: Fri, 13 Nov 2020 15:45:05 +0100
Subject: [PATCH] Rename _{session_filters => sessions_and_keywords}_merge_func

Revert function name to the one used before --pythons was introduced.
---
 nox/_options.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nox/_options.py b/nox/_options.py
index 5da505be..dcdcee2b 100644
--- a/nox/_options.py
+++ b/nox/_options.py
@@ -41,7 +41,7 @@
 )
 
 
-def _session_filters_merge_func(
+def _sessions_and_keywords_merge_func(
     key: str, command_args: argparse.Namespace, noxfile_args: argparse.Namespace
 ) -> List[str]:
     """Only return the Noxfile value for sessions/keywords if neither sessions
@@ -221,7 +221,7 @@ def _session_completer(
         "--session",
         group=options.groups["primary"],
         noxfile=True,
-        merge_func=functools.partial(_session_filters_merge_func, "sessions"),
+        merge_func=functools.partial(_sessions_and_keywords_merge_func, "sessions"),
         nargs="*",
         default=_sessions_default,
         help="Which sessions to run. By default, all sessions will run.",
@@ -243,7 +243,7 @@ def _session_completer(
         "--keywords",
         group=options.groups["primary"],
         noxfile=True,
-        merge_func=functools.partial(_session_filters_merge_func, "keywords"),
+        merge_func=functools.partial(_sessions_and_keywords_merge_func, "keywords"),
         help="Only run sessions that match the given expression.",
     ),
     _option_set.Option(