Pywikipedia-svn March 2013

pywikipedia-svn@lists.wikimedia.org

8 participants
171 discussions

SVN: [11251] trunk/pywikipedia/subster.py
by xqt＠svn.wikimedia.org 24 Mar '13

24 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11251 Revision: 11251 Author: xqt Date: 2013-03-24 11:34:13 +0000 (Sun, 24 Mar 2013) Log Message: ----------- Ignore tzset() if that attribute does not exist. Should be fixed. Modified Paths: -------------- trunk/pywikipedia/subster.py Modified: trunk/pywikipedia/subster.py =================================================================== --- trunk/pywikipedia/subster.py 2013-03-24 11:13:03 UTC (rev 11250) +++ trunk/pywikipedia/subster.py 2013-03-24 11:34:13 UTC (rev 11251) @@ -161,7 +161,11 @@ # modification of timezone to be in sync with wiki os.environ['TZ'] = 'Europe/Amsterdam' - time.tzset() + + # windows doesn't have that attribute + # TODO: fix it + if hasattr(time, "tzset"): + time.tzset() pywikibot.output(u'Setting process TimeZone (TZ): %s' % str(time.tzname)) # ('CET', 'CEST') # init constants

1 0

SVN: [11250] trunk/pywikipedia
by xqt＠svn.wikimedia.org 24 Mar '13

24 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11250 Revision: 11250 Author: xqt Date: 2013-03-24 11:13:03 +0000 (Sun, 24 Mar 2013) Log Message: ----------- * revert r11238 * convert tabs to spaces (fix for r11216) * remove api parameter for Page.interwiki(), use has_transcluded_data instead * some PEP8 changes and code optimization Modified Paths: -------------- trunk/pywikipedia/featured.py trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/featured.py =================================================================== --- trunk/pywikipedia/featured.py 2013-03-24 11:07:22 UTC (rev 11249) +++ trunk/pywikipedia/featured.py 2013-03-24 11:13:03 UTC (rev 11250) @@ -352,7 +352,7 @@ if page.isRedirectPage(): page = page.getRedirectTarget() try: - iw=page.interwiki(api=True) + iw=page.interwiki() except: pywikibot.output(u"%s -> no interwiki, giving up" % page.title()) return None @@ -385,7 +385,7 @@ pywikibot.output(u"%s -> page doesn't exist, skipping" % ourpage.title()) return None try: - iw = ourpage.interwiki(api=True) + iw = ourpage.interwiki() except: return None backpage=None Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2013-03-24 11:07:22 UTC (rev 11249) +++ trunk/pywikipedia/wikipedia.py 2013-03-24 11:13:03 UTC (rev 11250) @@ -46,7 +46,7 @@ setAction(text): Use 'text' instead of "Wikipedia python library" in edit summaries setUserAgent(text): Sets the string being passed to the HTTP server as - the User-agent: header. The default is + the User-agent: header. The default is '<script>/<revision> Pywikipediabot/1.0', where '<script>' is the tail path component and file name of the currently executing script and revision is the SVN revision of Pywikipediabot. @@ -2627,7 +2627,8 @@ data=datas['query']['pages'].values()[0]['protection'] return data - def interwiki(self, api=False): + @deprecate_arg("api", None) + def interwiki(self): """Return a list of interwiki links in the page text. This will retrieve the page to do its work, so it can raise @@ -2639,46 +2640,43 @@ """ if hasattr(self, "_interwikis"): return self._interwikis - if api: + + if self.site.has_transcluded_data: params = { 'action': 'query', 'prop' : 'langlinks', 'titles' : self.title(), } - if not self.site().isAllowed('apihighlimits') and config.special_page_limit > 500: + if not self.site().isAllowed('apihighlimits') and \ + config.special_page_limit > 500: params['cllimit'] = 500 - allDone = False iwlinks=[] - while not allDone: + while True: datas = query.GetData(params, self.site()) data=datas['query']['pages'].values()[0] if "langlinks" in data: for c in data['langlinks']: - llpage = Page(getSite(c["lang"]),c["*"]) + llpage = Page(getSite(c["lang"]), c["*"]) iwlinks.append(llpage) if 'query-continue' in datas: if 'langlinks' in datas['query-continue']: params.update(datas['query-continue']['langlinks']) else: - allDone = True + break + self._interwikis = iwlinks return iwlinks + text = self.get() - # Replace {{PAGENAME}} by its value - for pagenametext in self.site().pagenamecodes( - self.site().language()): + for pagenametext in self.site().pagenamecodes(self.site().language()): text = text.replace(u"{{%s}}" % pagenametext, self.title()) - - ll = getLanguageLinks(text, insite=self.site(), pageLink=self.title(asLink=True)) - + ll = getLanguageLinks(text, insite=self.site(), + pageLink=self.title(asLink=True)) result = ll.values() - self._interwikis = result return result - - def categories(self, get_redirect=False, api=False): """Return a list of Category objects that the article is in. Please be aware: the api call returns also categies which are included @@ -4340,53 +4338,57 @@ return 302, response.msg, data['success'] return response.code, response.msg, data - def editclaim(self, WDproperty, value,raw_value=False, refs=None, comment=None, token=None, sysop=False,botflag=True): - if isinstance(WDproperty,int): - propertyID=WDproperty - elif isinstance(WDproperty,basestring): + def editclaim(self, WDproperty, value,raw_value=False, refs=None, + comment=None, token=None, sysop=False, botflag=True): + if isinstance(WDproperty, int): + propertyID = WDproperty + elif isinstance(WDproperty, basestring): try: propertyID=int(WDproperty) except ValueError: try: - propertyID=int(WDproperty.replace("p","").replace("P","")) + propertyID = int( + WDproperty.replace("p", "").replace("P", "")) except ValueError: - search=self.searchentities(WDproperty, 'property', lang=self._originSite.lang) - propertyID=int(search[0]["id"].replace("p","")) + search = self.searchentities(WDproperty, 'property', + lang=self._originSite.lang) + propertyID = int(search[0]["id"].replace("p", "")) else: pass else: pass else: raise RuntimeError("Unknown property type: %s" % WDproperty) - if not raw_value: - if isinstance(value, int): # for 'quantity' entity-type - value="{\"entity-type\":\"item\",\"numeric-id\":%s}" % value - elif isinstance(value, unicode): # for 'string' entity-type + if not raw_value: + if isinstance(value, int): # for 'quantity' entity-type + value = "{\"entity-type\":\"item\",\"numeric-id\":%s}" % value + elif isinstance(value, unicode): # for 'string' entity-type value = json.dumps(value) - elif isinstance(value, basestring): # for 'quantity' entity-type + elif isinstance(value, basestring): # for 'quantity' entity-type try: value=int(value) except ValueError: try: - value=int(value.replace("q","").replace("Q","")) + value=int(value.replace("q","").replace("Q", "")) except ValueError: - search=self.searchentities(value, 'item', lang=self._originSite.lang) - value=int(search[0]["id"].replace("q","")) + search=self.searchentities(value, 'item', + lang=self._originSite.lang) + value=int(search[0]["id"].replace("q", "")) else: pass else: pass value="{\"entity-type\":\"item\",\"numeric-id\":%s}" % value - else: # otherwise + else: raise RuntimeError("Unknown property type: %s" % value) - value="{\"entity-type\":\"item\",\"numeric-id\":%s}" % value + value = "{\"entity-type\":\"item\",\"numeric-id\":%s}" % value else: pass - claims=self.get()['claims'] - theclaim=None + claims = self.get()['claims'] + theclaim = None for claim in claims: - if claim['m'][1]==propertyID: - theclaim=claim + if claim['m'][1] == propertyID: + theclaim = claim if theclaim: params = { 'action': 'wbsetclaimvalue', @@ -4394,10 +4396,7 @@ 'snaktype': 'value', 'value': value, } - if token: - params['token'] = token - else: - params['token'] = self.site().getToken(sysop = sysop) + params['token'] = token or self.site().getToken(sysop=sysop) output(u"Changing %s" % self.title()) data = query.GetData(params, self.site(), sysop=sysop) if 'error' in data: @@ -4408,43 +4407,48 @@ else: params = { 'action': 'wbcreateclaim', - 'entity': self.title().replace("Q","q"), + 'entity': self.title().replace("Q", "q"), 'snaktype': 'value', - 'property': u"p"+str(propertyID), + 'property': "p%d" % propertyID, 'value': value, } - if token: - params['token'] = token - else: - params['token'] = self.site().getToken(sysop = sysop) + params['token'] = token or self.site().getToken(sysop=sysop) output(u"Creating %s" % self.title()) data = query.GetData(params, self.site(), sysop=sysop) if 'error' in data: raise RuntimeError("API query error: %s" % data) - if u'warnings' in data: + if 'warnings' in data: output(str(data[u'warnings'])) guid=data['claim']['id'] if refs: - snak=[] + snak = [] for ref in refs: if isinstance(ref,basestring): - raise RuntimeError("the references must be like this:{(ref1,value1),(ref2,value2)}") - for i in [0,1]: - if isinstance(ref[i],int): - value=ref[i] - elif isinstance(ref[i],basestring): + raise RuntimeError( + "the references must be like this: {(ref1, value1), (ref2, value2)}") + for i in range(2): + if isinstance(ref[i], int): + value = ref[i] + elif isinstance(ref[i], basestring): try: - value=int(ref[i]) + value = int(ref[i]) except ValueError: try: - value=int(ref[i].replace("q","").replace("Q","").replace("P","").replace("p","")) + value = int( + ref[i].lower().replace("Q", + "").replace("P", "")) except ValueError: - if i==0: - typesearch='property' + if i == 0: + typesearch = 'property' else: - typesearch='item' - search=self.searchentities(ref[i], typesearch, lang=self._originSite.lang) - value=int(search[0]["id"].replace("q","").replace("p","")) + typesearch = 'item' + search=self.searchentities( + ref[i], typesearch, + lang=self._originSite.lang) + value = int( + search[0]["id"].replace("q", + "").replace("p", + "")) else: pass else: @@ -4452,19 +4456,22 @@ else: raise RuntimeError("Unknown item: %s" % ref[i]) snak.append(value) - finalsnak={} - for i in range(0,len(snak)/2): - snaki = [{"snaktype":"value", - "property":"p"+str(snak[i*2]), - "datavalue":{"type":"wikibase-entityid","value":{"entity-type":"item","numeric-id":snak[(i*2)+1]}}}] - finalsnak["p"+str(snak[i*2])]=snaki + finalsnak = {} + for i in range(0, len(snak) / 2): + snaki = [ + {"snaktype": "value", + "property":"p"+str(snak[i*2]), + "datavalue": {"type": "wikibase-entityid", + "value": {"entity-type": "item", + "numeric-id": snak[(i * 2) + 1]}}}] + finalsnak["p%d" % snak[i * 2]] = snaki finalsnak=json.dumps(finalsnak) finalsnak=finalsnak.replace("'", '"') params = { 'action': 'wbsetreference', - 'statement' : guid, - 'snaks' :u"%s" % finalsnak, - 'bot' : '1' + 'statement': guid, + 'snaks': u"%s" % finalsnak, + 'bot': '1' } if token: params['token'] = token @@ -4474,7 +4481,7 @@ data = query.GetData(params, self.site(), sysop=sysop) if 'error' in data: raise RuntimeError("API query error: %s" % data) - if u'warnings' in data: + if 'warnings' in data: output(str(data[u'warnings'])) def _getentity(self,force=False, get_redirect=False, throttle=True, @@ -4658,12 +4665,13 @@ """ links = self.get()['links'] - self._interwiki = [Page(getSite(code.replace('wiki', '').replace('_', '-'),fam='wikipedia'), - links[code]) - for code in links] + self._interwiki = [Page(getSite(code.replace('wiki', + '').replace('_', '-'), + fam='wikipedia'), + links[code]) for code in links] return self._interwiki -wikidataPage = DataPage #keep compatible +wikidataPage = DataPage #keep compatible class ImagePage(Page):

