pywikibot

pywikibot@lists.wikimedia.org

3 participants
6830 discussions

[Pywikipedia-l] SVN: [4330] trunk/pywikipedia/login.py
by wikipedian＠svn.wikimedia.org 19 Sep '07

19 Sep '07

Revision: 4330 Author: wikipedian Date: 2007-09-19 09:02:24 +0000 (Wed, 19 Sep 2007) Log Message: ----------- docu Modified Paths: -------------- trunk/pywikipedia/login.py Modified: trunk/pywikipedia/login.py =================================================================== --- trunk/pywikipedia/login.py 2007-09-19 08:32:23 UTC (rev 4329) +++ trunk/pywikipedia/login.py 2007-09-19 09:02:24 UTC (rev 4330) @@ -95,14 +95,17 @@ else: # No bot policies on other return True - + def getCookie(self, remember=True, captchaId = None, captchaAnswer = None): - """Login to wikipedia. - + """ + Login to the site. + remember Remember login (default: True) - - Returns cookie data if succesful, None otherwise.""" - + captchaId The id number of the captcha, if any + captcha The word displayed in the captcha, if any + + Returns cookie data if succesful, None otherwise. + """ predata = { "wpName": self.username.encode(self.site.encoding()), "wpPassword": self.password, @@ -135,7 +138,7 @@ if m: n += 1 L.append(m.group(1)) - + log_data = [] for Ldata in L: if (re.match('.*_session=.*', Ldata)): @@ -146,7 +149,7 @@ log_data.append(Ldata) elif (re.match('.*Token=.*', Ldata)): log_data.append(Ldata) - + if len(log_data) == 4: return "\n".join(L) elif not captchaAnswer: @@ -182,9 +185,9 @@ (code, family, username, password) or (username, password) to set a default password for an username. Default usernames should occur above specific usernames. - + Example: - + ("my_username", "my_default_password") ("my_sysop_user", "my_sysop_password") ("en", "wikipedia", "my_en_user", "my_en_pass") @@ -220,7 +223,7 @@ wikipedia.output(u"Should be logged in now") return True else: - wikipedia.output(u"Login failed. Wrong password?") + wikipedia.output(u"Login failed. Wrong password or CAPTCHA answer?") if retry: self.password = None return self.login(retry = True)

1 0

[Pywikipedia-l] SVN: [4329] trunk/pywikipedia/userinterfaces/terminal_interface.py
by wikipedian＠svn.wikimedia.org 19 Sep '07

19 Sep '07

Revision: 4329 Author: wikipedian Date: 2007-09-19 08:32:23 +0000 (Wed, 19 Sep 2007) Log Message: ----------- show captcha in web browser Modified Paths: -------------- trunk/pywikipedia/userinterfaces/terminal_interface.py Modified: trunk/pywikipedia/userinterfaces/terminal_interface.py =================================================================== --- trunk/pywikipedia/userinterfaces/terminal_interface.py 2007-09-19 08:19:07 UTC (rev 4328) +++ trunk/pywikipedia/userinterfaces/terminal_interface.py 2007-09-19 08:32:23 UTC (rev 4329) @@ -233,9 +233,10 @@ def askForCaptcha(self, url): try: - import gui - # TODO - raise ImportError + import webbrowser + wikipedia.output(u'Opening CAPTCHA in your web browser...') + webbrowser.open(url) + return wikipedia.input(u'What is the solution of the CAPTCHA that is shown in your web browser?') except ImportError, e: - return wikipedia.input('What is the solution of the CAPTCHA at %s ?' % url) + return wikipedia.input(u'What is the solution of the CAPTCHA at %s ?' % url)

1 0

[Pywikipedia-l] SVN: [4328] trunk/pywikipedia/upload.py
by cosoleto＠svn.wikimedia.org 19 Sep '07

19 Sep '07

