Pywikipedia-l February 2009

pywikipedia-l@lists.wikimedia.org

22 participants
230 discussions

SVN: [6430] branches/rewrite/pywikibot/userinterfaces/terminal_interface.py
by nicdumz＠svn.wikimedia.org 23 Feb '09

23 Feb '09

Revision: 6430 Author: nicdumz Date: 2009-02-23 15:14:27 +0000 (Mon, 23 Feb 2009) Log Message: ----------- Adding a write RLock so that no concurrent output() are written to the terminal when input() has written the prompt and is waiting for user input. Tested: * that this output lock is process independant. A waiting input() in a process doesn't stop a output() in another one. (!!) * in replace.py with manual check of edits, checked behavior of input & output, + concurrent properties (i.e. made sure that output() from the async_put thread waits for termination of the main process input() asking for "put changes ? [y/n/q]") Modified Paths: -------------- branches/rewrite/pywikibot/userinterfaces/terminal_interface.py Modified: branches/rewrite/pywikibot/userinterfaces/terminal_interface.py =================================================================== --- branches/rewrite/pywikibot/userinterfaces/terminal_interface.py 2009-02-23 14:50:57 UTC (rev 6429) +++ branches/rewrite/pywikibot/userinterfaces/terminal_interface.py 2009-02-23 15:14:27 UTC (rev 6430) @@ -9,6 +9,7 @@ import traceback, re, sys import logging +import threading import pywikibot from pywikibot import config from pywikibot.userinterfaces import transliteration @@ -115,6 +116,7 @@ class UI: def __init__(self): + self.writelock = threading.RLock() pass def printColorizedInUnix(self, text, level): @@ -227,7 +229,12 @@ prev = transliterated[-1:] prevchar = char text = u"".join(transliteratedText) - self.printColorized(text, level) + + self.writelock.acquire() + try: + self.printColorized(text, level) + finally: + self.writelock.release() def input(self, question, password = False): """ @@ -240,12 +247,21 @@ # sound the terminal bell to notify the user if config.ring_bell: sys.stdout.write('\07') + + # While we're waiting for user input, + # we don't want terminal writes from other Threads + self.writelock.acquire() self.output(question + ' ', level=pywikibot.INPUT) - if password: - import getpass - text = getpass.getpass('') - else: - text = raw_input() + + try: + if password: + import getpass + text = getpass.getpass('') + else: + text = raw_input() + finally: + self.writelock.release() + text = unicode(text, config.console_encoding) return text @@ -265,15 +281,30 @@ options[i] = '%s[%s]%s' % (option[:pos], caseHotkey, option[pos+1:]) else: options[i] = '%s [%s]' % (option, caseHotkey) - # loop until the user entered a valid choice - while True: - prompt = '%s (%s)' % (question, ', '.join(options)) - answer = self.input(prompt) - if answer.lower() in hotkeys or answer.upper() in hotkeys: - return answer - elif default and answer=='': # empty string entered - return default + + answer = '' + # While we're waiting for user input, + # we don't want terminal writes from other Threads + self.writelock.acquire() + try: + # loop until the user entered a valid choice + while True: + prompt = '%s (%s)' % (question, ', '.join(options)) + + # it's okay to enter input with the lock, RLock is reentrant. + answer = self.input(prompt) + if answer.lower() in hotkeys or answer.upper() in hotkeys: + break + elif default and answer=='': # empty string entered + answer = default + break + finally: + self.writelock.release() + return answer + + + def editText(self, text, jumpIndex = None, highlight = None): """ Uses a Tkinter edit box because we don't have a console editor @@ -294,9 +325,9 @@ def askForCaptcha(self, url): try: import webbrowser - wikipedia.output(u'Opening CAPTCHA in your web browser...') + pywikibot.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?') + return pywikibot.input(u'What is the solution of the CAPTCHA that is shown in your web browser?') except: - wikipedia.output(u'Error in opening web browser: %s' % sys.exc_info()[0]) - return wikipedia.input(u'What is the solution of the CAPTCHA at %s ?' % url) + pywikibot.output(u'Error in opening web browser: %s' % sys.exc_info()[0]) + return pywikibot.input(u'What is the solution of the CAPTCHA at %s ?' % url)