1 0

SVN: [11249] trunk/pywikipedia/subster.py
by drtrigon＠svn.wikimedia.org 24 Mar '13

24 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11249 Revision: 11249 Author: drtrigon Date: 2013-03-24 11:07:22 +0000 (Sun, 24 Mar 2013) Log Message: ----------- improvement; label detection speed-up improvement; code and syntax clean up (with work-a-round for "r11070 issue") Modified Paths: -------------- trunk/pywikipedia/subster.py Modified: trunk/pywikipedia/subster.py =================================================================== --- trunk/pywikipedia/subster.py 2013-03-24 08:10:49 UTC (rev 11248) +++ trunk/pywikipedia/subster.py 2013-03-24 11:07:22 UTC (rev 11249) @@ -33,8 +33,7 @@ Run bot on another site language than configured as default. E.g. 'en'. python subster.py -family:meta -lang: - python subster.py -family:wikidata -lang:repo - python subster.py -family:wikidata -lang:en + python subster.py -family:wikidata -lang:wikidata Run bot on another site family and language than configured as default. E.g. 'meta' or 'wikidata'. @@ -177,12 +176,8 @@ self._userListPage = pywikibot.Page(self.site, bot_config['TemplateName']) self._ConfCSSpostprocPage = pywikibot.Page(self.site, bot_config['ConfCSSpostproc']) self._ConfCSSconfigPage = pywikibot.Page(self.site, bot_config['ConfCSSconfig']) - self.pagegen = pagegenerators.ReferringPageGenerator(self._userListPage, onlyTemplateInclusion=True) - if (self.site.family.name == 'wikidata'): # DRTRIGON-130 - # http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11070 - # http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11071 - self.site = self.site.data_repository() - self._code = self._ConfCSSpostprocPage.get() + self.pagegen = pagegenerators.ReferringPageGenerator(self._userListPage, onlyTemplateInclusion=True) + self._code = self._ConfCSSpostprocPage.get() pywikibot.output(u'Imported postproc %s rev %s from %s' %\ ((self._ConfCSSpostprocPage.title(asLink=True),) + self._ConfCSSpostprocPage.getVersionHistory(revCount=1)[0][:2]) ) self._flagenable = {} @@ -220,31 +215,6 @@ # output result to page or return directly if sim: return substed_content - elif self.site.is_data_repository(): # DRTRIGON-130 - # convert talk page result to wikidata(base) - data = self.WD_convertContent(substed_content) - datapage = pywikibot.DataPage(self.site, page.title()) - for item in data: - for element in datapage.searchentities(u'%s:%s' %\ - (pywikibot.config.usernames[self.site.family.name][self.site.lang], item)): - dataoutpage = pywikibot.DataPage(self.site, element['id']) - #dataoutpage = page.toggleTalkPage() - - pywikibot.output(u'%s <--- %s = %s' %\ - (dataoutpage.title(asLink=True), item, data[item])) - - # check for changes and then write/change/set values - summary = u'Bot: update data because of configuration on %s.' % page.title(asLink=True) - #if not self.WD_save(dataoutpage, dic[u'claims'], {u'p32': data}, summary): - buf = dataoutpage.get() - propid = 217 # just a cheat to start with ... - claim = [ claim for claim in buf[u'claims'] if (claim['m'][1] == propid) ] - #if buf.strip().splitlines()[-1].split(u'/')[-1].strip() != data[item]: - if (not claim) or (claim[0]['m'][3] != data[item]): - #dataoutpage.put(buf + u'\n' + out, comment=summary) - dataoutpage.editclaim(u'p%i' % propid, data[item], comment=summary) - else: - pywikibot.output(u'NOTHING TO DO!') else: # if changed, write! if (substed_content != content): @@ -263,6 +233,13 @@ self.save( page, substed_content, (head + u' ' + msg) % {'tags':", ".join(substed_tags)}, **flags ) + + # DRTRIGON-130: data repository (wikidata) output to items + if self.site.is_data_repository() or\ + (self.site.family.name == 'wikidata'): # (work-a-round) + data = self.WD_convertContent(substed_content) + #print self.WD_save(dataoutpage, dic[u'claims'], {u'p32': data}, summary) + self.WD_save(page, data) else: pywikibot.output(u'NOTHING TO DO!') @@ -547,64 +524,100 @@ return res - def WD_save(self, outpage, dic, data, comment=None): +# def WD_save(self, outpage, dic, data, comment=None): +# """Stores the content to Wikidata. +# +# @param dic: Original content. +# @type dic: dict +# @param data: New content. +# @type data: dict +# +# Returns nothing, but stores the changed content. +# """ +# # DRTRIGON-130: check for changes and then write/change/set values +# changed = False +# for prop in data: +# pywikibot.output(u'Checking claim with %i values' % len(data[prop])) +# for i, item in enumerate(data[prop]): +# if (i < len(dic[prop])) and \ +# (dic[prop][i][u'mainsnak'][u'datavalue'][u'value'] == item): +# pass # same value; nothing to do +# else: +# # changes; update or create claim +# changed = True +# if (i < len(dic[prop])): +# #print item, dic[prop][i][u'mainsnak'][u'datavalue'][u'value'] +# pywikibot.output(u'Updating claim with value: %s' % item) +# outpage.setclaimvalue(dic[prop][i][u'id'], item, comment=comment) +# else: +# pywikibot.output(u'Creating new claim with value: %s' % item) +# outpage.createclaim(prop, item, comment=comment) +# # search linked items and update them too +# # VERY HACKY, HAS TO BE CONCEPTIONALLY IMPROVED: +# # link any "key = value" pair to any other item by adding "key" +# # to the items 'aliases' (could also use 'description' or even +# # a redirect) +# (key, value) = map(string.strip, item.split('=')) +# for linked in outpage.searchentities(key): +# outpage = pywikibot.DataPage(self.site, linked[u'id']) +# #attr = outpage.getentities() +# attr = linked +# if (u'aliases' in attr) and (key in attr[u'aliases']): +# pywikibot.output(u'Item %s linked to key %s ...' % (outpage.title(asLink=True), key)) +# data = outpage.getentities() +# if u'claims' in data: +# if (data[u'claims'][u'p32'][0][u'mainsnak'][u'datavalue'][u'value'].strip() == value): +# pywikibot.output(u'... ok') +# continue +# changed = True +# pywikibot.output(u'... updating claim with value: %s' % value) +# outpage.setclaimvalue(data[u'claims'][u'p32'][0][u'id'], value, comment=comment) +# else: +# changed = True +# pywikibot.output(u'... creating new claim with value: %s' % value) +# outpage.createclaim(prop, value, comment=comment) +# # speed-up by setting everything at once (in one single write attempt) +# #outpage.editentity(data = {u'claims': data}) +# #outpage.setitem() +# +# return changed + + def WD_save(self, page, data): """Stores the content to Wikidata. - @param dic: Original content. - @type dic: dict + @param page: Page containing template. + @type page: page object @param data: New content. @type data: dict - Returns nothing, but stores the changed content. + Returns nothing, but stores the changed content to linked labels. """ # DRTRIGON-130: check for changes and then write/change/set values - changed = False - for prop in data: - pywikibot.output(u'Checking claim with %i values' % len(data[prop])) - for i, item in enumerate(data[prop]): - if (i < len(dic[prop])) and \ - (dic[prop][i][u'mainsnak'][u'datavalue'][u'value'] == item): - pass # same value; nothing to do - else: - # changes; update or create claim - changed = True - if (i < len(dic[prop])): - #print item, dic[prop][i][u'mainsnak'][u'datavalue'][u'value'] - pywikibot.output(u'Updating claim with value: %s' % item) - outpage.setclaimvalue(dic[prop][i][u'id'], item, comment=comment) - else: - pywikibot.output(u'Creating new claim with value: %s' % item) - outpage.createclaim(prop, item, comment=comment) - # search linked items and update them too - # VERY HACKY, HAS TO BE CONCEPTIONALLY IMPROVED: - # link any "key = value" pair to any other item by adding "key" - # to the items 'aliases' (could also use 'description' or even - # a redirect) - (key, value) = map(string.strip, item.split('=')) - for linked in outpage.searchentities(key): - outpage = pywikibot.DataPage(self.site, linked[u'id']) - #attr = outpage.getentities() - attr = linked - if (u'aliases' in attr) and (key in attr[u'aliases']): - pywikibot.output(u'Item %s linked to key %s ...' % (outpage.title(asLink=True), key)) - data = outpage.getentities() - if u'claims' in data: - if (data[u'claims'][u'p32'][0][u'mainsnak'][u'datavalue'][u'value'].strip() == value): - pywikibot.output(u'... ok') - continue - changed = True - pywikibot.output(u'... updating claim with value: %s' % value) - outpage.setclaimvalue(data[u'claims'][u'p32'][0][u'id'], value, comment=comment) - else: - changed = True - pywikibot.output(u'... creating new claim with value: %s' % value) - outpage.createclaim(prop, value, comment=comment) - # speed-up by setting everything at once (in one single write attempt) - #outpage.editentity(data = {u'claims': data}) - #outpage.setitem() + datapage = pywikibot.DataPage(self.site, page.title()) + links = datapage.searchentities(u'%s:%s' % (pywikibot.config.usernames[self.site.family.name][self.site.lang], datapage.title().split(u':')[1])) + for element in links: + item = element[u'aliases'][0].split(u':')[2] + if item not in data: + pywikibot.output(u'Value "%s" not found.' % (item,)) + continue - return changed + dataoutpage = pywikibot.DataPage(self.site, element['id']) + #dataoutpage.createclaim(u'p38', u'{"entity-type":"quantity", "numeric-id":1}') + #dataoutpage = page.toggleTalkPage() + # check for changes and then write/change/set values + summary = u'Bot: update data because of configuration on %s.' % page.title(asLink=True) + buf = dataoutpage.get() + propid = 217 # just a cheat to start with ... + claim = [ claim for claim in buf[u'claims'] if (claim['m'][1] == propid) ] + #if buf.strip().splitlines()[-1].split(u'/')[-1].strip() != data[item]: + if (not claim) or (claim[0]['m'][3] != data[item]): + pywikibot.output(u'%s in %s <--- %s = %s' %\ + (element[u'aliases'][0], dataoutpage.title(asLink=True), item, data[item])) + + #dataoutpage.put(buf + u'\n' + out, comment=summary) + dataoutpage.editclaim(u'p%i' % propid, data[item], comment=summary) + def get_var_regex(self, var, cont='.*?'): """Get regex used/needed to find the tags to replace.