Revision: 4328 Author: cosoleto Date: 2007-09-19 08:19:07 +0000 (Wed, 19 Sep 2007) Log Message: ----------- Fix to not download the same file more times when upload_image() is recalled Modified Paths: -------------- trunk/pywikipedia/upload.py Modified: trunk/pywikipedia/upload.py =================================================================== --- trunk/pywikipedia/upload.py 2007-09-19 07:31:22 UTC (rev 4327) +++ trunk/pywikipedia/upload.py 2007-09-19 08:19:07 UTC (rev 4328) @@ -100,21 +100,22 @@ If the upload fails, the user is asked whether to try again or not. If the user chooses not to retry, returns null. """ - # Get file contents - if '://' in self.url: - uo = wikipedia.MyURLopener() - file = uo.open(self.url,"rb") - else: - # Opening local files with MyURLopener would be possible, but we - # don't do it because it only accepts ASCII characters in the - # filename. - file = open(self.url,"rb") - wikipedia.output(u'Reading file %s' % self.url) - contents = file.read() - if contents.find("The requested URL was not found on this server.") != -1: - print "Couldn't download the image." - return - file.close() + if not hasattr(self, "_contents"): + # Get file contents + if '://' in self.url: + uo = wikipedia.MyURLopener() + file = uo.open(self.url) + else: + # Opening local files with MyURLopener would be possible, but we + # don't do it because it only accepts ASCII characters in the + # filename. + file = open(self.url,"rb") + wikipedia.output(u'Reading file %s' % self.url) + self._contents = file.read() + if self._contents.find("The requested URL was not found on this server.") != -1: + print "Couldn't download the image." + return + file.close() # Isolate the pure name filename = self.url if '/' in filename: @@ -197,7 +198,7 @@ response, returned_html = post_multipart(self.targetSite, self.targetSite.upload_address(), formdata.items(), - (('wpUploadFile', encodedFilename, contents),), + (('wpUploadFile', encodedFilename, self._contents),), cookies = self.targetSite.cookies() ) # There are 2 ways MediaWiki can react on success: either it gives @@ -233,6 +234,7 @@ answer = wikipedia.inputChoice(u"You have recevied an upload warning message. Ignore?", ['Yes', 'No'], ['y', 'N'], 'N') if answer in ["y", "Y"]: self.ignoreWarning = 1 + self.keepFilename = True return self.upload_image(debug) else: answer = wikipedia.inputChoice(u'Upload of %s probably failed. Above you see the HTML page which was returned by MediaWiki. Try again?' % filename, ['Yes', 'No'], ['y', 'N'], 'N')

1 0

[Pywikipedia-l] SVN: [4327] trunk/pywikipedia
by wikipedian＠svn.wikimedia.org 19 Sep '07

19 Sep '07

Revision: 4327 Author: wikipedian Date: 2007-09-19 07:31:22 +0000 (Wed, 19 Sep 2007) Log Message: ----------- give the bot operator the chance to solve the login CAPTCHA Modified Paths: -------------- trunk/pywikipedia/family.py trunk/pywikipedia/login.py trunk/pywikipedia/userinterfaces/terminal_interface.py trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2007-09-18 22:24:47 UTC (rev 4326) +++ trunk/pywikipedia/family.py 2007-09-19 07:31:22 UTC (rev 4327) @@ -2516,6 +2516,9 @@ def login_address(self, code): return '%s?title=%s:Userlogin&action=submit' % (self.path(code), self.special_namespace_url(code)) + def captcha_image_address(self, code, id): + return '%s?title=%s:Captcha/image&wpCaptchaId=%s' % (self.path(code), self.special_namespace_url(code), id) + def watchlist_address(self, code): return '%s?title=%s:Watchlist/edit' % (self.path(code), self.special_namespace_url(code)) Modified: trunk/pywikipedia/login.py =================================================================== --- trunk/pywikipedia/login.py 2007-09-18 22:24:47 UTC (rev 4326) +++ trunk/pywikipedia/login.py 2007-09-19 07:31:22 UTC (rev 4327) @@ -96,7 +96,7 @@ # No bot policies on other return True - def getCookie(self, remember=True): + def getCookie(self, remember=True, captchaId = None, captchaAnswer = None): """Login to wikipedia. remember Remember login (default: True) @@ -109,6 +109,9 @@ "wpLoginattempt": "Aanmelden & Inschrijven", # dutch button label seems to work for all wikis "wpRemember": str(int(bool(remember))) } + if captchaId: + predata["wpCaptchaId"] = captchaId + predata["wpCaptchaWord"] = captchaAnswer address = self.site.login_address() if self.site.hostname() in config.authenticate.keys(): @@ -146,9 +149,15 @@ if len(log_data) == 4: return "\n".join(L) + elif not captchaAnswer: + captchaR = re.compile('<input type="hidden" name="wpCaptchaId" id="wpCaptchaId" value="(?P<id>\d+)" />') + match = captchaR.search(data) + if match: + id = match.group('id') + url = self.site.protocol() + '://' + self.site.hostname() + self.site.captcha_image_address(id) + answer = wikipedia.ui.askForCaptcha(url) + return self.getCookie(remember = remember, captchaId = id, captchaAnswer = answer) else: - if '<input type="hidden" name="wpCaptchaId"' in data: - wikipedia.output(u'There is a CAPTCHA in the server\'s response.\nPlease wait a while or log in using a graphical web browser to reset the request and try again.') return None def storecookiedata(self, data): @@ -218,6 +227,9 @@ else: return False + def showCaptchaWindow(self, url): + pass + def main(): username = password = None sysop = False Modified: trunk/pywikipedia/userinterfaces/terminal_interface.py =================================================================== --- trunk/pywikipedia/userinterfaces/terminal_interface.py 2007-09-18 22:24:47 UTC (rev 4326) +++ trunk/pywikipedia/userinterfaces/terminal_interface.py 2007-09-19 07:31:22 UTC (rev 4327) @@ -1,8 +1,8 @@ - __version__ = '$Id$' import config, transliteration import traceback, re, sys +import wikipedia try: import ctypes @@ -230,3 +230,12 @@ return text editor = gui.EditBoxWindow() return editor.edit(text, jumpIndex = jumpIndex, highlight = highlight) + + def askForCaptcha(self, url): + try: + import gui + # TODO + raise ImportError + except ImportError, e: + return wikipedia.input('What is the solution of the CAPTCHA at %s ?' % url) + Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2007-09-18 22:24:47 UTC (rev 4326) +++ trunk/pywikipedia/wikipedia.py 2007-09-19 07:31:22 UTC (rev 4327) @@ -4247,6 +4247,9 @@ def login_address(self): return self.family.login_address(self.lang) + def captcha_image_address(self, id): + return self.family.captcha_image_address(self.lang, id) + def watchlist_address(self): return self.family.watchlist_address(self.lang)

