pywikibot August 2007

pywikibot@lists.wikimedia.org

26 participants
318 discussions

[Pywikipedia-l] SVN: [4065] trunk/pywikipedia
by btongminh＠svn.wikimedia.org 18 Aug '07

18 Aug '07

Revision: 4065 Author: btongminh Date: 2007-08-18 10:14:03 +0000 (Sat, 18 Aug 2007) Log Message: ----------- Standardizing shared_image_repository() Modified Paths: -------------- trunk/pywikipedia/families/commons_family.py trunk/pywikipedia/families/mediawiki_family.py trunk/pywikipedia/families/meta_family.py trunk/pywikipedia/families/species_family.py trunk/pywikipedia/families/wikisource_family.py trunk/pywikipedia/families/wikiversity_family.py trunk/pywikipedia/families/wiktionary_family.py trunk/pywikipedia/family.py Modified: trunk/pywikipedia/families/commons_family.py =================================================================== --- trunk/pywikipedia/families/commons_family.py 2007-08-18 09:27:31 UTC (rev 4064) +++ trunk/pywikipedia/families/commons_family.py 2007-08-18 10:14:03 UTC (rev 4065) @@ -33,5 +33,5 @@ def version(self, code): return "1.11alpha" - def shared_image_repository(self): + def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/mediawiki_family.py =================================================================== --- trunk/pywikipedia/families/mediawiki_family.py 2007-08-18 09:27:31 UTC (rev 4064) +++ trunk/pywikipedia/families/mediawiki_family.py 2007-08-18 10:14:03 UTC (rev 4065) @@ -27,5 +27,6 @@ def version(self, code): return "1.11" - def shared_image_repository(self): + def shared_image_repository(self, code): return ('commons', 'commons') +s \ No newline at end of file Modified: trunk/pywikipedia/families/meta_family.py =================================================================== --- trunk/pywikipedia/families/meta_family.py 2007-08-18 09:27:31 UTC (rev 4064) +++ trunk/pywikipedia/families/meta_family.py 2007-08-18 10:14:03 UTC (rev 4065) @@ -25,5 +25,5 @@ def version(self,code): return "1.11" - def shared_image_repository(self): + def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/species_family.py =================================================================== --- trunk/pywikipedia/families/species_family.py 2007-08-18 09:27:31 UTC (rev 4064) +++ trunk/pywikipedia/families/species_family.py 2007-08-18 10:14:03 UTC (rev 4065) @@ -25,3 +25,5 @@ def version(self,code): return "1.11" + def shared_image_repository(self, code): + return ('commons', 'commons') Modified: trunk/pywikipedia/families/wikisource_family.py =================================================================== --- trunk/pywikipedia/families/wikisource_family.py 2007-08-18 09:27:31 UTC (rev 4064) +++ trunk/pywikipedia/families/wikisource_family.py 2007-08-18 10:14:03 UTC (rev 4065) @@ -142,6 +142,6 @@ def version(self, code): return "1.11" - def shared_image_repository(self): + def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wikiversity_family.py =================================================================== --- trunk/pywikipedia/families/wikiversity_family.py 2007-08-18 09:27:31 UTC (rev 4064) +++ trunk/pywikipedia/families/wikiversity_family.py 2007-08-18 10:14:03 UTC (rev 4065) @@ -95,5 +95,5 @@ def version(self,code): return "1.11alpha" - def shared_image_repository(self): + def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/families/wiktionary_family.py =================================================================== --- trunk/pywikipedia/families/wiktionary_family.py 2007-08-18 09:27:31 UTC (rev 4064) +++ trunk/pywikipedia/families/wiktionary_family.py 2007-08-18 10:14:03 UTC (rev 4065) @@ -218,6 +218,6 @@ def version(self, code): return "1.11" - def shared_image_repository(self): + def shared_image_repository(self, code): return ('commons', 'commons') Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2007-08-18 09:27:31 UTC (rev 4064) +++ trunk/pywikipedia/family.py 2007-08-18 10:14:03 UTC (rev 4065) @@ -2632,6 +2632,6 @@ """Is query.php installed in the wiki?""" return False - def shared_image_repository(self): + def shared_image_repository(self, code): """Return the shared image repository, if any.""" return (None, None)

1 0

[Pywikipedia-l] SVN: [4064] trunk/pywikipedia/delinker.py
by btongminh＠svn.wikimedia.org 18 Aug '07

18 Aug '07