1 0

SVN: [11248] branches/rewrite/pywikibot/site.py
by xqt＠svn.wikimedia.org 24 Mar '13

24 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11248 Revision: 11248 Author: xqt Date: 2013-03-24 08:10:49 +0000 (Sun, 24 Mar 2013) Log Message: ----------- * fix for r7035, r11070, update from trunk r11247 Modified Paths: -------------- branches/rewrite/pywikibot/site.py Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2013-03-24 08:08:33 UTC (rev 11247) +++ branches/rewrite/pywikibot/site.py 2013-03-24 08:10:49 UTC (rev 11248) @@ -128,13 +128,13 @@ raise NoSuchSite("Language %s in family %s is obsolete" % (self.__code, self.__family.name)) if self.__code not in self.languages(): - if self.__code == 'zh-classic' \ - and 'zh-classical' in self.languages(): + if self.__code == 'zh-classic' and \ + 'zh-classical' in self.languages(): self.__code = 'zh-classical' # database hack (database is varchar[10], so zh-classical # is cut to zh-classic) - elif self.__family.name in self.__family.langs.keys() \ - or len(self.__family.langs) == 1: + elif self.__family.name in self.__family.langs.keys() and \ + len(self.__family.langs) == 1: oldcode = self.__code self.__code = self.__family.name if self.__family == pywikibot.config.family \

1 0

SVN: [11247] trunk/pywikipedia/wikipedia.py
by xqt＠svn.wikimedia.org 24 Mar '13

24 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11247 Revision: 11247 Author: xqt Date: 2013-03-24 08:08:33 +0000 (Sun, 24 Mar 2013) Log Message: ----------- * fix for r7035, r11070; * update from rewrite r7290 Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2013-03-23 13:53:43 UTC (rev 11246) +++ trunk/pywikipedia/wikipedia.py 2013-03-24 08:08:33 UTC (rev 11247) @@ -132,7 +132,7 @@ import re, codecs, difflib, locale try: from hashlib import md5 -except ImportError: # Python 2.4 compatibility +except ImportError: # Python 2.4 compatibility from md5 import new as md5 import xml.sax, xml.sax.handler import htmlentitydefs @@ -5899,22 +5899,26 @@ raise NoSuchSite("Language %s in family %s is obsolete" % (self.__code, self.__family.name)) if self.__code not in self.languages(): - if self.__code == 'zh-classic' \ - and 'zh-classical' in self.languages(): + if self.__code == 'zh-classic' and \ + 'zh-classical' in self.languages(): self.__code = 'zh-classical' # database hack (database is varchar[10], so zh-classical # is cut to zh-classic) - elif self.__family.name in self.__family.langs.keys() \ - or len(self.__family.langs) == 1: + elif self.__family.name in self.__family.langs.keys() and \ + len(self.__family.langs) == 1: + oldcode = self.__code self.__code = self.__family.name + if self.__family == pywikibot.config.family \ + and oldcode == pywikibot.config.mylang: + pywikibot.config.mylang = self.__code else: raise NoSuchSite("Language %s does not exist in family %s" % (self.__code, self.__family.name)) + self.nocapitalize = self.code in self.family.nocapitalize self._mediawiki_messages = {} self._info = {} self._userName = [None, None] - self.nocapitalize = self.code in self.family.nocapitalize self.user = user self._userData = [False, False] self._isLoggedIn = [None, None]

1 0

SVN: [11246] branches/rewrite/scripts/i18n
by siebrand＠svn.wikimedia.org 23 Mar '13