1 0

[Pywikipedia-l] [ pywikipediabot-Bugs-1616771 ] upload.py: ignoreWarnings flag doesn't work
by SourceForge.net 18 Sep '07

18 Sep '07

Bugs item #1616771, was opened at 2006-12-15 23:58 Message generated for change (Comment added) made by cosoleto You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=1616771&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Daniel Herding (wikipedian) Assigned to: Nobody/Anonymous (nobody) Summary: upload.py: ignoreWarnings flag doesn't work Initial Comment: I have added a flag ignoreWarnings for UploadRobot, such that the bot won't just overwrite images. Unfortunatelly it doesn't work yet (images are overwritten nonetheless), and I don't know why. ---------------------------------------------------------------------- Comment By: Francesco Cosoleto (cosoleto) Date: 2007-09-19 00:32 Message: Logged In: YES user_id=181280 Originator: NO Fixed in r4326. ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2007-06-21 18:22 Message: Logged In: NO this bug is still applicable as of 21/06/07 ---------------------------------------------------------------------- Comment By: siebrand (siebrand) Date: 2007-04-26 21:30 Message: Logged In: YES user_id=1107255 Originator: NO Please let us know if this bug report is still applicable to the current code. If no response is given, the bug report will be closed one month from now. This message was added in an effort to reduce the number of open issues on this project. Siebrand ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=1616771&group_…

1 0