Revision: 4064 Author: btongminh Date: 2007-08-18 09:27:31 +0000 (Sat, 18 Aug 2007) Log Message: ----------- NoPage fix; summary fix; Modified Paths: -------------- trunk/pywikipedia/delinker.py Modified: trunk/pywikipedia/delinker.py =================================================================== --- trunk/pywikipedia/delinker.py 2007-08-18 08:04:00 UTC (rev 4063) +++ trunk/pywikipedia/delinker.py 2007-08-18 09:27:31 UTC (rev 4064) @@ -126,7 +126,10 @@ # TODO: Per site config. if page.namespace() in self.CommonsDelinker.config['delink_namespaces']: - text = page.get() + try: + text = page.get() + except wikipedia.NoPage: + return 'failed' new_text = text def create_regex(s): @@ -257,9 +260,9 @@ """ Get the summary template and substitute the correct values.""" if replacement: - tlp = self.CommonsDelinker.SummaryCache.get(site, str(site), 'replace-I18n') + tlp = self.CommonsDelinker.SummaryCache.get(site, 'replace-I18n') else: - tlp = self.CommonsDelinker.SummaryCache.get(site, str(site), 'summary-I18n') + tlp = self.CommonsDelinker.SummaryCache.get(site, 'summary-I18n') tlp = tlp.replace('$1', image) if replacement: @@ -279,10 +282,13 @@ self.lock = threading.Lock() self.CommonsDelinker = CommonsDelinker - def get(self, site, key, type): + def get(self, site, type, key = None): # This can probably also provide something for # localised settings, but then it first needs to # check whether the page is sysop only. + if not key: + key = str(site) + self.lock.acquire() try: if type not in self.summaries: @@ -321,7 +327,7 @@ 'wikisource', 'wikinews', 'wikiversity'): newsite = self.CommonsDelinker.get_site(site.lang, wikipedia.Family('wikipedia')) - return self.get(newsite, type) + return self.get(newsite, type, key = key) return self.CommonsDelinker.config['default_settings'].get(type, '') def check_user_page(self, site):

1 0

[Pywikipedia-l] SVN: [4063] trunk/pywikipedia/catlib.py
by jitseniesen＠svn.wikimedia.org 18 Aug '07

18 Aug '07

Revision: 4063 Author: jitseniesen Date: 2007-08-18 08:04:00 +0000 (Sat, 18 Aug 2007) Log Message: ----------- _ParseCategory(): Do not assume English interface Modified Paths: -------------- trunk/pywikipedia/catlib.py Modified: trunk/pywikipedia/catlib.py =================================================================== --- trunk/pywikipedia/catlib.py 2007-08-18 07:35:12 UTC (rev 4062) +++ trunk/pywikipedia/catlib.py 2007-08-18 08:04:00 UTC (rev 4063) @@ -177,7 +177,7 @@ '<div class\s?=\s?\"thumb\"\sstyle=\"[^\"]*\"><a href=\".*?\"\s?title\s?=\s?\"([^\"]*)\"') ns = self.site().category_namespaces() # regular expression matching the "(next 200)" link - RLinkToNextPage = re.compile('&from=(.*?)\" title=\"[^\"]*\">next 200</a>'); + RLinkToNextPage = re.compile('&from=(.*?)" title="'); currentPageOffset = startFrom while True: @@ -197,12 +197,15 @@ # index where subcategory listing begins try: ibegin = txt.index('<div id="mw-subcategories">') + skippedCategoryDescription = True except ValueError: try: ibegin = txt.index('<div id="mw-pages">') + skippedCategoryDescription = True except ValueError: try: ibegin = txt.index('') # does not work for cats without text + skippedCategoryDescription = False except ValueError: wikipedia.output("\nCategory page detection is not bug free. Please report this error!") raise @@ -237,13 +240,19 @@ for title in Rimage.findall(txt): yield ARTICLE, wikipedia.Page(self.site(), title) # try to find a link to the next list page - matchObj = RLinkToNextPage.search(txt) - if matchObj: - currentPageOffset = matchObj.group(1) - wikipedia.output('There are more articles in %s.' - % self.title()) + # If skippedCategoryDescription is False, then there are no pages + # or subcategories, so there cannot be a next list page + if skippedCategoryDescription: + matchObj = RLinkToNextPage.search(txt) + if matchObj: + currentPageOffset = matchObj.group(1) + wikipedia.output('There are more articles in %s.' + % self.title()) + else: + break else: break + # get supercategories try: ibegin = self_txt.index('<div id="catlinks">')

