[Pywikipedia-l] SVN: [6101] trunk/pywikipedia/redirect.py

[russblau at svn.wikimedia.org]

Revision: 6101
Author:   russblau
Date:     2008-11-15 22:10:55 +0000 (Sat, 15 Nov 2008)

Log Message:
-----------
simpler move_regex (old one got broken by change in UI format)

Modified Paths:
--------------
    trunk/pywikipedia/redirect.py

Modified: trunk/pywikipedia/redirect.py
===================================================================
--- trunk/pywikipedia/redirect.py	2008-11-15 20:54:53 UTC (rev 6100)
+++ trunk/pywikipedia/redirect.py	2008-11-15 22:10:55 UTC (rev 6101)
@@ -276,11 +276,8 @@
     # /w/index.php
     index = re.escape(wikipedia.getSite().path())
     move_regex = re.compile(
-        r'<li>.*?<a href="' + wiki + r'User:.*?>.*?</a> '
-        r'\(<a href="' + wiki + r'User_talk:.*?>Talk</a> \| '
-        r'<a href="' + wiki + r'Special:Contributions/.*?>contribs</a>\) '
-        r'moved <a href="' + index + r'?title=.*?>(.*?)</a> to '
-        r'<a href="' + index + r'.*?>.*?</a>.*?</li>' )
+        r'moved <a href.*?>(.*?)</a> to <a href=.*?>.*?</a>.*?</li>'
+        )
 
     def get_moved_pages_redirects(self):
         '''generate redirects to recently-moved pages'''
@@ -494,7 +491,7 @@
         elif self.action == 'broken':
             self.delete_broken_redirects()
 
-def main():
+def main(*args):
     # read command line parameters
     # what the bot should do (either resolve double redirs, or delete broken
     # redirs)
@@ -511,7 +508,7 @@
     offset = -1
     moved_pages = False
     always = False
-    for arg in wikipedia.handleArgs():
+    for arg in wikipedia.handleArgs(*args):
         if arg == 'double':
             action = 'double'
         elif arg == 'broken':