[Pywikipedia-l] SVN: [4326] trunk/pywikipedia/upload.py
by cosoleto＠svn.wikimedia.org 18 Sep '07

18 Sep '07

Revision: 4326 Author: cosoleto Date: 2007-09-18 22:24:47 +0000 (Tue, 18 Sep 2007) Log Message: ----------- bug #1616771 fixed "upload.py: ignoreWarnings flag doesn't work" Modified Paths: -------------- trunk/pywikipedia/upload.py Modified: trunk/pywikipedia/upload.py =================================================================== --- trunk/pywikipedia/upload.py 2007-09-18 22:21:56 UTC (rev 4325) +++ trunk/pywikipedia/upload.py 2007-09-18 22:24:47 UTC (rev 4326) @@ -73,7 +73,6 @@ ignoreWarning - Set this to True if you want to upload even if another file would be overwritten or another mistake would be risked. - Attention: This parameter doesn't work yet for unknown reason. """ self.url = url self.urlEncoding = urlEncoding @@ -180,8 +179,6 @@ # This somehow doesn't work. if self.ignoreWarning: formdata["wpIgnoreWarning"] = "1" - else: - formdata["wpIgnoreWarning"] = "0" # try to encode the strings to the encoding used by the target site. # if that's not possible (e.g. because there are non-Latin-1 characters and @@ -231,11 +228,18 @@ pass wikipedia.output(u'%s\n\n' % returned_html) wikipedia.output(u'%i %s' % (response.status, response.reason)) - answer = wikipedia.inputChoice(u'Upload of %s probably failed. Above you see the HTML page which was returned by MediaWiki. Try again?' % filename, ['Yes', 'No'], ['y', 'N'], 'N') - if answer in ["y", "Y"]: - return self.upload_image(debug) + + if self.targetSite.mediawiki_message('uploadwarning') in returned_html: + answer = wikipedia.inputChoice(u"You have recevied an upload warning message. Ignore?", ['Yes', 'No'], ['y', 'N'], 'N') + if answer in ["y", "Y"]: + self.ignoreWarning = 1 + return self.upload_image(debug) else: - return + answer = wikipedia.inputChoice(u'Upload of %s probably failed. Above you see the HTML page which was returned by MediaWiki. Try again?' % filename, ['Yes', 'No'], ['y', 'N'], 'N') + if answer in ["y", "Y"]: + return self.upload_image(debug) + else: + return return filename def run(self):

1 0

[Pywikipedia-l] SVN: [4325] trunk/pywikipedia/families/wikipedia_family.py
by siebrand＠svn.wikimedia.org 18 Sep '07

18 Sep '07