1 0

[ pywikipediabot-Bugs-2630322 ] pywikibot.input before pywikibot.handleArgs
by SourceForge.net 23 Feb '09

23 Feb '09

Bugs item #2630322, was opened at 2009-02-23 09:41 Message generated for change (Comment added) made by russblau You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=2630322&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: rewrite Group: None >Status: Closed >Resolution: Fixed Priority: 5 Private: No Submitted By: NicDumZ — Nicolas Dumazet (nicdumz) Assigned to: Russell Blau (russblau) Summary: pywikibot.input before pywikibot.handleArgs Initial Comment: TestCase #2: import pywikibot goodbye = pywikibot.input('Hello ?') print 'read: ' + goodbye Result : goodbye read: goodbye $ Comment: Expected "Hello ?" input prompt is not printed TestCase #2 import pywikibot pywikibot.handleArgs() goodbye = pywikibot.input('Hello ?') print 'read: 'goodbye Result: Hello ? goodbye read: goodbye $ Comment: Works fine. This behavior is a bit surprising. Sometimes scripts won't use any arguments: no reason for .handleArgs() to be called... ever :) ---------------------------------------------------------------------- >Comment By: Russell Blau (russblau) Date: 2009-02-23 09:52 Message: fixed in r6429 ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=2630322&group_…

1 0

SVN: [6429] branches/rewrite/pywikibot/bot.py
by russblau＠svn.wikimedia.org 23 Feb '09

23 Feb '09

Revision: 6429 Author: russblau Date: 2009-02-23 14:50:57 +0000 (Mon, 23 Feb 2009) Log Message: ----------- fix bug 2630322, also add some comments Modified Paths: -------------- branches/rewrite/pywikibot/bot.py Modified: branches/rewrite/pywikibot/bot.py =================================================================== --- branches/rewrite/pywikibot/bot.py 2009-02-23 11:01:43 UTC (rev 6428) +++ branches/rewrite/pywikibot/bot.py 2009-02-23 14:50:57 UTC (rev 6429) @@ -15,12 +15,10 @@ import logging, logging.handlers + # all output goes thru python std library "logging" module import os.path import sys -import pywikibot -from pywikibot import config - # logging levels logger = logging.getLogger("bot") @@ -29,7 +27,10 @@ VERBOSE = 18 INPUT = 25 +import pywikibot +from pywikibot import config + class MaxLevelFilter(logging.Filter): """Filter that only passes records at or below a specific level. @@ -134,20 +135,20 @@ """ # make sure logging system has been initialized - root = pywikibot.logging.getLogger() + root = logging.getLogger() if root.level == 30: # init_handlers sets this level init_handlers() if decoder: text = unicode(text, decoder) - elif type(text) is not unicode: + elif not isinstance(text, unicode): ## import traceback ## pywikibot.output( ## u"Non-unicode (%s) passed to wikipedia.output without decoder!\n" ## % type(text), ## level=VERBOSE ## ) - if type(text) is not str: + if not isinstance(text, str): # looks like text is a non-text object. # Maybe it has a __unicode__ builtin ? # (allows to print Page, Site...) @@ -175,6 +176,11 @@ Returns a unicode string. """ + # make sure logging system has been initialized + root = logging.getLogger() + if root.level == 30: # init_handlers sets this level + init_handlers() + data = ui.input(question, password) return data @@ -196,6 +202,11 @@ Returns a one-letter string in lowercase. """ + # make sure logging system has been initialized + root = logging.getLogger() + if root.level == 30: # init_handlers sets this level + init_handlers() + data = ui.inputChoice(question, answers, hotkeys, default).lower() return data

1 0

[ pywikipediabot-Bugs-2630322 ] pywikibot.input before pywikibot.handleArgs
by SourceForge.net 23 Feb '09

23 Feb '09