1 0

[Pywikipedia-l] SVN: [4062] trunk/pywikipedia/catlib.py
by jitseniesen＠svn.wikimedia.org 18 Aug '07

18 Aug '07

Revision: 4062 Author: jitseniesen Date: 2007-08-18 07:35:12 +0000 (Sat, 18 Aug 2007) Log Message: ----------- Change RLinkToNextPage in _ParseCategory() to prevent it matching the links in {{CategoryTOC}} as happened for instance on [[Category:Wikipedia requested photographs of dogs]] on English WP. Modified Paths: -------------- trunk/pywikipedia/catlib.py Modified: trunk/pywikipedia/catlib.py =================================================================== --- trunk/pywikipedia/catlib.py 2007-08-17 13:53:37 UTC (rev 4061) +++ trunk/pywikipedia/catlib.py 2007-08-18 07:35:12 UTC (rev 4062) @@ -177,7 +177,7 @@ '<div class\s?=\s?\"thumb\"\sstyle=\"[^\"]*\"><a href=\".*?\"\s?title\s?=\s?\"([^\"]*)\"') ns = self.site().category_namespaces() # regular expression matching the "(next 200)" link - RLinkToNextPage = re.compile('&from=(.*?)" title="'); + RLinkToNextPage = re.compile('&from=(.*?)\" title=\"[^\"]*\">next 200</a>'); currentPageOffset = startFrom while True:

1 0

[Pywikipedia-l] SVN: [4061] trunk/pywikipedia/image_replacer.py
by btongminh＠svn.wikimedia.org 17 Aug '07

17 Aug '07

Revision: 4061 Author: btongminh Date: 2007-08-17 13:53:37 +0000 (Fri, 17 Aug 2007) Log Message: ----------- Implement the {{stop}} keyword; Handle errors. Modified Paths: -------------- trunk/pywikipedia/image_replacer.py Modified: trunk/pywikipedia/image_replacer.py =================================================================== --- trunk/pywikipedia/image_replacer.py 2007-08-17 13:53:11 UTC (rev 4060) +++ trunk/pywikipedia/image_replacer.py 2007-08-17 13:53:37 UTC (rev 4061) @@ -82,7 +82,11 @@ output(u'Warning! Unable to read replacement log.', False) output('%s: %s' % (e.__class__.__name__, str(e)), False) return time.sleep(self.config['timeout']) - + + if text.lower().find('{{stop}}') != -1: + output(u'Found {{stop}} on command page. Not replacing anything.') + return time.sleep(self.config['timeout']) + revisions.sort(key = lambda rev: rev[0]) replacements = self.template.finditer(text) @@ -187,23 +191,29 @@ self.config.get('replacer_report_seperator', u', ').join(not_ok)) page = wikipedia.Page(self.site, u'Image:' + old_image) text = page.get() - page.put(u'%s\n%s' % (template, text), - comment = u'This image has been replaced by ' + new_image) + + try: + page.put(u'%s\n%s' % (template, text), + comment = u'This image has been replaced by ' + new_image) + except PageNotSaved, e: + output(u'Warning! Unable to report replacement to %s.' % old_image, False) + output('%s: %s' % (e.__class__.__name__, str(e)), False) + else: + output(u'Reporting replacement of %s by %s.' % \ + (old_image, new_image)) - output(u'Reporting replacement of %s by %s.' % \ - (old_image, new_image)) - if __name__ == '__main__': import sys, cgitb + output(u'Running ' + __version__) + try: # FIXME: Add support for single-process replacer. r = Replacer() + output(u'This bot runs from: ' + str(r.site)) r.start() - except StandardError, e: + except Exception, e: if type(e) not in (SystemExit, KeyboardInterrupt): output('A critical error has occured! Aborting!') print >>sys.stderr, cgitb.text(sys.exc_info()) - except: - pass wikipedia.stopme() \ No newline at end of file

1 0

[Pywikipedia-l] SVN: [4060] trunk/pywikipedia
by btongminh＠svn.wikimedia.org 17 Aug '07

17 Aug '07