23 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11246 Revision: 11246 Author: siebrand Date: 2013-03-23 13:53:43 +0000 (Sat, 23 Mar 2013) Log Message: ----------- Localisation updates from http://translatewiki.net. Modified Paths: -------------- branches/rewrite/scripts/i18n/archivebot.py branches/rewrite/scripts/i18n/category.py branches/rewrite/scripts/i18n/pywikibot.py branches/rewrite/scripts/i18n/thirdparty.py branches/rewrite/scripts/i18n/weblinkchecker.py branches/rewrite/scripts/i18n/welcome.py Modified: branches/rewrite/scripts/i18n/archivebot.py =================================================================== --- branches/rewrite/scripts/i18n/archivebot.py 2013-03-23 12:49:54 UTC (rev 11245) +++ branches/rewrite/scripts/i18n/archivebot.py 2013-03-23 13:53:43 UTC (rev 11246) @@ -847,13 +847,14 @@ 'archivebot-archive-full': u'(ÀPÒ TI KÚN)', }, # Author: Anakmalaysia + # Author: Makecat # Author: Yfdyh000 'zh': { 'archivebot-older-than': u'早于', - 'archivebot-page-summary': u'存档%(count)d个%(why)s至%(archives)s。', + 'archivebot-page-summary': u'机器人：存档%(count)d个%(why)s的讨论至%(archives)s。', 'archivebot-archiveheader': u'{{talkarchive}}', 'archivebot-archive-full': u'（存档已满）', - 'archivebot-archive-summary': u'存档%(count)d个来自[[%(from)s]]的讨论。', + 'archivebot-archive-summary': u'机器人：存档%(count)d个来自[[%(from)s]]的讨论。', }, # Author: Justincheng12345 # Author: Simon Shek Modified: branches/rewrite/scripts/i18n/category.py =================================================================== --- branches/rewrite/scripts/i18n/category.py 2013-03-23 12:49:54 UTC (rev 11245) +++ branches/rewrite/scripts/i18n/category.py 2013-03-23 13:53:43 UTC (rev 11246) @@ -474,7 +474,7 @@ 'category-adding': u'Roboto: Aldonado de kategorio [[:Category:%(newcat)s|%(newcat)s]]', 'category-also-in': u'(ankaŭ en %(alsocat)s)', 'category-was-disbanded': u'Roboto: Kategorio estas nuligita', - 'category-replacing': u'Roboto: Anstataŭigado de kategorio %(oldcat)s per kategorio $(newcat)s', + 'category-replacing': u'Roboto: Anstataŭigado de kategorio %(oldcat)s per %(newcat)s', 'category-removing': u'Roboto: Forigado el %(oldcat)s', 'category-was-moved': u'Roboto: Kategorio estas movita al [[:Category:%(newcat)s|%(title)s]]', 'category-renamed': u'Roboto: Movita el %s. Aŭtoroj: %s', @@ -1836,8 +1836,8 @@ 'category-replacing': u'机器人：变更分类[[%(oldcat)s]]为[[%(newcat)s]]', 'category-removing': u'机器人：从[[%(oldcat)s]]中移除', 'category-was-moved': u'机器人：移动分类至[[:Category:%(newcat)s|%(title)s]]', - 'category-renamed': u'機器人: 已從 %s 移動。原作者是 %s', - 'category-section-title': u'前%(oldcat)s的页面历史', + 'category-renamed': u'机器人：已从 %s 移动。原作者：%s', + 'category-section-title': u'之前%(oldcat)s的页面历史', 'category-listifying': u'机器人：从%(fromcat)s提取列表(%(num)d个项目)', }, 'zh-classical': { Modified: branches/rewrite/scripts/i18n/pywikibot.py =================================================================== --- branches/rewrite/scripts/i18n/pywikibot.py 2013-03-23 12:49:54 UTC (rev 11245) +++ branches/rewrite/scripts/i18n/pywikibot.py 2013-03-23 13:53:43 UTC (rev 11246) @@ -634,13 +634,14 @@ 'pywikibot-enter-finished-browser': u'Bấm Enter sau khi sửa đổi xong trong trình duyệt.', }, # Author: Anakmalaysia + # Author: Yfdyh000 'zh': { 'pywikibot-enter-xml-filename': u'请输入XML Dump文件名称：', 'pywikibot-enter-page-processing': u'哪个页面需要处理？', 'pywikibot-enter-file-links-processing': u'需要处理的图像页，应该到哪个链接？', - 'pywikibot-enter-namespace-number': u'请输入名称空间号码：', - 'pywikibot-enter-new-text': u'请输入新文字：', - 'pywikibot-enter-category-name': u'请输入类别名称：', + 'pywikibot-enter-namespace-number': u'请输入命名空间编号：', + 'pywikibot-enter-new-text': u'请输入新文本：', + 'pywikibot-enter-category-name': u'请输入分类名称：', 'pywikibot-enter-finished-browser': u'请在浏览器作业完成后按下Enter键。', }, # Author: Justincheng12345 Modified: branches/rewrite/scripts/i18n/thirdparty.py =================================================================== --- branches/rewrite/scripts/i18n/thirdparty.py 2013-03-23 12:49:54 UTC (rev 11245) +++ branches/rewrite/scripts/i18n/thirdparty.py 2013-03-23 13:53:43 UTC (rev 11246) @@ -882,6 +882,10 @@ 'thirdparty-drtrigonbot-sum_disc-notify-new': u'ახალი განხილვა', 'thirdparty-drtrigonbot-sum_disc-notify-maintmsg': u'რობოტის შეტყობინება', }, + # Author: វ័ណថារិទ្ធ + 'km': { + 'thirdparty-drtrigonbot-sum_disc-parse-end': u'<noinclude>\n\nSummary generated from and at: %(sign)s</noinclude>', + }, # Author: Akoppad # Author: VASANTH S.N. 'kn': { @@ -1706,10 +1710,10 @@ 'thirdparty-drtrigonbot-sum_disc-parse-notify': u':* %(notify)s: <span class="plainlinks">[%(page_link)s %(page)s]</span>——最近编辑由[[User:%(user)s]]作出（%(time)s）', 'thirdparty-drtrigonbot-sum_disc-notify-notify': u'通知', 'thirdparty-drtrigonbot-subster-summary-mod': u'替换%(tags)s标签', - 'thirdparty-drtrigonbot-sum_disc-notify-closed': u'讨论关闭', + 'thirdparty-drtrigonbot-sum_disc-notify-closed': u'讨论已关闭', 'thirdparty-drtrigonbot-sum_disc-parse-closed': u':* %(notify)s: %(page)s所有讨论已完成（停止监测）——最近编辑由[[User:%(user)s]]作出（%(time)s）', 'thirdparty-drtrigonbot-sum_disc-summary-add': u'添加讨论摘要：%(num)i个条目', - 'thirdparty-drtrigonbot-sum_disc-notify-changed': u'讨论改变', + 'thirdparty-drtrigonbot-sum_disc-notify-changed': u'讨论已变更', 'thirdparty-drtrigonbot-sum_disc-summary-clean': u'添加讨论摘要及清理：%(num)i个条目', 'thirdparty-drtrigonbot-sum_disc-summary-mod': u'更新讨论摘要：%(num)i个条目在%(page)s', 'thirdparty-drtrigonbot-sum_disc-notify-maintmsg': u'机器人的消息', Modified: branches/rewrite/scripts/i18n/weblinkchecker.py =================================================================== --- branches/rewrite/scripts/i18n/weblinkchecker.py 2013-03-23 12:49:54 UTC (rev 11245) +++ branches/rewrite/scripts/i18n/weblinkchecker.py 2013-03-23 13:53:43 UTC (rev 11246) @@ -72,6 +72,10 @@ 'weblinkchecker-caption': u'Tote Verknüpfung', 'weblinkchecker-report': u'Bei mehreren automatisierten Botläufen wurde die folgende Verknüpfung als nicht verfügbar erkannt. Bitte überprüfe, ob die Verknüpfung tatsächlich nicht erreichbar ist, und korrigiere oder entferne sie in diesem Fall!', }, + # Author: Gorizon + 'diq': { + 'weblinkchecker-caption': u'Greyo merde', + }, # Author: Airon90 'eo': { 'weblinkchecker-caption': u'Neenretiĝa ligilo', @@ -307,8 +311,8 @@ 'zh': { 'weblinkchecker-archive_msg': u'这个网页已经被保存在互联网档案馆（Internet Archive）。请为该网页提供一个合适的存档版本： [%(URL)s]。', 'weblinkchecker-caption': u'失效链接', - 'weblinkchecker-summary': u'BOT: 报告失效的外部链接', - 'weblinkchecker-report': u'一个自动运行的bot发现下列外部链接可能已经失效。请帮助修复错误的链接或者移除它!', + 'weblinkchecker-summary': u'机器人：报告失效的外部链接', + 'weblinkchecker-report': u'一个自动运行的机器人发现下列外部链接可能已经失效。请帮助检查，修复或移除无效的链接！', }, # Author: Simon Shek 'zh-hant': { Modified: branches/rewrite/scripts/i18n/welcome.py =================================================================== --- branches/rewrite/scripts/i18n/welcome.py 2013-03-23 12:49:54 UTC (rev 11245) +++ branches/rewrite/scripts/i18n/welcome.py 2013-03-23 13:53:43 UTC (rev 11246) @@ -318,6 +318,10 @@ 'ka': { 'welcome-welcome': u'კეთილი იყოს თქვენი მობრძანება!', }, + # Author: វ័ណថារិទ្ធ + 'km': { + 'welcome-welcome': u'សូមស្វាគមន៍!', + }, # Author: Akoppad # Author: Nayvik 'kn': {

1 0

SVN: [11245] trunk/pywikipedia/subster.py
by drtrigon＠svn.wikimedia.org 23 Mar '13

23 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11245 Revision: 11245 Author: drtrigon Date: 2013-03-23 12:49:54 +0000 (Sat, 23 Mar 2013) Log Message: ----------- improvement; code and syntax clean up Modified Paths: -------------- trunk/pywikipedia/subster.py Modified: trunk/pywikipedia/subster.py =================================================================== --- trunk/pywikipedia/subster.py 2013-03-23 12:04:59 UTC (rev 11244) +++ trunk/pywikipedia/subster.py 2013-03-23 12:49:54 UTC (rev 11245) @@ -178,15 +178,13 @@ self._ConfCSSpostprocPage = pywikibot.Page(self.site, bot_config['ConfCSSpostproc']) self._ConfCSSconfigPage = pywikibot.Page(self.site, bot_config['ConfCSSconfig']) self.pagegen = pagegenerators.ReferringPageGenerator(self._userListPage, onlyTemplateInclusion=True) - if (self.site.family.name == 'wikidata'): + if (self.site.family.name == 'wikidata'): # DRTRIGON-130 # http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11070 # http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11071 self.site = self.site.data_repository() - else: - # DRTRIGON-130; skip this for test-repo - self._code = self._ConfCSSpostprocPage.get() - pywikibot.output(u'Imported postproc %s rev %s from %s' %\ - ((self._ConfCSSpostprocPage.title(asLink=True),) + self._ConfCSSpostprocPage.getVersionHistory(revCount=1)[0][:2]) ) + self._code = self._ConfCSSpostprocPage.get() + pywikibot.output(u'Imported postproc %s rev %s from %s' %\ + ((self._ConfCSSpostprocPage.title(asLink=True),) + self._ConfCSSpostprocPage.getVersionHistory(revCount=1)[0][:2]) ) self._flagenable = {} if self._ConfCSSconfigPage.exists(): exec(self._ConfCSSconfigPage.get()) # with variable: bot_config_wiki @@ -227,25 +225,26 @@ data = self.WD_convertContent(substed_content) datapage = pywikibot.DataPage(self.site, page.title()) for item in data: - for element in datapage.searchentities(u'DrTrigonBot:%s' % item): + for element in datapage.searchentities(u'%s:%s' %\ + (pywikibot.config.usernames[self.site.family.name][self.site.lang], item)): dataoutpage = pywikibot.DataPage(self.site, element['id']) #dataoutpage = page.toggleTalkPage() pywikibot.output(u'%s <--- %s = %s' %\ (dataoutpage.title(asLink=True), item, data[item])) - ## check for changes and then write/change/set values + # check for changes and then write/change/set values summary = u'Bot: update data because of configuration on %s.' % page.title(asLink=True) #if not self.WD_save(dataoutpage, dic[u'claims'], {u'p32': data}, summary): buf = dataoutpage.get() propid = 217 # just a cheat to start with ... claim = [ claim for claim in buf[u'claims'] if (claim['m'][1] == propid) ] - #if buf.strip().splitlines()[-1].split(u'/')[-1].strip() == data[item]: - if claim and (claim[0]['m'][3] == data[item]): - pywikibot.output(u'NOTHING TO DO!') - else: + #if buf.strip().splitlines()[-1].split(u'/')[-1].strip() != data[item]: + if (not claim) or (claim[0]['m'][3] != data[item]): #dataoutpage.put(buf + u'\n' + out, comment=summary) - dataoutpage.editclaim(u'p%i' % propid, data[item]) + dataoutpage.editclaim(u'p%i' % propid, data[item], comment=summary) + else: + pywikibot.output(u'NOTHING TO DO!') else: # if changed, write! if (substed_content != content):