Bugs item #2630322, was opened at 2009-02-23 15:41 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=2630322&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: rewrite Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: NicDumZ — Nicolas Dumazet (nicdumz) Assigned to: Russell Blau (russblau) Summary: pywikibot.input before pywikibot.handleArgs Initial Comment: TestCase #2: import pywikibot goodbye = pywikibot.input('Hello ?') print 'read: ' + goodbye Result : goodbye read: goodbye $ Comment: Expected "Hello ?" input prompt is not printed TestCase #2 import pywikibot pywikibot.handleArgs() goodbye = pywikibot.input('Hello ?') print 'read: 'goodbye Result: Hello ? goodbye read: goodbye $ Comment: Works fine. This behavior is a bit surprising. Sometimes scripts won't use any arguments: no reason for .handleArgs() to be called... ever :) ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=603138&aid=2630322&group_…

1 0

SVN: [6428] branches/rewrite/pywikibot
by nicdumz＠svn.wikimedia.org 23 Feb '09

23 Feb '09

Revision: 6428 Author: nicdumz Date: 2009-02-23 11:01:43 +0000 (Mon, 23 Feb 2009) Log Message: ----------- Replacing deprecated calls by their equivalents. Modified Paths: -------------- branches/rewrite/pywikibot/login.py branches/rewrite/pywikibot/scripts/category.py branches/rewrite/pywikibot/scripts/solve_disambiguation.py branches/rewrite/pywikibot/textlib.py Modified: branches/rewrite/pywikibot/login.py =================================================================== --- branches/rewrite/pywikibot/login.py 2009-02-23 09:50:54 UTC (rev 6427) +++ branches/rewrite/pywikibot/login.py 2009-02-23 11:01:43 UTC (rev 6428) @@ -249,7 +249,7 @@ for lang in namedict[familyName].iterkeys(): try: site = pywikibot.getSite(code=lang, fam=familyName) - if not forceLogin and site.loggedInAs(sysop = sysop) != None: + if not forceLogin and (site.logged_in(sysop) and site.user()) != None: pywikibot.output(u'Already logged in on %(site)s' % locals()) else: Modified: branches/rewrite/pywikibot/scripts/category.py =================================================================== --- branches/rewrite/pywikibot/scripts/category.py 2009-02-23 09:50:54 UTC (rev 6427) +++ branches/rewrite/pywikibot/scripts/category.py 2009-02-23 11:01:43 UTC (rev 6428) @@ -254,11 +254,11 @@ if self.catContentDB.has_key(supercat): return self.catContentDB[supercat][0] else: - subcatlist = supercat.subcategoriesList() - articlelist = supercat.articlesList() + subcatset = set(supercat.subcategories()) + articleset = set(supercat.articles()) # add to dictionary - self.catContentDB[supercat] = (subcatlist, articlelist) - return subcatlist + self.catContentDB[supercat] = (subcatset, articleset) + return subcatset def getArticles(self, cat): ''' @@ -270,21 +270,21 @@ if self.catContentDB.has_key(cat): return self.catContentDB[cat][1] else: - subcatlist = cat.subcategoriesList() - articlelist = cat.articlesList() + subcatset = set(cat.subcategories()) + articleset = set(cat.articles()) # add to dictionary - self.catContentDB[cat] = (subcatlist, articlelist) - return articlelist + self.catContentDB[cat] = (subcatset, articleset) + return articleset def getSupercats(self, subcat): # if we already know which subcategories exist here if self.superclassDB.has_key(subcat): return self.superclassDB[subcat] else: - supercatlist = subcat.supercategoriesList() + supercatset = set(subcat.categories()) # add to dictionary - self.superclassDB[subcat] = supercatlist - return supercatlist + self.superclassDB[subcat] = supercatset + return supercatset def dump(self, filename = 'category.dump.bz2'): ''' @@ -524,14 +524,14 @@ self.recurse = recurse def run(self): - listOfArticles = self.cat.articlesList(recurse = self.recurse) + setOfArticles = set(self.cat.articles(recurse = self.recurse)) if self.subCats: - listOfArticles += self.cat.subcategoriesList() + setOfArticles += set(self.cat.subcategories()) if not self.editSummary: - self.editSummary = pywikibot.translate(self.site, self.listify_msg) % (self.cat.title(), len(listOfArticles)) + self.editSummary = pywikibot.translate(self.site, self.listify_msg) % (self.cat.title(), len(setOfArticles)) listString = "" - for article in listOfArticles: + for article in setOfArticles: if (not article.isImage() or self.showImages) and not article.isCategory(): if self.talkPages and not article.isTalkPage(): listString = listString + "*[[%s]] -- [[%s|talk]]\n" % (article.title(), article.toggleTalkPage().title()) @@ -616,7 +616,7 @@ self.editSummary = pywikibot.translate(self.site, self.msg_remove) % self.cat.title() def run(self): - articles = self.cat.articlesList(recurse = 0) + articles = set(self.cat.articles()) if len(articles) == 0: pywikibot.output(u'There are no articles in category %s' % self.cat.title()) else: @@ -624,7 +624,7 @@ if not self.titleRegex or re.search(self.titleRegex,article.title()): catlib.change_category(article, self.cat, None, comment = self.editSummary, inPlace = self.inPlace) # Also removes the category tag from subcategories' pages - subcategories = self.cat.subcategoriesList(recurse = 0) + subcategories = set(self.cat.subcategories()) if len(subcategories) == 0: pywikibot.output(u'There are no subcategories in category %s' % self.cat.title()) else: @@ -782,7 +782,7 @@ def run(self): cat = catlib.Category(pywikibot.Link('Category:' + self.catTitle)) - articles = cat.articlesList(recurse = False) + articles = set(cat.articles()) if len(articles) == 0: pywikibot.output(u'There are no articles in category ' + catTitle) else: Modified: branches/rewrite/pywikibot/scripts/solve_disambiguation.py =================================================================== --- branches/rewrite/pywikibot/scripts/solve_disambiguation.py 2009-02-23 09:50:54 UTC (rev 6427) +++ branches/rewrite/pywikibot/scripts/solve_disambiguation.py 2009-02-23 11:01:43 UTC (rev 6428) @@ -452,7 +452,7 @@ self.ignorelist = [] filename = config.datafilepath( 'disambiguations', - self.disambPage.titleForFilename() + '.txt') + self.disambPage.title(asFilename=True) + '.txt') try: # The file is stored in the disambiguation/ subdir. # Create if necessary. @@ -469,18 +469,18 @@ pass def isIgnored(self, refPage): - return self.enabled and refPage.urlname() in self.ignorelist + return self.enabled and refPage.title(asUrl=True) in self.ignorelist def ignore(self, refPage): if self.enabled: # Skip this occurence next time. filename = config.datafilepath( 'disambiguations', - self.disambPage.urlname() + '.txt') + self.disambPage.title(asUrl=True) + '.txt') try: # Open file for appending. If none exists yet, create a new one. f = codecs.open(filename, 'a', 'utf-8') - f.write(refPage.urlname() + '\n') + f.write(refPage.title(asUrl=True) + '\n') f.close() except IOError: pass Modified: branches/rewrite/pywikibot/textlib.py =================================================================== --- branches/rewrite/pywikibot/textlib.py 2009-02-23 09:50:54 UTC (rev 6427) +++ branches/rewrite/pywikibot/textlib.py 2009-02-23 11:01:43 UTC (rev 6428) @@ -421,8 +421,8 @@ link = links[site].title(asLink=True, forceInterwiki=True) s.append(link) except AttributeError: - s.append(pywikibot.getSite(site).linkto(links[site], - othersite=insite)) + s.append(pywikibot.Link(links[site], \ + pywikibot.getSite(site)).astext(insite)) if insite.lang in insite.family.interwiki_on_one_line: sep = u' ' else:

1 0

SVN: [6427] branches/rewrite/pywikibot
by nicdumz＠svn.wikimedia.org 23 Feb '09

23 Feb '09

Revision: 6427 Author: nicdumz Date: 2009-02-23 09:50:54 +0000 (Mon, 23 Feb 2009) Log Message: ----------- Converting Page.aslink(..) calls to Page.title(asLink=True, ...) calls Modified Paths: -------------- branches/rewrite/pywikibot/pagegenerators.py branches/rewrite/pywikibot/scripts/category.py branches/rewrite/pywikibot/scripts/replace.py branches/rewrite/pywikibot/scripts/touch.py branches/rewrite/pywikibot/textlib.py Modified: branches/rewrite/pywikibot/pagegenerators.py =================================================================== --- branches/rewrite/pywikibot/pagegenerators.py 2009-02-23 09:35:21 UTC (rev 6426) +++ branches/rewrite/pywikibot/pagegenerators.py 2009-02-23 09:50:54 UTC (rev 6427) @@ -940,7 +940,7 @@ site = pywikibot.Site() fd = date.FormatDate(site) firstPage = pywikibot.Page(site, fd(startMonth, 1)) - pywikibot.output(u"Starting with %s" % firstPage.aslink()) + pywikibot.output(u"Starting with %s" % firstPage.title(asLink=True)) for month in xrange(startMonth, endMonth+1): for day in xrange(1, date.getNumberOfDaysInMonth(month)+1): yield pywikibot.Page(pywikibot.Link(fd(month, day), site)) Modified: branches/rewrite/pywikibot/scripts/category.py =================================================================== --- branches/rewrite/pywikibot/scripts/category.py 2009-02-23 09:35:21 UTC (rev 6426) +++ branches/rewrite/pywikibot/scripts/category.py 2009-02-23 09:50:54 UTC (rev 6427) @@ -357,7 +357,7 @@ answer = '' while answer not in ('y','n','a'): - answer = pywikibot.input(u'%s [y/n/a(ll)]:' % (page.aslink())) + answer = pywikibot.input(u'%s [y/n/a(ll)]:' % (page.title(asLink=True))) if answer == 'a': confirm = '' while confirm not in ('y','n'): @@ -397,7 +397,7 @@ pywikibot.output(u"%s is already in %s." % (page.title(), catpl.title())) else: - pywikibot.output(u'Adding %s' % catpl.aslink()) + pywikibot.output(u'Adding %s' % catpl.title(asLink=True)) cats.append(catpl) text = page.get() text = pywikibot.replaceCategoryLinks(text, cats) Modified: branches/rewrite/pywikibot/scripts/replace.py =================================================================== --- branches/rewrite/pywikibot/scripts/replace.py 2009-02-23 09:35:21 UTC (rev 6426) +++ branches/rewrite/pywikibot/scripts/replace.py 2009-02-23 09:50:54 UTC (rev 6427) @@ -353,30 +353,30 @@ if self.isTitleExcepted(page.title()): pywikibot.output( u'Skipping %s because the title is on the exceptions list.' - % page.aslink()) + % page.title(asLink=True)) continue try: # Load the page's text from the wiki original_text = page.get(get_redirect=True) if not page.canBeEdited(): pywikibot.output(u"You can't edit page %s" - % page.aslink()) + % page.title(asLink=True)) continue except pywikibot.NoPage: - pywikibot.output(u'Page %s not found' % page.aslink()) + pywikibot.output(u'Page %s not found' % page.title(asLink=True)) continue new_text = original_text while True: if self.isTextExcepted(new_text): pywikibot.output( u'Skipping %s because it contains text that is on the exceptions list.' - % page.aslink()) + % page.title(asLink=True)) break new_text = self.doReplacements(new_text) if new_text.strip().replace('\r\n', '\n' ) == original_text.strip().replace('\r\n', '\n'): pywikibot.output(u'No changes were necessary in %s' - % page.aslink()) + % page.title(asLink=True)) break if self.recursive: newest_text = self.doReplacements(new_text) Modified: branches/rewrite/pywikibot/scripts/touch.py =================================================================== --- branches/rewrite/pywikibot/scripts/touch.py 2009-02-23 09:35:21 UTC (rev 6426) +++ branches/rewrite/pywikibot/scripts/touch.py 2009-02-23 09:50:54 UTC (rev 6427) @@ -39,14 +39,14 @@ text = page.get(get_redirect = self.touch_redirects) page.save("Pywikibot touch script") except pywikibot.NoPage: - pywikibot.output(u"Page %s does not exist?!" % page.aslink(), + pywikibot.output(u"Page %s does not exist?!" % page.title(asLink=True), level=pywikibot.ERROR) except pywikibot.IsRedirectPage: pywikibot.output(u"Page %s is a redirect; skipping." - % page.aslink(), + % page.title(asLink=True), level=pywikibot.WARNING) except pywikibot.LockedPage: - pywikibot.output(u"Page %s is locked?!" % page.aslink(), + pywikibot.output(u"Page %s is locked?!" % page.title(asLink=True), level=pywikibot.ERROR) Modified: branches/rewrite/pywikibot/textlib.py =================================================================== --- branches/rewrite/pywikibot/textlib.py 2009-02-23 09:35:21 UTC (rev 6426) +++ branches/rewrite/pywikibot/textlib.py 2009-02-23 09:50:54 UTC (rev 6427) @@ -418,7 +418,7 @@ s = [] for site in ar: try: - link = links[site].aslink(forceInterwiki=True) + link = links[site].title(asLink=True, forceInterwiki=True) s.append(link) except AttributeError: s.append(pywikibot.getSite(site).linkto(links[site], @@ -633,7 +633,7 @@ return '' if insite is None: insite = pywikibot.getSite() - catLinks = [category.aslink(noInterwiki = True) for category in categories] + catLinks = [category.title(asLink=True, noInterwiki = True) for category in categories] if insite.category_on_one_line(): sep = ' ' else:

1 0

SVN: [6426] branches/rewrite/pywikibot
by nicdumz＠svn.wikimedia.org 23 Feb '09

23 Feb '09

Revision: 6426 Author: nicdumz Date: 2009-02-23 09:35:21 +0000 (Mon, 23 Feb 2009) Log Message: ----------- Using Link() to construct links from scraped wikitext. Deprecating @insite Category() argument, site Page's @insite is Modified Paths: -------------- branches/rewrite/pywikibot/page.py branches/rewrite/pywikibot/textlib.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2009-02-23 09:22:34 UTC (rev 6425) +++ branches/rewrite/pywikibot/page.py 2009-02-23 09:35:21 UTC (rev 6426) @@ -1325,7 +1325,8 @@ class Category(Page): """A page in the Category: namespace""" - def __init__(self, source, title=u"", insite=None, sortKey=None): + @deprecate_arg("insite", None) + def __init__(self, source, title=u"", sortKey=None): """All parameters are the same as for Page() constructor. """ Modified: branches/rewrite/pywikibot/textlib.py =================================================================== --- branches/rewrite/pywikibot/textlib.py 2009-02-23 09:22:34 UTC (rev 6425) +++ branches/rewrite/pywikibot/textlib.py 2009-02-23 09:35:21 UTC (rev 6426) @@ -299,13 +299,7 @@ pagetitle = pagetitle[:pagetitle.index('|')] # we want the actual page objects rather than the titles site = insite.getSite(code = lang) - try: - result[site] = pywikibot.Page(site, pagetitle, insite = insite) - except InvalidTitle: - output( - u"[getLanguageLinks] Text contains invalid interwiki link [[%s:%s]]." - % (lang, pagetitle)) - continue + result[site] = pywikibot.Page(pywikibot.Link(pagetitle, site)) return result @@ -483,9 +477,10 @@ r'(?:\|(?P<sortKey>.+?))?\s*\]\]' % catNamespace, re.I) for match in R.finditer(text): - cat = pywikibot.Category(site, + cat = pywikibot.Category(pywikibot.Link( '%s:%s' % (match.group('namespace'), match.group('catName')), + site), sortKey = match.group('sortKey')) result.append(cat) return result