Revision: 4060 Author: btongminh Date: 2007-08-17 13:53:11 +0000 (Fri, 17 Aug 2007) Log Message: ----------- Finally working. Modified Paths: -------------- trunk/pywikipedia/checkusage.py trunk/pywikipedia/delinker.py Modified: trunk/pywikipedia/checkusage.py =================================================================== --- trunk/pywikipedia/checkusage.py 2007-08-17 13:41:50 UTC (rev 4059) +++ trunk/pywikipedia/checkusage.py 2007-08-17 13:53:11 UTC (rev 4060) @@ -42,7 +42,7 @@ from urllib import urlencode import simplejson -import family +import wikipedia, family try: import MySQLdb @@ -237,9 +237,11 @@ self.servers = {} # Mapping database name -> (lang, family object) self.families = {} + + self.unknown_families = [] database, cursor = self.connect_mysql(mysql_host_prefix + str(mysql_default_server)) - self.databases[mysql_default_server] = (database, cursor) + self.servers[mysql_default_server] = (database, cursor) # Find where the databases are located cursor.execute('SELECT dbname, domain, server FROM toolserver.wiki ORDER BY size DESC LIMIT %s', (limit, )) @@ -259,9 +261,12 @@ # FIXME: wikimediafoundation! try: - self.families[dbname] = family(domain) - except RuntimeError: + lang, fam = family(domain) + self.families[dbname] = (lang, wikipedia.Family(fam, fatal = False)) + except (RuntimeError, ValueError): + self.unknown_families.append(domain) continue + self.databases[dbname] = self.servers[server] # Localized namespaces @@ -301,14 +306,14 @@ lang, family = self.families[dbname] if family.shared_image_repository() == (lang, family.name): - left_join = ''; + left_join = 'WHERE'; else: - left_join = 'LEFT JOIN %s.image ON (il_to = img_name)' + left_join = 'LEFT JOIN %s.image ON (il_to = img_name) WHERE img_name IS NULL AND' % dbname query = """SELECT page_namespace, page_title FROM %s.page, %s.imagelinks - %s WHERE img_name IS NULL AND page_id = il_from AND il_to = %%s""" - self.databases[database][1].execute(query % (dbname, dbname, left_join), + %s page_id = il_from AND il_to = %%s""" + self.databases[dbname][1].execute(query % (dbname, dbname, left_join), (image.encode('utf-8', 'ignore'), )) - for page_namespace, page_title in self.databases[database][1]: + for page_namespace, page_title in self.databases[dbname][1]: stripped_title = page_title.decode('utf-8', 'ignore') if page_namespace != 0: title = family.namespace(lang, page_namespace) + u':' + stripped_title Modified: trunk/pywikipedia/delinker.py =================================================================== --- trunk/pywikipedia/delinker.py 2007-08-17 13:41:50 UTC (rev 4059) +++ trunk/pywikipedia/delinker.py 2007-08-17 13:53:11 UTC (rev 4060) @@ -88,14 +88,15 @@ site = self.CommonsDelinker.get_site(lang, family) try: - summary = self.get_summary(site, site, image, admin, reason, replacement) + summary = self.get_summary(site, image, admin, reason, replacement) - for title in pages: + for page_namespace, page_title, title in pages: if self.CommonsDelinker.set_edit(str(site), title): # The page is currently being editted. Postpone. - if domain not in skipped_images: + if (lang, family) not in skipped_images: skipped_images[(lang, family)] = [] - skipped_images[(lang, family)].append(title) + skipped_images[(lang, family)].append( + (page_namespace, page_title, title)) else: # Delink the image output(u'%s Delinking %s from %s' % (self, image, site)) @@ -313,12 +314,13 @@ # wikiquote, wikisource, wikinews, wikiversity # This will cause the bot to function even on special wikis # like mediawiki.org and meta and species. - output(u'%s Using default summary for %s' % (self, domain)) + output(u'%s Using default summary for %s' % (self, site)) if site.family.name != 'wikipedia' and self.CommonsDelinker.config['global']: if site.family.name in ('wiktionary', 'wikibooks', 'wikiquote', 'wikisource', 'wikinews', 'wikiversity'): - newsite = wikipedia.getSite(site.lang, 'wikipedia') + newsite = self.CommonsDelinker.get_site(site.lang, + wikipedia.Family('wikipedia')) return self.get(newsite, type) return self.CommonsDelinker.config['default_settings'].get(type, '') @@ -387,13 +389,14 @@ # without the image itself. Can be fixed by querying query.php # instead of api.php. Also should this be made as an exits() # method of checkusage.CheckUsage? - shared_image_repository = self.CommonsDelinker.get_site( - *self.site.shared_image_repository()) + #shared_image_repository = self.CommonsDelinker.get_site( + # *self.site.family.shared_image_repository()) + shared_image_repository = self.site.shared_image_repository() if self.CheckUsage.exists(shared_image_repository, image) \ and not bool(replacement): output(u'%s %s exists on the shared image repository!' % (self, image)) return - if self.CheckUsage.exists(self.site.hostname(), image) and \ + if self.CheckUsage.exists(self.site, image) and \ not bool(replacement): output(u'%s %s exists again!' % (self, image)) return @@ -408,7 +411,7 @@ for (lang, family), (page_namespace, page_title, title) in usage: if (lang, family) not in usage_domains: usage_domains[(lang, family)] = [] - usage_domains[(lang, family)].append(title) + usage_domains[(lang, family)].append((page_namespace, page_title, title)) count += 1 else: #FIX! @@ -556,17 +559,17 @@ def get_site(self, code, fam): # Threadsafe replacement of wikipedia.getSite - key = '%s:%s' % (code, fam) + key = '%s:%s' % (code, fam.name) self.siteLock.acquire() try: if key not in self.sites: self.sites[key] = [] for site, used in self.sites[key]: if not used: - self.sites[self.sites.index((site, False))] = (site, True) + self.sites[key][self.sites[key].index((site, False))] = (site, True) return site site = wikipedia.Site(code, fam) - self.sites[key].append(site) + self.sites[key].append((site, True)) return site finally: self.siteLock.release() @@ -574,7 +577,7 @@ key = '%s:%s' % (site.lang, site.family.name) self.siteLock.acquire() try: - self.sites[self.sites.index((site, True))] = (site, False) + self.sites[key][self.sites[key].index((site, True))] = (site, False) finally: self.siteLock.release()