1 0

SVN: [11244] trunk/pywikipedia/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 23 Mar '13

23 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11244 Revision: 11244 Author: xqt Date: 2013-03-23 12:04:59 +0000 (Sat, 23 Mar 2013) Log Message: ----------- update namespace aliases; PEP8 changes Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2013-03-23 11:50:16 UTC (rev 11243) +++ trunk/pywikipedia/families/wikipedia_family.py 2013-03-23 12:04:59 UTC (rev 11244) @@ -3,8 +3,8 @@ __version__ = '$Id$' + # The Wikimedia family that is known as Wikipedia, the Free Encyclopedia - class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -65,6 +65,9 @@ self.namespaces[12]['de'] = [u'Hilfe', u'H'] self.namespaces[3]['de'] = [u'Benutzer Diskussion', u'BD', u'Benutzerin Diskussion'] self.namespaces[-2]['bar'] = [u'Media', u'Medium'] + for code in ('gl', 'pt', 'vi'): + self.namespaces[828][code] = u'Module' + self.namespaces[829][code] = u'Module talk' # Most namespaces are inherited from family.Family. # Translation used on all wikis for the different namespaces. @@ -1090,7 +1093,7 @@ # If no templates are given, retrieve names from the live wiki # ([[MediaWiki:Disambiguationspage]]) # first char must be in uppercase - '_default': [u'Disambig'], # for default MediaWiki message only + '_default': [u'Disambig'], # for default MediaWiki message only 'cdo': [u'Gì-ngiê', u'Disambig'], 'frp': [u'Homonimos', u'Disambig'], 'fur': [u'Disambiguazion', u'Disambig'], @@ -1206,7 +1209,7 @@ 'zea': u'Wikipedia:Deurverwiespagina', 'zh': u'消歧义', 'zh-min-nan': u'Khu-pia̍t-ia̍h', - } + } # families that redirect their interlanguage links here. self.interwiki_forwarded_from = [ @@ -1250,7 +1253,7 @@ # On most Wikipedias page names must start with a capital letter, # but some languages don't use this. - self.nocapitalize = ['jbo',] + self.nocapitalize = ['jbo'] # Which languages have a special order for putting interlanguage links, # and what order is it? If a language is not in interwiki_putfirst, @@ -1321,23 +1324,23 @@ self.obsolete = { 'aa': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Af… - 'cho': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ch… + 'cho': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ch… 'dk': 'da', - 'ho': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Hi… - 'hz': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_He… - 'ii': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Yi… - 'kj': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Kw… - 'kr': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ka… - 'mh': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ma… + 'ho': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Hi… + 'hz': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_He… + 'ii': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Yi… + 'kj': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Kw… + 'kr': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ka… + 'mh': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ma… 'minnan': 'zh-min-nan', - 'mo': 'ro', # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Mo… - 'mus': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Mu… + 'mo': 'ro', # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Mo… + 'mus': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Mu… 'nan': 'zh-min-nan', - 'nl_nds': 'nl-nds', # miss-spelling + 'nl_nds': 'nl-nds', # miss-spelling 'nb': 'no', - 'ng': None, #(not reachable) http://meta.wikimedia.org/wiki/Inactive_wikis + 'ng': None, # (not reachable) http://meta.wikimedia.org/wiki/Inactive_wikis 'jp': 'ja', - 'ru-sib': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Si… + 'ru-sib': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Si… 'tlh': None, 'tokipona': None, 'zh-tw': 'zh', @@ -1345,11 +1348,11 @@ } # Languages that used to be coded in iso-8859-1 - self.latin1old = ['de', 'en', 'et', 'es', 'ia', 'la', 'af', 'cs', - 'fr', 'pt', 'sl', 'bs', 'fy', 'vi', 'lt', 'fi', 'it', - 'no', 'simple', 'gl', 'eu', 'nds', 'co', 'mi', 'mr', - 'id', 'lv', 'sw', 'tt', 'uk', 'vo', 'ga', 'na', 'es', - 'nl', 'da', 'dk', 'sv', 'test'] + self.latin1old = [ + 'de', 'en', 'et', 'es', 'ia', 'la', 'af', 'cs', 'fr', 'pt', 'sl', + 'bs', 'fy', 'vi', 'lt', 'fi', 'it', 'no', 'simple', 'gl', 'eu', + 'nds', 'co', 'mi', 'mr', 'id', 'lv', 'sw', 'tt', 'uk', 'vo', 'ga', + 'na', 'es', 'nl', 'da', 'dk', 'sv', 'test'] self.crossnamespace[0] = { '_default': { @@ -1511,7 +1514,8 @@ # prefix for 'wikisource'. if site.language() == 'sv': d = self.known_families.copy() - d.pop('s') ; d['src'] = 'wikisource' + d.pop('s') + d['src'] = 'wikisource' return d else: return self.known_families

1 0

SVN: [11243] branches/rewrite/pywikibot/family.py
by xqt＠svn.wikimedia.org 23 Mar '13

23 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11243 Revision: 11243 Author: xqt Date: 2013-03-23 11:50:16 +0000 (Sat, 23 Mar 2013) Log Message: ----------- some PEP8 changes, update from trunk r11242 Modified Paths: -------------- branches/rewrite/pywikibot/family.py Modified: branches/rewrite/pywikibot/family.py =================================================================== --- branches/rewrite/pywikibot/family.py 2013-03-23 11:45:39 UTC (rev 11242) +++ branches/rewrite/pywikibot/family.py 2013-03-23 11:50:16 UTC (rev 11243) @@ -96,10 +96,10 @@ ] # Order for fy: alphabetical by code, but y counts as i - def fycomp(x,y): - x = x.replace("y","i")+x.count("y")*"!" - y = y.replace("y","i")+y.count("y")*"!" - return cmp(x,y) + def fycomp(x, y): + x = x.replace("y", "i") + x.count("y") * "!" + y = y.replace("y", "i") + y.count("y") * "!" + return cmp(x, y) self.fyinterwiki = self.alphabetic[:] self.fyinterwiki.remove('nb') self.fyinterwiki.sort(fycomp) @@ -114,29 +114,29 @@ # [[MediaWiki:Linktrail]]. # Note: this is a regular expression. self.linktrails = { - '_default': u'[a-z]*', - 'ca': u'[a-zàèéíòóúç·ïü]*', - 'cs': u'[a-záčďéěíňóřšťúůýž]*', - 'de': u'[a-zäöüß]*', - 'da': u'[a-zæøå]*', - 'es': u'[a-záéíóúñ]*', - 'fa': u'[a-zابپتثجچحخدذرزژسشصضطظعغفقکگلمنوهیآأئؤة‌]*', - 'fi': u'[a-zäö]*', - 'fr': u'[a-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄËÏÖÜÀÈÙ]*', - 'frr': u'[a-zäöüßåāđē]*', - 'he': u'[a-zא-ת]*', - 'hu': u'[a-záéíóúöüőűÁÉÍÓÚÖÜŐŰ]*', - 'it': u'[a-zàéèíîìóòúù]*', - 'ka': u'[a-zაბგდევზთიკლმნოპჟრსტუფქღყშჩცძწჭხჯჰ“»]*', - 'kk': u'[a-zäçéğıïñöşüýʺʹа-яёәғіқңөұүһٴابپتجحدرزسشعفقكلمنڭەوۇۋۆىيچھ“»]*', - 'ksh': u'[a-zäöüėëĳßəğåůæœç]*', - 'mk': u'[a-zабвгдѓежзѕијклљмнњопрстќуфхцчџш]*', - 'nl': u'[a-zäöüïëéèàë]*', - 'pl': u'[a-zęóąśłżźćńĘÓĄŚŁŻŹĆŃ]*', - 'pt': u'[a-záâàãéêíóôõúüç]*', - 'ro': u'[a-zăâîşţșțĂÂÎŞŢȘȚ]*', - 'ru': u'[a-zа-я]*', - 'sk': u'[a-záäčďéíľĺňóôŕšťúýž]*', + '_default': u'[a-z]*', + 'ca': u'[a-zàèéíòóúç·ïü]*', + 'cs': u'[a-záčďéěíňóřšťúůýž]*', + 'de': u'[a-zäöüß]*', + 'da': u'[a-zæøå]*', + 'es': u'[a-záéíóúñ]*', + 'fa': u'[a-zابپتثجچحخدذرزژسشصضطظعغفقکگلمنوهیآأئؤة‌]*', + 'fi': u'[a-zäö]*', + 'fr': u'[a-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄËÏÖÜÀÈÙ]*', + 'frr': u'[a-zäöüßåāđē]*', + 'he': u'[a-zא-ת]*', + 'hu': u'[a-záéíóúöüőűÁÉÍÓÚÖÜŐŰ]*', + 'it': u'[a-zàéèíîìóòúù]*', + 'ka': u'[a-zაბგდევზთიკლმნოპჟრსტუფქღყშჩცძწჭხჯჰ“»]*', + 'kk': u'[a-zäçéğıïñöşüýʺʹа-яёәғіқңөұүһٴابپتجحدرزسشعفقكلمنڭەوۇۋۆىيچھ“»]*', + 'ksh': u'[a-zäöüėëĳßəğåůæœç]*', + 'mk': u'[a-zабвгдѓежзѕијклљмнњопрстќуфхцчџш]*', + 'nl': u'[a-zäöüïëéèàë]*', + 'pl': u'[a-zęóąśłżźćńĘÓĄŚŁŻŹĆŃ]*', + 'pt': u'[a-záâàãéêíóôõúüç]*', + 'ro': u'[a-zăâîşţșțĂÂÎŞŢȘȚ]*', + 'ru': u'[a-zа-я]*', + 'sk': u'[a-záäčďéíľĺňóôŕšťúýž]*', } # Wikimedia wikis all use "bodyContent" as the id of the <div> @@ -218,8 +218,8 @@ 'dict': 'dict', 'dictionary': 'dictionary', 'disinfopedia': 'disinfopedia', - 'distributedproofreaders':'distributedproofreaders', - 'distributedproofreadersca':'distributedproofreadersca', + 'distributedproofreaders': 'distributedproofreaders', + 'distributedproofreadersca': 'distributedproofreadersca', 'dk': 'dk', 'dmoz': 'dmoz', 'dmozs': 'dmozs', @@ -368,7 +368,7 @@ 'organicdesign': 'organicdesign', 'orgpatterns': 'orgpatterns', 'orthodoxwiki': 'orthodoxwiki', - 'osi reference model':'osi reference model', + 'osi reference model': 'osi reference model', 'otrs': 'otrs', 'otrswiki': 'otrswiki', 'ourmedia': 'ourmedia', @@ -502,7 +502,7 @@ 'wikinvest': 'wikinvest', 'wikipaltz': 'wikipaltz', 'wikipedia': 'wikipedia', - 'wikipediawikipedia':'wikipediawikipedia', + 'wikipediawikipedia': 'wikipediawikipedia', 'wikiquote': 'wikiquote', 'wikireason': 'wikireason', 'wikischool': 'wikischool', @@ -641,7 +641,7 @@ # equivalent articles have identical titles among the group. self.language_groups = { # languages using the arabic script (incomplete) - 'arab' : [ + 'arab': [ 'ar', 'arz', 'ps', 'sd', 'ur', 'bjn', 'ckb', # languages using multiple scripts, including arabic 'kk', 'ku', 'tt', 'ug', 'pnb' @@ -727,18 +727,19 @@ return pywikibot.Family(self.interwiki_forward).langs.keys() return self.langs.keys() - def _addlang(self, code, location, namespaces = {}): + def _addlang(self, code, location, namespaces={}): """Add a new language to the langs and namespaces of the family. - This is supposed to be called in the constructor of the family.""" + This is supposed to be called in the constructor of the family. + + """ self.langs[code] = location -## ## for num, val in namespaces.items(): -## self.namespaces[num][code]=val +## self.namespaces[num][code] = val def get_known_families(self, site): return self.known_families - def linktrail(self, code, fallback = '_default'): + def linktrail(self, code, fallback='_default'): if code in self.linktrails: return self.linktrails[code] elif fallback: @@ -758,7 +759,7 @@ "ERROR: title for category redirect template in language '%s' unknown" % code) - def disambig(self, code, fallback = '_default'): + def disambig(self, code, fallback='_default'): if code in self.disambiguationTemplates: return self.disambiguationTemplates[code] elif fallback: @@ -772,8 +773,8 @@ # Methods def protocol(self, code): """ - Can be overridden to return 'https'. - Other protocols are not supported. + Can be overridden to return 'https'. Other protocols are not supported. + """ return 'http' @@ -879,7 +880,9 @@ def RversionTab(self, code): """Change this to some regular expression that shows the page we - found is an existing page, in case the normal regexp does not work.""" + found is an existing page, in case the normal regexp does not work. + + """ return None def has_query_api(self, code): @@ -938,4 +941,3 @@ def shared_image_repository(self, code): return ('commons', 'commons') -

