Revision: 3927
Author: leogregianin
Date: 2007-07-31 16:03:31 +0000 (Tue, 31 Jul 2007)
Log Message:
-----------
Fix bug 1668061: Harmonize category.py's keybindings
Modified Paths:
--------------
trunk/pywikipedia/category.py
Modified: trunk/pywikipedia/category.py
===================================================================
--- trunk/pywikipedia/category.py 2007-07-31 12:17:29 UTC (rev 3926)
+++ trunk/pywikipedia/category.py 2007-07-31 16:03:31 UTC (rev 3927)
@@ -568,7 +568,7 @@
# layout: we don't expect a cat to have more than 100 subcats
wikipedia.output(u'%2d - Move down to %s' % (i,
subcatlist[i].title()))
print ' j - Jump to another category'
- print ' n - Skip this article'
+ print ' s - Skip this article'
print ' r - Remove this category tag'
print ' ? - Print first part of the page (longer and longer)'
wikipedia.output(u'Enter - Save category as %s' % current_cat.title())
@@ -577,7 +577,7 @@
while not flag:
print ''
choice=wikipedia.input(u'Choice:')
- if choice == 'n':
+ if choice in ['s', 'S']:
flag = True
elif choice == '':
wikipedia.output(u'Saving category as %s' % current_cat.title())
@@ -586,13 +586,13 @@
else:
catlib.change_category(article, original_cat, current_cat)
flag = True
- elif choice == 'j':
+ elif choice in ['j', 'J']:
newCatTitle = wikipedia.input(u'Please enter the category the article
should be moved to:')
newCat = catlib.Category(wikipedia.getSite(), 'Category:' +
newCatTitle)
# recurse into chosen category
self.move_to_category(article, original_cat, newCat)
flag = True
- elif choice == 'r':
+ elif choice in ['r', 'R']:
# remove the category tag
catlib.change_category(article, original_cat, None)
flag = True