1 0

SVN: [6425] branches/rewrite/pywikibot/site.py
by nicdumz＠svn.wikimedia.org 23 Feb '09

23 Feb '09

Revision: 6425 Author: nicdumz Date: 2009-02-23 09:22:34 +0000 (Mon, 23 Feb 2009) Log Message: ----------- user is a method, not an attribute. Modified Paths: -------------- branches/rewrite/pywikibot/site.py Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2009-02-23 09:13:19 UTC (rev 6424) +++ branches/rewrite/pywikibot/site.py 2009-02-23 09:22:34 UTC (rev 6425) @@ -403,7 +403,7 @@ def getSite(self, code): """Return Site object for language 'code' in this Family.""" - return pywikibot.Site(code=code, fam=self.family, user=self.user) + return pywikibot.Site(code=code, fam=self.family, user=self.user()) # deprecated methods for backwards-compatibility

1 0

SVN: [6424] branches/rewrite/pywikibot/scripts/category.py
by nicdumz＠svn.wikimedia.org 23 Feb '09

23 Feb '09

Revision: 6424 Author: nicdumz Date: 2009-02-23 09:13:19 +0000 (Mon, 23 Feb 2009) Log Message: ----------- * Using Page(Link('Category:' + catTitle)) instead of Page(site, 'Category:' + catTitle): the latter worked bad for non-English namespaces. Page(frwp, 'Category:Test') returns the 'Cat?\195?\169gorie:Category:Test'. Bad. * using a local site variable instead of calls to pywikibot.getSite() Modified Paths: -------------- branches/rewrite/pywikibot/scripts/category.py Modified: branches/rewrite/pywikibot/scripts/category.py =================================================================== --- branches/rewrite/pywikibot/scripts/category.py 2009-02-23 08:42:19 UTC (rev 6423) +++ branches/rewrite/pywikibot/scripts/category.py 2009-02-23 09:13:19 UTC (rev 6424) @@ -415,7 +415,7 @@ deleteEmptySourceCat=True, titleRegex=None): site = pywikibot.getSite() self.editSummary = editSummary - self.oldCat = catlib.Category(site, 'Category:' + oldCatTitle) + self.oldCat = catlib.Category(pywikibot.Link('Category:' + oldCatTitle)) self.newCatTitle = newCatTitle self.inPlace = inPlace self.moveCatPage = moveCatPage @@ -429,7 +429,7 @@ def run(self): site = pywikibot.getSite() - newCat = catlib.Category(site, 'Category:' + self.newCatTitle) + newCat = catlib.Category(pywikibot.Link('Category:' + self.newCatTitle)) # Copy the category contents to the new category page copied = False @@ -516,8 +516,9 @@ self.editSummary = editSummary self.overwrite = overwrite self.showImages = showImages - self.cat = catlib.Category(pywikibot.getSite(), 'Category:' + catTitle) - self.list = pywikibot.Page(pywikibot.getSite(), listTitle) + self.site = pywikibot.getSite() + self.cat = catlib.Category(pywikibot.Link('Category:' + catTitle)) + self.list = pywikibot.Page(self.site, listTitle) self.subCats = subCats self.talkPages = talkPages self.recurse = recurse @@ -527,7 +528,7 @@ if self.subCats: listOfArticles += self.cat.subcategoriesList() if not self.editSummary: - self.editSummary = pywikibot.translate(pywikibot.Site(), self.listify_msg) % (self.cat.title(), len(listOfArticles)) + self.editSummary = pywikibot.translate(self.site, self.listify_msg) % (self.cat.title(), len(listOfArticles)) listString = "" for article in listOfArticles: @@ -604,14 +605,15 @@ def __init__(self, catTitle, batchMode = False, editSummary = '', useSummaryForDeletion = True, titleRegex = None, inPlace = False): self.editSummary = editSummary - self.cat = catlib.Category(pywikibot.getSite(), 'Category:' + catTitle) + self.site = pywikibot.getSite() + self.cat = catlib.Category(pywikibot.Link('Category:' + catTitle)) # get edit summary message self.useSummaryForDeletion = useSummaryForDeletion self.batchMode = batchMode self.titleRegex = titleRegex self.inPlace = inPlace if not self.editSummary: - self.editSummary = pywikibot.translate(pywikibot.Site(), self.msg_remove) % self.cat.title() + self.editSummary = pywikibot.translate(self.site, self.msg_remove) % self.cat.title() def run(self): articles = self.cat.articlesList(recurse = 0) @@ -633,7 +635,7 @@ if self.useSummaryForDeletion and self.editSummary: reason = self.editSummary else: - reason = pywikibot.translate(pywikibot.getSite(), self.deletion_reason_remove) + reason = pywikibot.translate(self.site, self.deletion_reason_remove) talkPage = self.cat.toggleTalkPage() self.cat.delete(reason, not self.batchMode) if (talkPage.exists()): @@ -666,7 +668,8 @@ def __init__(self, catTitle, catDB): self.catTitle = catTitle self.catDB = catDB - self.editSummary = pywikibot.translate(pywikibot.Site(), msg_change) % cat.title() + self.site = pywikibot.getSite() + self.editSummary = pywikibot.translate(self.site, msg_change) % cat.title() def move_to_category(self, article, original_cat, current_cat): ''' @@ -737,7 +740,7 @@ flag = True elif choice in ['j', 'J']: newCatTitle = pywikibot.input(u'Please enter the category the article should be moved to:') - newCat = catlib.Category(pywikibot.getSite(), 'Category:' + newCatTitle) + newCat = catlib.Category(pywikibot.Link('Category:' + newCatTitle)) # recurse into chosen category self.move_to_category(article, original_cat, newCat) flag = True @@ -777,7 +780,7 @@ flag = True def run(self): - cat = catlib.Category(pywikibot.getSite(), 'Category:' + self.catTitle) + cat = catlib.Category(pywikibot.Link('Category:' + self.catTitle)) articles = cat.articlesList(recurse = False) if len(articles) == 0: @@ -885,7 +888,7 @@ * catTitle - the title of the category which will be the tree's root * maxDepth - the limit beyond which no subcategories will be listed """ - cat = catlib.Category(pywikibot.getSite(), 'Category:' + self.catTitle) + cat = catlib.Category(pywikibot.Link('Category:' + self.catTitle)) tree = self.treeview(cat) if self.filename: pywikibot.output(u'Saving results in %s' % self.filename)