1 0

SVN: [11242] trunk/pywikipedia/family.py
by xqt＠svn.wikimedia.org 23 Mar '13

23 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11242 Revision: 11242 Author: xqt Date: 2013-03-23 11:45:39 +0000 (Sat, 23 Mar 2013) Log Message: ----------- some PEP8 changes Modified Paths: -------------- trunk/pywikipedia/family.py Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2013-03-23 11:05:41 UTC (rev 11241) +++ trunk/pywikipedia/family.py 2013-03-23 11:45:39 UTC (rev 11242) @@ -5,7 +5,7 @@ # # Distributed under the terms of the MIT license. # -__version__='$Id$' +__version__ = '$Id$' import re import urllib @@ -94,10 +94,10 @@ ] # Order for fy: alphabetical by code, but y counts as i - def fycomp(x,y): - x = x.replace("y","i")+x.count("y")*"!" - y = y.replace("y","i")+y.count("y")*"!" - return cmp(x,y) + def fycomp(x, y): + x = x.replace("y", "i") + x.count("y") * "!" + y = y.replace("y", "i") + y.count("y") * "!" + return cmp(x, y) self.fyinterwiki = self.alphabetic[:] self.fyinterwiki.remove('nb') self.fyinterwiki.sort(fycomp) @@ -673,7 +673,7 @@ 'sl': u'Pogovor', 'sq': u'Diskutim', 'sr': [u'Разговор', u'Razgovor'], - 'srn': [u'Taki', u'Overleg'], + 'srn': [u'Taki', u'Overleg'], 'stq': u'Diskussion', 'su': u'Obrolan', 'sv': u'Diskussion', @@ -3245,29 +3245,29 @@ # [[MediaWiki:Linktrail]]. # Note: this is a regular expression. self.linktrails = { - '_default': u'[a-z]*', - 'ca': u'[a-zàèéíòóúç·ïü]*', - 'cs': u'[a-záčďéěíňóřšťúůýž]*', - 'de': u'[a-zäöüß]*', - 'da': u'[a-zæøå]*', - 'es': u'[a-záéíóúñ]*', - 'fa': u'[a-zابپتثجچحخدذرزژسشصضطظعغفقکگلمنوهیآأئؤة‌]*', - 'fi': u'[a-zäö]*', - 'fr': u'[a-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄËÏÖÜÀÈÙ]*', - 'frr': u'[a-zäöüßåāđē]*', - 'he': u'[a-zא-ת]*', - 'hu': u'[a-záéíóúöüőűÁÉÍÓÚÖÜŐŰ]*', - 'it': u'[a-zàéèíîìóòúù]*', - 'ka': u'[a-zაბგდევზთიკლმნოპჟრსტუფქღყშჩცძწჭხჯჰ“»]*', - 'kk': u'[a-zäçéğıïñöşüýʺʹа-яёәғіқңөұүһٴابپتجحدرزسشعفقكلمنڭەوۇۋۆىيچھ“»]*', - 'ksh': u'[a-zäöüėëĳßəğåůæœç]*', - 'mk': u'[a-zабвгдѓежзѕијклљмнњопрстќуфхцчџш]*', - 'nl': u'[a-zäöüïëéèàë]*', - 'pl': u'[a-zęóąśłżźćńĘÓĄŚŁŻŹĆŃ]*', - 'pt': u'[a-záâàãéêíóôõúüç]*', - 'ro': u'[a-zăâîşţșțĂÂÎŞŢȘȚ]*', - 'ru': u'[a-zа-я]*', - 'sk': u'[a-záäčďéíľĺňóôŕšťúýž]*', + '_default': u'[a-z]*', + 'ca': u'[a-zàèéíòóúç·ïü]*', + 'cs': u'[a-záčďéěíňóřšťúůýž]*', + 'de': u'[a-zäöüß]*', + 'da': u'[a-zæøå]*', + 'es': u'[a-záéíóúñ]*', + 'fa': u'[a-zابپتثجچحخدذرزژسشصضطظعغفقکگلمنوهیآأئؤة‌]*', + 'fi': u'[a-zäö]*', + 'fr': u'[a-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄËÏÖÜÀÈÙ]*', + 'frr': u'[a-zäöüßåāđē]*', + 'he': u'[a-zא-ת]*', + 'hu': u'[a-záéíóúöüőűÁÉÍÓÚÖÜŐŰ]*', + 'it': u'[a-zàéèíîìóòúù]*', + 'ka': u'[a-zაბგდევზთიკლმნოპჟრსტუფქღყშჩცძწჭხჯჰ“»]*', + 'kk': u'[a-zäçéğıïñöşüýʺʹа-яёәғіқңөұүһٴابپتجحدرزسشعفقكلمنڭەوۇۋۆىيچھ“»]*', + 'ksh': u'[a-zäöüėëĳßəğåůæœç]*', + 'mk': u'[a-zабвгдѓежзѕијклљмнњопрстќуфхцчџш]*', + 'nl': u'[a-zäöüïëéèàë]*', + 'pl': u'[a-zęóąśłżźćńĘÓĄŚŁŻŹĆŃ]*', + 'pt': u'[a-záâàãéêíóôõúüç]*', + 'ro': u'[a-zăâîşţșțĂÂÎŞŢȘȚ]*', + 'ru': u'[a-zа-я]*', + 'sk': u'[a-záäčďéíľĺňóôŕšťúýž]*', } # Wikimedia wikis all use "bodyContent" as the id of the <div> @@ -3349,8 +3349,8 @@ 'dict': 'dict', 'dictionary': 'dictionary', 'disinfopedia': 'disinfopedia', - 'distributedproofreaders':'distributedproofreaders', - 'distributedproofreadersca':'distributedproofreadersca', + 'distributedproofreaders': 'distributedproofreaders', + 'distributedproofreadersca': 'distributedproofreadersca', 'dk': 'dk', 'dmoz': 'dmoz', 'dmozs': 'dmozs', @@ -3499,7 +3499,7 @@ 'organicdesign': 'organicdesign', 'orgpatterns': 'orgpatterns', 'orthodoxwiki': 'orthodoxwiki', - 'osi reference model':'osi reference model', + 'osi reference model': 'osi reference model', 'otrs': 'otrs', 'otrswiki': 'otrswiki', 'ourmedia': 'ourmedia', @@ -3633,7 +3633,7 @@ 'wikinvest': 'wikinvest', 'wikipaltz': 'wikipaltz', 'wikipedia': 'wikipedia', - 'wikipediawikipedia':'wikipediawikipedia', + 'wikipediawikipedia': 'wikipediawikipedia', 'wikiquote': 'wikiquote', 'wikireason': 'wikireason', 'wikischool': 'wikischool', @@ -3772,7 +3772,7 @@ # equivalent articles have identical titles among the group. self.language_groups = { # languages using the arabic script (incomplete) - 'arab' : [ + 'arab': [ 'ar', 'arz', 'ps', 'sd', 'ur', 'bjn', 'ckb', # languages using multiple scripts, including arabic 'kk', 'ku', 'tt', 'ug', 'pnb' @@ -3858,18 +3858,19 @@ return pywikibot.Family(self.interwiki_forward).langs.keys() return self.langs.keys() - def _addlang(self, code, location, namespaces = {}): + def _addlang(self, code, location, namespaces={}): """Add a new language to the langs and namespaces of the family. - This is supposed to be called in the constructor of the family.""" + This is supposed to be called in the constructor of the family. + + """ self.langs[code] = location - for num, val in namespaces.iteritems(): - self.namespaces[num][code]=val + self.namespaces[num][code] = val def get_known_families(self, site): return self.known_families - def linktrail(self, code, fallback = '_default'): + def linktrail(self, code, fallback='_default'): if code in self.linktrails: return self.linktrails[code] elif fallback: @@ -3879,15 +3880,16 @@ "ERROR: linktrail in language %(language_code)s unknown" % {'language_code': code}) - def namespace(self, code, ns_number, fallback = '_default', all = False): + def namespace(self, code, ns_number, fallback='_default', all=False): if not self.isDefinedNS(ns_number): - raise KeyError('ERROR: Unknown namespace %d for %s:%s' % (ns_number, code, self.name)) + raise KeyError('ERROR: Unknown namespace %d for %s:%s' + % (ns_number, code, self.name)) elif self.isNsI18N(ns_number, code): v = self.namespaces[ns_number][code] if type(v) == list: v = v[:] else: - v = [v,] + v = [v] if all and self.isNsI18N(ns_number, fallback): v2 = self.namespaces[ns_number][fallback] if type(v2) is list: @@ -3899,9 +3901,10 @@ if type(v) == list: v = v[:] else: - v = [v,] + v = [v] else: - raise KeyError('ERROR: title for namespace %d in language %s unknown' % (ns_number, code)) + raise KeyError('ERROR: title for namespace %d in language %s unknown' + % (ns_number, code)) if all: namespaces = [] @@ -3913,10 +3916,12 @@ # Lowercase versions of namespaces if code not in self.nocapitalize: - namespaces.extend([ns[0].lower() + ns[1:] for ns in namespaces if ns and ns[0].lower() != ns[0].upper()]) + namespaces.extend([ns[0].lower() + ns[1:] for ns in namespaces + if ns and ns[0].lower() != ns[0].upper()]) # Underscore versions of namespaces - namespaces.extend([ns.replace(' ', '_') for ns in namespaces if ns and ' ' in ns]) + namespaces.extend([ns.replace(' ', '_') for ns in namespaces + if ns and ' ' in ns]) return tuple(namespaces) else: @@ -3977,6 +3982,7 @@ namespaces. Sites may have more than one way to write the same namespace - choose the first one in the list. Returns namespace index or None. + """ namespace = namespace.lower() for n in self.namespaces.keys(): @@ -3987,7 +3993,7 @@ for ns in nslist: if ns.lower() == namespace: return n - except (KeyError,AttributeError): + except (KeyError, AttributeError): # The namespace has no localized name defined pass if lang != '_default': @@ -4008,7 +4014,7 @@ "ERROR: title for category redirect template in language '%s' unknown" % code) - def disambig(self, code, fallback = '_default'): + def disambig(self, code, fallback='_default'): if code in self.disambiguationTemplates: return self.disambiguationTemplates[code] elif fallback: @@ -4024,37 +4030,37 @@ # 'fallback' (or, if fallback isn't given, MediaWiki default). # If you want the bot to crash in case of an unknown namespace name, use # fallback = None. - def special_namespace(self, code, fallback = '_default'): + def special_namespace(self, code, fallback='_default'): return self.namespace(code, -1, fallback) - def special_namespace_url(self, code, fallback = '_default'): + def special_namespace_url(self, code, fallback='_default'): encoded_title = self.namespace(code, -1, fallback).encode(self.code2encoding(code)) return urllib.quote(encoded_title) - def image_namespace(self, code, fallback = '_default'): + def image_namespace(self, code, fallback='_default'): return self.namespace(code, 6, fallback) - def image_namespace_url(self, code, fallback = '_default'): + def image_namespace_url(self, code, fallback='_default'): encoded_title = self.namespace(code, 6, fallback).encode(self.code2encoding(code)) return urllib.quote(encoded_title) - def mediawiki_namespace(self, code, fallback = '_default'): + def mediawiki_namespace(self, code, fallback='_default'): return self.namespace(code, 8, fallback) - def template_namespace(self, code, fallback = '_default'): + def template_namespace(self, code, fallback='_default'): return self.namespace(code, 10, fallback) - def category_namespace(self, code, fallback = '_default'): + def category_namespace(self, code, fallback='_default'): return self.namespace(code, 14, fallback) def category_namespaces(self, code): - return self.namespace(code, 14, all = True) + return self.namespace(code, 14, all=True) # Methods def protocol(self, code): """ - Can be overridden to return 'https'. - Other protocols are not supported. + Can be overridden to return 'https'. Other protocols are not supported. + """ return 'http%s' % ('', 's')[config.SSL_connection] @@ -4117,107 +4123,145 @@ return 1000 * int(M.group(1)) + int(M.group(2)) - 1000 def page_action_address(self, code, name, action): - return '%s?title=%s&action=%s&useskin=monobook' % (self.path(code), name, action) + return '%s?title=%s&action=%s&useskin=monobook' % ( + self.path(code), name, action) def put_address(self, code, name): - return '%s?title=%s&action=submit&useskin=monobook' % (self.path(code), name) + return '%s?title=%s&action=submit&useskin=monobook' % ( + self.path(code), name) def get_address(self, code, name): - return '%s?title=%s&redirect=no&useskin=monobook' % (self.path(code), name) + return '%s?title=%s&redirect=no&useskin=monobook' % ( + self.path(code), name) # The URL to get a page, in the format indexed by Google. def nice_get_address(self, code, name): return '%s%s' % (self.nicepath(code), name) def edit_address(self, code, name): - return '%s?title=%s&action=edit&useskin=monobook' % (self.path(code), name) + return '%s?title=%s&action=edit&useskin=monobook' % ( + self.path(code), name) def watch_address(self, code, name): - return '%s?title=%s&action=watch&useskin=monobook' % (self.path(code), name) + return '%s?title=%s&action=watch&useskin=monobook' % ( + self.path(code), name) def unwatch_address(self, code, name): - return '%s?title=%s&action=unwatch&useskin=monobook' % (self.path(code), name) + return '%s?title=%s&action=unwatch&useskin=monobook' % ( + self.path(code), name) def purge_address(self, code, name): - return '%s?title=%s&redirect=no&action=purge&useskin=monobook' % (self.path(code), name) + return '%s?title=%s&redirect=no&action=purge&useskin=monobook' % ( + self.path(code), name) def references_address(self, code, name): - return '%s?title=%s:Whatlinkshere&target=%s&limit=%d&useskin=monobook' % (self.path(code), self.special_namespace_url(code), name, config.special_page_limit) + return '%s?title=%s:Whatlinkshere&target=%s&limit=%d&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code), name, config.special_page_limit) def upload_address(self, code): - return '%s?title=%s:Upload&useskin=monobook' % (self.path(code), self.special_namespace_url(code)) + return '%s?title=%s:Upload&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code)) - def double_redirects_address(self, code, default_limit = True): + def double_redirects_address(self, code, default_limit=True): if default_limit: - return '%s?title=%s:DoubleRedirects&useskin=monobook' % (self.path(code), self.special_namespace_url(code)) + return '%s?title=%s:DoubleRedirects&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code)) else: - return '%s?title=%s:DoubleRedirects&limit=%d&useskin=monobook' % (self.path(code), self.special_namespace_url(code), config.special_page_limit) + return '%s?title=%s:DoubleRedirects&limit=%d&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code), + config.special_page_limit) - def broken_redirects_address(self, code, default_limit = True): + def broken_redirects_address(self, code, default_limit=True): if default_limit: - return '%s?title=%s:BrokenRedirects&useskin=monobook' % (self.path(code), self.special_namespace_url(code)) + return '%s?title=%s:BrokenRedirects&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code)) else: - return '%s?title=%s:BrokenRedirects&limit=%d&useskin=monobook' % (self.path(code), self.special_namespace_url(code), config.special_page_limit) + return '%s?title=%s:BrokenRedirects&limit=%d&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code), + config.special_page_limit) def random_address(self, code): - return "%s?title=%s:Random&useskin=monobook" % (self.path(code), self.special_namespace_url(code)) + return "%s?title=%s:Random&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code)) def randomredirect_address(self, code): - return "%s?title=%s:RandomRedirect&useskin=monobook" % (self.path(code), self.special_namespace_url(code)) + return "%s?title=%s:RandomRedirect&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code)) def allmessages_address(self, code): - return "%s?title=%s:Allmessages&ot=html&useskin=monobook" % (self.path(code), self.special_namespace_url(code)) + return "%s?title=%s:Allmessages&ot=html&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code)) def login_address(self, code): - return '%s?title=%s:Userlogin&useskin=monobook' % (self.path(code), self.special_namespace_url(code)) + return '%s?title=%s:Userlogin&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code)) def captcha_image_address(self, code, id): - return '%s?title=%s:Captcha/image&wpCaptchaId=%s&useskin=monobook' % (self.path(code), self.special_namespace_url(code), id) + return '%s?title=%s:Captcha/image&wpCaptchaId=%s&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code), id) def watchlist_address(self, code): - return '%s?title=%s:Watchlist/edit&useskin=monobook' % (self.path(code), self.special_namespace_url(code)) + return '%s?title=%s:Watchlist/edit&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code)) def contribs_address(self, code, target, limit=500, offset=''): - return '%s?title=%s:Contributions&target=%s&limit=%s&offset=%s&useskin=monobook' % (self.path(code), self.special_namespace_url(code), target, limit, offset) + return '%s?title=%s:Contributions&target=%s&limit=%s&offset=%s&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code), target, limit, offset) def move_address(self, code): - return '%s?title=%s:Movepage&action=submit&useskin=monobook' % (self.path(code), self.special_namespace_url(code)) + return '%s?title=%s:Movepage&action=submit&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code)) def delete_address(self, code, name): - return '%s?title=%s&action=delete&useskin=monobook' % (self.path(code), name) + return '%s?title=%s&action=delete&useskin=monobook' % ( + self.path(code), name) def undelete_view_address(self, code, name, ts=''): - return '%s?title=%s:Undelete&target=%s&timestamp=%s&useskin=monobook' % (self.path(code), self.special_namespace_url(code), name, ts) + return '%s?title=%s:Undelete&target=%s&timestamp=%s&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code), name, ts) def undelete_address(self, code): return '%s?title=%s:Undelete&action=submit&useskin=monobook' % (self.path(code), self.special_namespace_url(code)) def protect_address(self, code, name): - return '%s?title=%s&action=protect&useskin=monobook' % (self.path(code), name) + return '%s?title=%s&action=protect&useskin=monobook' % (self.path(code), + name) def unprotect_address(self, code, name): - return '%s?title=%s&action=unprotect&useskin=monobook' % (self.path(code), name) + return '%s?title=%s&action=unprotect&useskin=monobook' % ( + self.path(code), name) def block_address(self, code): - return '%s?title=%s:Blockip&action=submit&useskin=monobook' % (self.path(code), self.special_namespace_url(code)) + return '%s?title=%s:Blockip&action=submit&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code)) def unblock_address(self, code): - return '%s?title=%s:Ipblocklist&action=submit&useskin=monobook' % (self.path(code), self.special_namespace_url(code)) + return '%s?title=%s:Ipblocklist&action=submit&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code)) def blocksearch_address(self, code, name): - return '%s?title=%s:Ipblocklist&action=search&ip=%s&useskin=monobook' % (self.path(code), self.special_namespace_url(code), name) + return '%s?title=%s:Ipblocklist&action=search&ip=%s&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code), name) def linksearch_address(self, code, link, limit=500, offset=0): - return '%s?title=%s:Linksearch&limit=%d&offset=%d&target=%s&useskin=monobook' % (self.path(code), self.special_namespace_url(code), limit, offset, link) + return '%s?title=%s:Linksearch&limit=%d&offset=%d&target=%s&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code), limit, offset, + link) - def version_history_address(self, code, name, limit = config.special_page_limit): - return '%s?title=%s&action=history&limit=%d&useskin=monobook' % (self.path(code), name, limit) + def version_history_address(self, code, name, + limit=config.special_page_limit): + return '%s?title=%s&action=history&limit=%d&useskin=monobook' % ( + self.path(code), name, limit) def export_address(self, code): - return '%s?title=%s:Export&useskin=monobook' % (self.path(code), self.special_namespace_url('_default')) + return '%s?title=%s:Export&useskin=monobook' % ( + self.path(code), self.special_namespace_url('_default')) - def globalusers_address(self, code, target='', limit=500, offset='', group=''): - return '%s?title=%s:GlobalUsers&username=%s&limit=%s&offset=%s&group=%s&useskin=monobook' % (self.path(code), self.special_namespace_url(code), target, limit, offset, group) + def globalusers_address(self, code, target='', limit=500, offset='', + group=''): + return '%s?title=%s:GlobalUsers&username=%s&limit=%s&offset=%s&group=%s&useskin=monobook' % ( + self.path(code), self.special_namespace_url(code), target, limit, + offset, group) def query_address(self, code): return '%s?' % self.querypath(code) @@ -4225,7 +4269,7 @@ def api_address(self, code): return '%s?' % self.apipath(code) - def search_address(self, code, query, limit=100, namespaces = None): + def search_address(self, code, query, limit=100, namespaces=None): """ Constructs a URL for searching using Special:Search 'namespaces' may be an int or a list; an empty list selects @@ -4235,7 +4279,7 @@ if namespaces is not None: if isinstance(namespaces, int): namespace_params = "&ns%d=1" % namespaces - elif isinstance (namespaces, list): + elif isinstance(namespaces, list): if len(namespaces) == 0: # add all namespaces namespaces = self.namespaces.keys() @@ -4243,73 +4287,90 @@ if i >= 0: namespace_params = namespace_params + '&ns%d=1' % i - return "%s?title=%s:Search&search=%s&limit=%d%s&fulltext=1&useskin=monobook" % (self.path(code), - self.special_namespace_url(code), - query, - limit, - namespace_params) + return "%s?title=%s:Search&search=%s&limit=%d%s&fulltext=1&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), query, limit, + namespace_params) - def allpages_address(self, code, start, namespace = 0): - if self.version(code)=="1.2": + def allpages_address(self, code, start, namespace=0): + if self.version(code) == "1.2": return '%s?title=%s:Allpages&printable=yes&from=%s&useskin=monobook' % ( self.path(code), self.special_namespace_url(code), start) else: return '%s?title=%s:Allpages&from=%s&namespace=%s&useskin=monobook' % ( - self.path(code), self.special_namespace_url(code), start, namespace) + self.path(code), self.special_namespace_url(code), start, + namespace) - def log_address(self, code, limit=50, mode = '', user = ''): - return "%s?title=Special:Log&type=%s&user=%s&page=&limit=%d&useskin=monobook" % (self.path(code), mode, user, limit) + def log_address(self, code, limit=50, mode='', user=''): + return "%s?title=Special:Log&type=%s&user=%s&page=&limit=%d&useskin=monobook" % ( + self.path(code), mode, user, limit) def newpages_address(self, code, limit=50, namespace=0): - return "%s?title=%s:Newpages&limit=%d&namespace=%s&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit, namespace) + return "%s?title=%s:Newpages&limit=%d&namespace=%s&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit, namespace) def longpages_address(self, code, limit=500): - return "%s?title=%s:Longpages&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:Longpages&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def shortpages_address(self, code, limit=500): - return "%s?title=%s:Shortpages&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:Shortpages&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def categories_address(self, code, limit=500): - return "%s?title=%s:Categories&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:Categories&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def unusedfiles_address(self, code, limit=500): - return "%s?title=%s:UnusedFiles&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:UnusedFiles&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def deadendpages_address(self, code, limit=500): - return "%s?title=%s:Deadendpages&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:Deadendpages&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def ancientpages_address(self, code, limit=500): - return "%s?title=%s:Ancientpages&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:Ancientpages&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def lonelypages_address(self, code, limit=500): - return "%s?title=%s:Lonelypages&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:Lonelypages&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def protectedpages_address(self, code, limit=500): - return "%s?title=%s:ProtectedPages&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:ProtectedPages&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def unwatchedpages_address(self, code, limit=500): - return "%s?title=%s:Unwatchedpages&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:Unwatchedpages&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def uncategorizedcategories_address(self, code, limit=500): - return "%s?title=%s:Uncategorizedcategories&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:Uncategorizedcategories&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def uncategorizedimages_address(self, code, limit=500): - return "%s?title=%s:Uncategorizedimages&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:Uncategorizedimages&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def uncategorizedpages_address(self, code, limit=500): - return "%s?title=%s:Uncategorizedpages&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:Uncategorizedpages&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def uncategorizedtemplates_address(self, code, limit=500): - return "%s?title=%s:UncategorizedTemplates&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:UncategorizedTemplates&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def unusedcategories_address(self, code, limit=500): - return "%s?title=%s:Unusedcategories&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:Unusedcategories&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def wantedcategories_address(self, code, limit=500): - return "%s?title=%s:wantedcategories&limit=%d&useskin=monobook&uselang=en" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:wantedcategories&limit=%d&useskin=monobook&uselang=en" % ( + self.path(code), self.special_namespace_url(code), limit) def withoutinterwiki_address(self, code, limit=500): - return "%s?title=%s:Withoutinterwiki&limit=%d&useskin=monobook" % (self.path(code), self.special_namespace_url(code), limit) + return "%s?title=%s:Withoutinterwiki&limit=%d&useskin=monobook" % ( + self.path(code), self.special_namespace_url(code), limit) def code2encoding(self, code): """Return the encoding for a specific language wiki""" @@ -4344,7 +4405,9 @@ def RversionTab(self, code): """Change this to some regular expression that shows the page we - found is an existing page, in case the normal regexp does not work.""" + found is an existing page, in case the normal regexp does not work. + + """ return None def has_query_api(self, code): @@ -4475,4 +4538,3 @@ def shared_image_repository(self, code): return ('commons', 'commons') -

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn March 2013