Revision: 4325 Author: siebrand Date: 2007-09-18 22:21:56 +0000 (Tue, 18 Sep 2007) Log Message: ----------- Update wikipedia_family.py Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2007-09-18 19:59:01 UTC (rev 4324) +++ trunk/pywikipedia/families/wikipedia_family.py 2007-09-18 22:21:56 UTC (rev 4325) @@ -97,7 +97,6 @@ self.namespaces[5] = { '_default': [u'Wikipedia talk', self.namespaces[5]['_default']], 'ab': u'Обсуждение Wikipedia', - 'af': u'WikipediaBespreking', 'af': u'Wikipediabespreking', 'als': u'Wikipedia Diskussion', 'an': u'Descusión Wikipedia', @@ -108,9 +107,7 @@ 'az': u'Vikipediya müzakirəsi', 'ba': u'Wikipedia б-са фекер алышыу', 'bar': u'Wikipedia Diskussion', - 'bat-smg': u'Wikipedia aptarimas', 'be': u'Вікіпедыя размовы', - 'be-x-old': u'Абмеркаваньне Вікіпэдыя', 'bg': u'Уикипедия беседа', 'bm': u'Discussion Wikipedia', 'bn': u'উইকিপেডিয়া আলাপ', @@ -132,8 +129,8 @@ 'et': u'Vikipeedia arutelu', 'eu': u'Wikipedia eztabaida', 'fa': u'بحث ویکی‌پدیا', + 'ff': u'Discussion Wikipedia', 'fi': u'Keskustelu Wikipediasta', - 'fiu-vro': u'Wikipedia arotus', 'fo': u'Wikipedia kjak', 'fr': u'Discussion Wikipédia', 'frp': u'Discussion Vouiquipèdia', @@ -160,7 +157,7 @@ 'kk': u'Уикипедия талқылауы', 'kn': u'Wikipedia ಚರ್ಚೆ', 'ko': u'위키백과토론', - 'ksh':u'Wikipedia Klaaf', + 'ksh': u'Wikipedia Klaaf', 'ku': u'Wîkîpediya nîqaş', 'kv': u'Обсуждение Wikipedia', 'la': u'Disputatio Vicipaediae', @@ -176,7 +173,6 @@ 'nah': u'Wikipedia Discusión', 'nap': u'Discussioni Wikipedia', 'nds': u'Wikipedia Diskuschoon', - 'nds-nl': u'Overleg Wikipedie', 'new': u'विकिपिडिया खँलाबँला', 'nl': u'Overleg Wikipedia', 'nn': u'Wikipedia-diskusjon', @@ -186,14 +182,15 @@ 'os': u'Дискусси Wikipedia', 'pa': u'ਵਿਕਿਪੀਡਿਆ ਚਰਚਾ', 'pl': u'Dyskusja Wikipedii', - 'pms':u'Discussion ant sla Wikipedia', + 'pms': u'Discussion ant sla Wikipedia', 'pt': u'Wikipedia Discussão', 'qu': u'Wikipedia Discusión', - 'rmy':u'Vikipidiyake vakyarimata', + 'rmy': u'Vikipidiyake vakyarimata', 'ro': u'Discuţie Wikipedia', 'ru': u'Обсуждение Википедии', 'sa': u'Wikipediaसंभाषणं', 'sc': u'Wikipedia discussioni', + 'scn': u'Discussioni Wikipedia', 'sk': u'Diskusia k Wikipédii', 'sl': u'Pogovor o Wikipediji', 'sq': u'Wikipedia diskutim', @@ -211,7 +208,7 @@ 'uk': u'Обговорення Вікіпедії', 'ur': u'تبادلۂ خیال منصوبہ', 'uz': u'Vikipediya munozarasi', - 'vec':u'Discussion Wikipedia', + 'vec': u'Discussion Wikipedia', 'vi': u'Thảo luận Wikipedia', 'vls': u'Discuusje Wikipedia', 'vo': u'Bespik dö Vükiped',

1 0

[Pywikipedia-l] [ pywikipediabot-Bugs-1797503 ] category.py
by SourceForge.net 18 Sep '07

18 Sep '07

Bugs item #1797503, was opened at 2007-09-19 00:05 Message generated for change (Tracker Item Submitted) made by Item Submitter You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=1797503&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: DarkoNeko (darkoneko) Assigned to: Nobody/Anonymous (nobody) Summary: category.py Initial Comment: evt : cmd.exe on windows XP family edition command used : C:\Program Files\TortoiseSVN\pywikipedia>python category.py move -from:"Cumuni di Sicilia" -to:"Cumuna di Sicilia" -lang:co error message : There are more articles in Category:Cumuni di Sicilia. Getting [[Category:Cumuni di Sicilia]] starting at Mistirjancu" class="new... Changing page [[co:Longi]] WARNING: No character set found. Category page detection is not bug free. Please report this error! substring not found Changing page [[co:Lucca Sicula]] (a few other pages) Changing page [[co:Marineu]] Getting [[Category:Cumuni di Sicilia]]... There are more articles in Category:Cumuni di Sicilia. Getting [[Category:Cumuni di Sicilia]] starting at Vita+%28Sicilia%29" class="ne w... WARNING: No character set found. Category page detection is not bug free. Please report this error! Dumping to category.dump.bz2, please wait... Traceback (most recent call last): File "category.py", line 832, in <module> bot.run() File "category.py", line 365, in run subcategories = self.oldCat.subcategoriesList(recurse = False) File "C:\Program Files\TortoiseSVN\pywikipedia\catlib.py", line 298, in subcat egoriesList for cat in self.subcategories(recurse): File "C:\Program Files\TortoiseSVN\pywikipedia\catlib.py", line 284, in subcat egories for tag, subcat in self._getContentsAndSupercats(recurse): File "C:\Program Files\TortoiseSVN\pywikipedia\catlib.py", line 124, in _getCo ntentsAndSupercats for tag, page in self._parseCategory(purge, startFrom): File "C:\Program Files\TortoiseSVN\pywikipedia\catlib.py", line 204, in _parse Category ibegin = txt.index('') # does not work for cats withou t text ValueError: substring not found apparently an error when recovering the page list. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=1797503&group_…

1 0

[Pywikipedia-l] SVN: [4324] trunk/pywikipedia/wikipedia.py
by russblau＠svn.wikimedia.org 18 Sep '07

18 Sep '07

Revision: 4324 Author: russblau Date: 2007-09-18 19:59:01 +0000 (Tue, 18 Sep 2007) Log Message: ----------- bugfix; replaceCategoryInPlace wouldn't replace cats that included sort keys Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2007-09-18 19:51:42 UTC (rev 4323) +++ trunk/pywikipedia/wikipedia.py 2007-09-18 19:59:01 UTC (rev 4324) @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- """ Library to get and put pages on a MediaWiki. @@ -2926,17 +2926,18 @@ # title might not be formatted correctly on the wiki if title[0].isalpha() and not site.nocapitalize: title = "[%s%s]" % (title[0].upper(), title[0].lower()) + title[1:] - categoryR = re.compile(r'\[\[\s*(%s)\s*:\s*%s\s*\]\]' - % (catNamespace, title)) + categoryR = re.compile(r'\[\[\s*(%s)\s*:\s*%s\s*((?:\|[^]]+)?\]\])' + % (catNamespace, title.replace(' ','[ _]+'))) if newcat is None: - text = replaceExcept(oldtext, categoryR, '', ['nowiki', 'comment', 'math', 'pre']) + text = replaceExcept(oldtext, categoryR, '', ['nowiki', 'comment', 'math', 'pre']) else: - text = replaceExcept(oldtext, categoryR, '[[Category:%s]]' % newcat.titleWithoutNamespace(), ['nowiki', 'comment', 'math', 'pre']) - categoryR = re.compile(r'\[\[\s*(%s)\s*:%s\]\]' % (catNamespace, oldcat.titleWithoutNamespace().replace(' ','_'))) - if newcat is None: - text = replaceExcept(text, categoryR, '', ['nowiki', 'comment', 'math', 'pre']) - else: - text = replaceExcept(text, categoryR, '[[Category:%s]]' % newcat.titleWithoutNamespace(), ['nowiki', 'comment', 'math', 'pre']) + text = replaceExcept(oldtext, categoryR, '[[Category:%s\\2' % newcat.titleWithoutNamespace(), ['nowiki', 'comment', 'math', 'pre']) +## categoryR = re.compile(r'\[\[\s*(%s)\s*:\s*%s\s*(\|[^]]+)?\]\]' +## % (catNamespace, title.replace(' ','_'))) +## if newcat is None: +## text = replaceExcept(text, categoryR, '', ['nowiki', 'comment', 'math', 'pre']) +## else: +## text = replaceExcept(text, categoryR, '[[Category:%s\\2' % newcat.titleWithoutNamespace(), ['nowiki', 'comment', 'math', 'pre']) return text def replaceCategoryLinks(oldtext, new, site = None):

1 0

[Pywikipedia-l] SVN: [4323] trunk/pywikipedia/category.py
by russblau＠svn.wikimedia.org 18 Sep '07

18 Sep '07

Revision: 4323 Author: russblau Date: 2007-09-18 19:51:42 +0000 (Tue, 18 Sep 2007) Log Message: ----------- clean up docstring; use shortpath Modified Paths: -------------- trunk/pywikipedia/category.py Modified: trunk/pywikipedia/category.py =================================================================== --- trunk/pywikipedia/category.py 2007-09-18 16:30:40 UTC (rev 4322) +++ trunk/pywikipedia/category.py 2007-09-18 19:51:42 UTC (rev 4323) @@ -6,12 +6,12 @@ Syntax: python category.py action [-option] where action can be one of these: - * add - mass-add a category to a list of pages - * remove - remove category tag from all pages in a category - * move - move all pages in a category to another category - * tidy - tidy up a category by moving its articles into subcategories - * tree - show a tree of subcategories of a given category - * listify - make a list of all of the articles that are in a category + * add - mass-add a category to a list of pages + * remove - remove category tag from all pages in a category + * move - move all pages in a category to another category + * tidy - tidy up a category by moving its articles into subcategories + * tree - show a tree of subcategories of a given category + * listify - make a list of all of the articles that are in a category and option can be one of these: * -person - sort persons by their last name (for action 'add') @@ -21,36 +21,40 @@ Also, the category to make a list of in the listify option * -to: - The category to move to (for the move option) - Also, the name of the list to make in the listify option - NOTE: If the category names have spaces in them you may need to use a - special syntax in your shell so that the names aren't treated as separate - parameters. For instance, in BASH, use single quotes, e.g. -from:'Polar bears' - * -batch - Don't prompt to delete emptied categories (do it automatically). + NOTE: If the category names have spaces in them you may need to use + a special syntax in your shell so that the names aren't treated as + separate parameters. For instance, in BASH, use single quotes, + e.g. -from:'Polar bears' + * -batch - Don't prompt to delete emptied categories (do it + automatically). * -summary: - Pick a custom edit summary for the bot. * -inplace - Use this flag to change categories in place rather than rearranging them. * -delsum - An option for remove, this specifies to use the custom edit - summary as the deletion reason (rather than a canned deletion reason) - * -overwrite - An option for listify, this overwrites the current page with the - list even if something is already there. - * -showimages - An option for listify, this displays images rather than linking them - in the list. - * -talkpages - An option for listify, this outputs the links to talk pages of the - pages to be listified in addition to the pages themselves. + summary as the deletion reason (rather than a canned + deletion reason) + * -overwrite - An option for listify, this overwrites the current page with + the list even if something is already there. + * -showimages - An option for listify, this displays images rather than + linking them in the list. + * -talkpages - An option for listify, this outputs the links to talk pages + of the pages to be listified in addition to the pages + themselves. * -recurse - Recurse through all subcategories of categories. - * -match - Only work on pages whose titles match the given regex (for move and remove actions). + * -match - Only work on pages whose titles match the given regex (for + move and remove actions). +For the actions tidy and tree, the bot will store the category structure +locally in category.dump. This saves time and server load, but if it uses +these data later, they may be outdated; use the -rebuild parameter in this +case. -For the actions tidy and tree, the bot will store the category structure locally -in category.dump. This saves time and server load, but if it uses these data -later, they may be outdated; use the -rebuild parameter in this case. - For example, to create a new category from a list of persons, type: python category.py add -person and follow the on-screen instructions. - Or to do it all from the command-line, use the following syntax: python category.py move -from:US -to:'United States' @@ -158,7 +162,8 @@ if not os.path.isabs(filename): filename = wikipedia.datafilepath(filename) f = bz2.BZ2File(filename, 'r') - wikipedia.output(u'Reading dump from %s' % filename) + wikipedia.output(u'Reading dump from %s' + % wikipedia.shortpath(filename)) databases = pickle.load(f) f.close() # keys are categories, values are 2-tuples with lists as entries. @@ -223,7 +228,8 @@ ''' if not os.path.isabs(filename): filename = wikipedia.datafilepath(filename) - wikipedia.output(u'Dumping to %s, please wait...' % filename) + wikipedia.output(u'Dumping to %s, please wait...' + % wikipedia.shortpath(filename)) f = bz2.BZ2File(filename, 'w') databases = { 'catContentDB': self.catContentDB,

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

pywikibot