1 0

[Pywikipedia-l] SVN: [4059] trunk/pywikipedia/family.py
by btongminh＠svn.wikimedia.org 17 Aug '07

17 Aug '07

Revision: 4059 Author: btongminh Date: 2007-08-17 13:41:50 +0000 (Fri, 17 Aug 2007) Log Message: ----------- Make Family objects hashable Modified Paths: -------------- trunk/pywikipedia/family.py Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2007-08-17 13:19:18 UTC (rev 4058) +++ trunk/pywikipedia/family.py 2007-08-17 13:41:50 UTC (rev 4059) @@ -2614,6 +2614,8 @@ return cmp(self.name, otherfamily.name) except AttributeError: return cmp(id(self), id(otherfamily)) + def __hash__(self): + return hash(self.name) def RversionTab(self, code): """Change this to some regular expression that shows the page we

1 0

[Pywikipedia-l] SVN: [4058] trunk/pywikipedia/archivebot.py
by misza13＠svn.wikimedia.org 17 Aug '07

17 Aug '07

Revision: 4058 Author: misza13 Date: 2007-08-17 13:19:18 +0000 (Fri, 17 Aug 2007) Log Message: ----------- Added two new configuration options: * minthreadsleft (default: 5) - the minimum number of threads that should be left on a page (to prevent pages from getting completely harvested) * minthreadstoarchive (default: 2) - the minimum number of threads to archive at one time (lowers edit frequency) Modified Paths: -------------- trunk/pywikipedia/archivebot.py Modified: trunk/pywikipedia/archivebot.py =================================================================== --- trunk/pywikipedia/archivebot.py 2007-08-17 09:31:29 UTC (rev 4057) +++ trunk/pywikipedia/archivebot.py 2007-08-17 13:19:18 UTC (rev 4058) @@ -321,6 +321,8 @@ T = time.mktime(time.gmtime()) whys = [] for t in oldthreads: + if len(oldthreads) - self.archivedThreads <= self.get('minthreadsleft',5): + break #Because there's too little threads left. #TODO: Make an option so that unstamped (unsigned) posts get archived. why = t.shouldBeArchived(self) if why: @@ -345,8 +347,10 @@ def run(self): whys = self.analyzePage() + if self.archivedThreads < self.get('minthreadstoarchive',2): + return #We might not want to archive a measly few threads (lowers edit frequency) if whys: - #Save the archives first (so that bugs don't cause a loss of data + #Save the archives first (so that bugs don't cause a loss of data) for a in sorted(self.archives.keys()): self.commentParams['count'] = self.archives[a].archivedThreads comment = self.archiveSummary % self.commentParams

1 0

[Pywikipedia-l] SVN: [4057] trunk/pywikipedia/families/wikipedia_family.py
by siebrand＠svn.wikimedia.org 17 Aug '07

17 Aug '07

Revision: 4057 Author: siebrand Date: 2007-08-17 09:31:29 +0000 (Fri, 17 Aug 2007) Log Message: ----------- * namespaces 100/101 for uk * namespaces 104/105 for lt Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2007-08-17 09:05:32 UTC (rev 4056) +++ trunk/pywikipedia/families/wikipedia_family.py 2007-08-17 09:31:29 UTC (rev 4057) @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- import urllib import family, config @@ -249,6 +249,7 @@ 'sk': u'Portál', 'sr': u'Портал', 'tg': u'Портал', + 'uk': u'Портал', 'vo': u'Bespik dö Vükiped', 'zh-classical': u'門', } @@ -297,6 +298,7 @@ 'sv': u'Portaldiskussion', 'tg': u'Баҳси портал', 'tr': u'Portal tartışma', + 'uk': u'Обговорення порталу', 'zh-classical': u'議', } @@ -328,13 +330,14 @@ '_default': u'Reference', 'es': u'Anexo', 'fr': u'Référence', - + 'lt': u'Sąrašas', } self.namespaces[105] = { '_default': u'Reference talk', 'es': u'Anexo Discusión', - 'fr' : u'Discussion Référence', + 'fr': u'Discussion Référence', + 'lt': u'Sąrašo aptarimas', } self.namespaces[106] = {

1 0

[Pywikipedia-l] SVN: [4056] trunk/pywikipedia
by btongminh＠svn.wikimedia.org 17 Aug '07

17 Aug '07

Revision: 4056 Author: btongminh Date: 2007-08-17 09:05:32 +0000 (Fri, 17 Aug 2007) Log Message: ----------- Modified Paths: -------------- trunk/pywikipedia/checkusage.py trunk/pywikipedia/delinker.py trunk/pywikipedia/image_replacer.py Modified: trunk/pywikipedia/checkusage.py =================================================================== --- trunk/pywikipedia/checkusage.py 2007-08-16 21:21:43 UTC (rev 4055) +++ trunk/pywikipedia/checkusage.py 2007-08-17 09:05:32 UTC (rev 4056) @@ -336,6 +336,7 @@ def exists(self, site, image): + self.connect_http() # Check whether the image still is deleted on Commons. # BUG: This also returns true for images with a page, but # without the image itself. Can be fixed by querying query.php Modified: trunk/pywikipedia/delinker.py =================================================================== --- trunk/pywikipedia/delinker.py 2007-08-16 21:21:43 UTC (rev 4055) +++ trunk/pywikipedia/delinker.py 2007-08-17 09:05:32 UTC (rev 4056) @@ -387,7 +387,10 @@ # without the image itself. Can be fixed by querying query.php # instead of api.php. Also should this be made as an exits() # method of checkusage.CheckUsage? - if self.CheckUsage.exists(self.site.shared_image_repository(), image) and not bool(replacement): + shared_image_repository = self.CommonsDelinker.get_site( + *self.site.shared_image_repository()) + if self.CheckUsage.exists(shared_image_repository, image) \ + and not bool(replacement): output(u'%s %s exists on the shared image repository!' % (self, image)) return if self.CheckUsage.exists(self.site.hostname(), image) and \ Modified: trunk/pywikipedia/image_replacer.py =================================================================== --- trunk/pywikipedia/image_replacer.py 2007-08-16 21:21:43 UTC (rev 4055) +++ trunk/pywikipedia/image_replacer.py 2007-08-17 09:05:32 UTC (rev 4056) @@ -14,7 +14,8 @@ import re, time import threadpool -from delinker import wait_callback, output, connect_database, family +from delinker import wait_callback, output, connect_database +from checkusage import family def mw_timestamp(ts): return '%s%s%s%s-%s%s-%s%sT%s%s:%s%s:%s%sZ' % tuple(ts) @@ -138,10 +139,13 @@ self.cursor.execute("""SELECT wiki, namespace, page_title FROM %s WHERE img = %%s AND status <> 'ok'""" % self.config['log_table'], (old_image, )) - not_ok = list(self.cursor) + not_ok = [(wiki, namespace, page_title.decode('utf-8', 'ignore')) + for wiki, namespace, page_title in self.cursor] - self.reporters.append((old_image, new_image, user, - comment, not_ok)) + self.reporters.append((old_image.decode('utf-8', 'ignore'), + new_image.decode('utf-8', 'ignore'), + user.decode('utf-8', 'ignore'), + comment.decode('utf-8', 'ignore'), not_ok)) def start(self):

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

pywikibot August 2007