1 0

SVN: [6423] branches/rewrite/pywikibot/bot.py
by nicdumz＠svn.wikimedia.org 23 Feb '09

23 Feb '09

Revision: 6423 Author: nicdumz Date: 2009-02-23 08:42:19 +0000 (Mon, 23 Feb 2009) Log Message: ----------- Modifying emit() so it can also handle strings, and not only unicode. See attached bug [ 2629586 ] TerminalHandler.emit crashes when message is a string Modified Paths: -------------- branches/rewrite/pywikibot/bot.py Modified: branches/rewrite/pywikibot/bot.py =================================================================== --- branches/rewrite/pywikibot/bot.py 2009-02-23 08:15:42 UTC (rev 6422) +++ branches/rewrite/pywikibot/bot.py 2009-02-23 08:42:19 UTC (rev 6423) @@ -87,12 +87,15 @@ try: msg = self.format(record) fs = "%s" - try: - self.stream.write(fs % msg.encode(config.console_encoding, - "xmlcharrefreplace")) - except UnicodeError: - self.stream.write(fs % msg.encode("ascii", - "xmlcharrefreplace")) + if isinstance(msg, str): + self.stream.write(fs % msg) + else: + try: + self.stream.write(fs % msg.encode(config.console_encoding, + "xmlcharrefreplace")) + except UnicodeError: + self.stream.write(fs % msg.encode("ascii", + "xmlcharrefreplace")) self.flush() except (KeyboardInterrupt, SystemExit): raise

1 0

← Newer
1
2
3
4
5
6
7
8
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

Pywikipedia-l February 2009