jenkins-bot merged this change.

View Change

[FIX] Prevent conflict with generator/filter arguments

The prefix branch prevents prefixindex from working.

Change-Id: Ia5e7cc0a72f2b931b64c360c3dd9435ef8e952f6
---
M scripts/movepages.py
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/movepages.py b/scripts/movepages.py
index d5789d6..0a4124f 100755
--- a/scripts/movepages.py
+++ b/scripts/movepages.py
@@ -34,7 +34,7 @@
 #
 # (C) Leonardo Gregianin, 2006
 # (C) Andreas J. Schwab, 2007
-# (C) Pywikibot team, 2006-2019
+# (C) Pywikibot team, 2006-2020
 #
 # Distributed under the terms of the MIT license.
 #
@@ -194,6 +194,8 @@
     genFactory = pagegenerators.GeneratorFactory()
 
     for arg in local_args:
+        if genFactory.handleArg(arg):
+            continue
         if arg == '-pairs' or arg.startswith('-pairs:'):
             issue_deprecation_warning(
                 '-pairs',
@@ -243,8 +245,6 @@
                 options['summary'] = pywikibot.input('Enter the summary:')
             else:
                 options['summary'] = arg[9:]
-        else:
-            genFactory.handleArg(arg)
 
     if oldName:
         pywikibot.warning('-from:{0} without -to:'.format(oldName))

To view, visit change 561960. To unsubscribe, or for help writing mail filters, visit settings.