Pywikipedia-svn December 2010

pywikipedia-svn@lists.wikimedia.org

5 participants
70 discussions

SVN: [8777] trunk/pywikipedia/interwiki_graph.py
by valhallasw＠svn.wikimedia.org 14 Dec '10

14 Dec '10

Revision: 8777 Author: valhallasw Date: 2010-12-13 23:07:45 +0000 (Mon, 13 Dec 2010) Log Message: ----------- Workaround for pydot 1.0.3 API change In pydot >= 1.0.3, get_edge always returns a list, while in <= 1.0.2, it returned the edge it if only one edge was listed. Modified Paths: -------------- trunk/pywikipedia/interwiki_graph.py Modified: trunk/pywikipedia/interwiki_graph.py =================================================================== --- trunk/pywikipedia/interwiki_graph.py 2010-12-13 23:06:39 UTC (rev 8776) +++ trunk/pywikipedia/interwiki_graph.py 2010-12-13 23:07:45 UTC (rev 8777) @@ -83,8 +83,12 @@ sourceLabel = self.getLabel(refPage) targetLabel = self.getLabel(page) edge = pydot.Edge(sourceLabel, targetLabel) + oppositeEdge = self.graph.get_edge(targetLabel, sourceLabel) if oppositeEdge: + if isinstance(oppositeEdge, list): + # bugfix for pydot >= 1.0.3 + oppositeEdge = oppositeEdge[0] #oppositeEdge.set_arrowtail('normal') oppositeEdge.set_dir('both') # workaround for bug [ 1722739 ]: prevent duplicate edges

1 0

SVN: [8776] trunk/pywikipedia/interwiki_graph.py
by valhallasw＠svn.wikimedia.org 14 Dec '10

14 Dec '10

Revision: 8776 Author: valhallasw Date: 2010-12-13 23:06:39 +0000 (Mon, 13 Dec 2010) Log Message: ----------- Revert creation of SpeedyShareUploader (r3563) r3563 added an uploader for SpeedyShare, which has little to do with drawing interwiki graphs. As such, I removed it. If someone deems this code necessary, please add it in a seperate file. Modified Paths: -------------- trunk/pywikipedia/interwiki_graph.py Modified: trunk/pywikipedia/interwiki_graph.py =================================================================== --- trunk/pywikipedia/interwiki_graph.py 2010-12-13 16:45:25 UTC (rev 8775) +++ trunk/pywikipedia/interwiki_graph.py 2010-12-13 23:06:39 UTC (rev 8776) @@ -14,10 +14,6 @@ import wikipedia as pywikibot import config -# for speedyshare -import re -import httplib, urllib2, mimetypes - class GraphImpossible(Exception): "Drawing a graph is not possible on your system." @@ -140,96 +136,6 @@ self.addDirectedEdge(page, refPage) self.saveGraphFile() -class SpeedyShareUploader: - def __init__(self): - pass - - def getToken(self): - formR = re.compile( - '<form target=_top method="post" action="upload\.php\?(\d+)"') - - uploadPage = urllib2.urlopen( - 'http://www.speedyshare.com/index_upload.php') - text = uploadPage.read() - token = formR.search(text).group(1) - return token - - def post_multipart(self, host, selector, fields, files): - """ - Post fields and files to an http host as multipart/form-data. - fields is a sequence of (name, value) elements for regular form fields. - files is a sequence of (name, filename, value) elements for data to be - uploaded as files. Return the server's response page. - """ - content_type, body = self.encode_multipart_formdata(fields, files) - h = httplib.HTTP(host) - h.putrequest('POST', selector) - h.putheader('Content-Type', content_type) - h.putheader('Content-Length', str(len(body))) - h.putheader('User-Agent', - 'Mozilla/5.0 (X11; U; Linux i686; de; rv:1.8) Gecko/20051128 SUSE/1.5-0.1 Firefox/1.5') - h.putheader('Referer', 'http://www.speedyshare.com/index_upload.php') - h.putheader('Accept', - 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5') - h.putheader('Accept-Language', 'de-de,de;q=0.8,en-us;q=0.5,en;q=0.3') - h.putheader('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7') - h.putheader('Keep-Alive', '30') - h.putheader('Connection', 'keep-alive') - - h.endheaders() - h.send(body) - errcode, errmsg, headers = h.getreply() - return errcode, h.file.read() - - def encode_multipart_formdata(self, fields, files): - """ - fields is a sequence of (name, value) elements for regular form fields. - files is a sequence of (name, filename, value) elements for data to be - uploaded as files. Return (content_type, body) ready for httplib.HTTP - instance - """ - BOUNDARY = '----------ThIs_Is_tHe_bouNdaRY_$' - CRLF = '\r\n' - L = [] - for (key, value) in fields: - L.append('--' + BOUNDARY) - L.append('Content-Disposition: form-data; name="%s"' % key) - L.append('') - L.append(value) - for (key, filename, value) in files: - L.append('--' + BOUNDARY) - L.append( - 'Content-Disposition: form-data; name="%s"; filename="%s"' - % (key, filename)) - L.append('Content-Type: %s' % self.get_content_type(filename)) - L.append('') - L.append(value) - L.append('--' + BOUNDARY + '--') - L.append('') - body = CRLF.join(L) - content_type = 'multipart/form-data; boundary=%s' % BOUNDARY - return content_type, body - - def get_content_type(self, filename): - return mimetypes.guess_type(filename)[0] \ - or 'application/octet-stream' - - def upload(self, filename): - token = self.getToken() - - file = open(filename) - encodedFilename = filename#.encode('utf-8') - contents = file.read() - formdata = [] - - response, returned_html = self.post_multipart('www.speedyshare.com', - 'upload.php?' + token, - formdata, - [('fileup0', encodedFilename, contents)]) - print response - print returned_html - - def getFilename(page, extension = None): filename = '%s-%s-%s' % (page.site().family.name, page.site().language(), @@ -238,7 +144,3 @@ filename += '.%s' % extension return filename -if __name__ == "__main__": - uploader = SpeedyShareUploader() - uploader.upload( - '/home/daniel/projekte/pywikipedia/interwiki-graphs/wikipedia-de-CEE.svg')

1 0

SVN: [8775] trunk/pywikipedia/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 13 Dec '10

13 Dec '10

Revision: 8775 Author: xqt Date: 2010-12-13 16:45:25 +0000 (Mon, 13 Dec 2010) Log Message: ----------- cross namespace for mzn-wiki (not registered namespace alias) Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-12-13 16:39:40 UTC (rev 8774) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-12-13 16:45:25 UTC (rev 8775) @@ -1044,6 +1044,11 @@ 'km': { '_default': [0, 4, 12], }, + #wrong wikipedia namespace alias + 'mzn': { + '_default': [0, 4], + + }, } self.crossnamespace[1] = { '_default': {

1 0

SVN: [8774] branches/rewrite/pywikibot/pagegenerators.py
by xqt＠svn.wikimedia.org 13 Dec '10

13 Dec '10

Revision: 8774 Author: xqt Date: 2010-12-13 16:39:40 +0000 (Mon, 13 Dec 2010) Log Message: ----------- Bugfix for r8641 (patch bug #3085873 submitted by stanlekub) Modified Paths: -------------- branches/rewrite/pywikibot/pagegenerators.py Modified: branches/rewrite/pywikibot/pagegenerators.py =================================================================== --- branches/rewrite/pywikibot/pagegenerators.py 2010-12-13 16:28:42 UTC (rev 8773) +++ branches/rewrite/pywikibot/pagegenerators.py 2010-12-13 16:39:40 UTC (rev 8774) @@ -734,10 +734,7 @@ seenPages = {} for page in generator: if page not in seenPages: - _page = u"%s:%s:%s" % (page.site.family.name, - page.site.code, - page.title()) - seenPages[_page] = True + seenPages[page] = True yield page

1 0

SVN: [8773] branches/rewrite/scripts/interwiki.py
by xqt＠svn.wikimedia.org 13 Dec '10

13 Dec '10

Revision: 8773 Author: xqt Date: 2010-12-13 16:28:42 +0000 (Mon, 13 Dec 2010) Log Message: ----------- update from trunk r8761 Modified Paths: -------------- branches/rewrite/scripts/interwiki.py Modified: branches/rewrite/scripts/interwiki.py =================================================================== --- branches/rewrite/scripts/interwiki.py 2010-12-13 16:09:10 UTC (rev 8772) +++ branches/rewrite/scripts/interwiki.py 2010-12-13 16:28:42 UTC (rev 8773) @@ -60,18 +60,6 @@ against the live wiki is using the warnfile.py script. - -quiet: Use this option to get less output - - -async: Put page on queue to be saved to wiki asynchronously. This - enables loading pages during saving throtteling and gives a - better performance. - NOTE: For post-processing it always assumes that saving the - the pages was sucessful. - - -summary: Set an additional action summary message for the edit. This - could be used for further explainings of the bot action. - This will only be used in non-autonomous mode. - Additionaly, these arguments can be used to restrict the bot to certain pages: -namespace:n Number or name of namespace to process. The parameter can be @@ -103,9 +91,23 @@ -lack: used as -lack:xx with xx a language code: only work on pages without links to language xx. You can also add a number nn - lick -lack:xx:nn, so that the bot only works on pages with - at least n interwiki links (the default value for n is 1). - + like -lack:xx:nn, so that the bot only works on pages with + at least nn interwiki links (the default value for nn is 1). + +These arguments control miscellanous bot behaviour: + + -quiet: Use this option to get less output + + -async: Put page on queue to be saved to wiki asynchronously. This + enables loading pages during saving throtteling and gives a + better performance. + NOTE: For post-processing it always assumes that saving the + the pages was sucessful. + + -summary: Set an additional action summary message for the edit. This + could be used for further explainings of the bot action. + This will only be used in non-autonomous mode. + These arguments are useful to provide hints to the bot: -hint: used as -hint:de:Anweisung to give the robot a hint @@ -122,7 +124,7 @@ * 10: The 10 largest languages (sites with most articles). Analogous for any other natural number. - * arab: All languages useing the Arabic alphabet. + * arab: All languages using the Arabic alphabet. * cyril: All languages that use the Cyrillic alphabet. * chinese: All Chinese dialects. * latin: All languages using the Latin script. @@ -204,7 +206,7 @@ -initialredirect work on its target if a redirect or category redirect is entered on the command line or by a generator (note: without - ending colon). It is recommended to use this option with + ending colon). It is recommended to use this option with the -movelog pagegenerator. -neverlink: used as -neverlink:xx where xx is a language code: @@ -218,10 +220,10 @@ -ignorefile: similar to -ignore, except that the pages are taken from the given file instead of the command line. - -localright do not follow interwiki from other pages than the starting - page. (Warning! Should be used very sparingly, only when - you are sure you have first gotten the interwiki on the - starting page exactly right). + -localright do not follow interwiki links from other pages than the + starting page. (Warning! Should be used very sparingly, + only when you are sure you have first gotten the interwiki + links on the starting page exactly right). (note: without ending colon) -hintsareright do not follow interwiki links to sites for which hints @@ -253,16 +255,17 @@ -whenneeded works like limittwo, but other languages are changed in the following cases: - * If there are no interwiki at all on the page - * If an interwiki must be removed - * If an interwiki must be changed and there has been a - conflict for this page + * If there are no interwiki links at all on the page + * If an interwiki link must be removed + * If an interwiki link must be changed and there has been + a conflict for this page Optionally, -whenneeded can be given an additional number (for example -whenneeded:3), in which case other languages will be changed if there are that number or more links to change or add. (note: without ending colon) The following arguments influence how many pages the bot works on at once: + -array: The number of pages the bot tries to be working on at once. If the number of pages loaded is lower than this number, a new set of pages is loaded from the starting wiki. The @@ -295,8 +298,8 @@ to the interwiki-dumps subdirectory. The program will read it if invoked with the "-restore" or "-continue" option, and finish all the subjects in that list. After finishing the dump file will be deleted. To run the interwiki-bot on all -pages on a language, run it with option "-start:!", and if it takes so long you -have to break it off, use "-continue" next time. +pages on a language, run it with option "-start:!", and if it takes so long that +you have to break it off, use "-continue" next time. """ # @@ -345,7 +348,7 @@ import pywikibot import config2 as config import catlib -from pywikibot import pagegenerators, catlib, config2 as config +from pywikibot import pagegenerators import titletranslate, interwiki_graph import webbrowser @@ -587,7 +590,7 @@ } # A list of template names in different languages. -# Pages which contains these shouldn't be changed. +# Pages which contain these shouldn't be changed. ignoreTemplates = { '_default': [u'delete'], 'ar' : [u'قيد الاستخدام'], @@ -847,7 +850,7 @@ # to the original topic than pages found later on, after # 3, 4, 5 or more interwiki hops. - # Keeping this order is hence important to display ordered + # Keeping this order is hence important to display an ordered # list of pages to the user when he'll be asked to resolve # conflicts. self.tree = {} @@ -987,7 +990,7 @@ # download. self.pending = PageTree() if globalvar.hintsareright: - # This is a set of sites that we got hits to + # This is a set of sites that we got hints to self.hintedsites = set() self.translate(hints, globalvar.hintsareright) self.confirm = globalvar.confirm @@ -1155,17 +1158,24 @@ if linkedPage.namespace() in nsmatch: return False if globalvar.autonomous: - pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i." % (linkingPage, linkingPage.namespace(), linkedPage, linkedPage.namespace())) + pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i." + % (linkingPage, linkingPage.namespace(), + linkedPage, linkedPage.namespace())) # Fill up foundIn, so that we will not write this notice self.foundIn[linkedPage] = [linkingPage] return True else: preferredPage = self.getFoundInCorrectNamespace(linkedPage.site) if preferredPage: - pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i because page %s in the correct namespace has already been found." % (linkingPage, linkingPage.namespace(), linkedPage, linkedPage.namespace(), preferredPage)) + pywikibot.output(u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i because page %s in the correct namespace has already been found." + % (linkingPage, linkingPage.namespace(), linkedPage, + linkedPage.namespace(), preferredPage)) return True else: - choice = pywikibot.inputChoice(u'WARNING: %s is in namespace %i, but %s is in namespace %i. Follow it anyway?' % (self.originPage, self.originPage.namespace(), linkedPage, linkedPage.namespace()), ['Yes', 'No', 'Add an alternative', 'give up'], ['y', 'n', 'a', 'g']) + choice = pywikibot.inputChoice(u'WARNING: %s is in namespace %i, but %s is in namespace %i. Follow it anyway?' + % (self.originPage, self.originPage.namespace(), + linkedPage, linkedPage.namespace()), + ['Yes', 'No', 'Add an alternative', 'give up'], ['y', 'n', 'a', 'g']) if choice != 'y': # Fill up foundIn, so that we will not ask again self.foundIn[linkedPage] = [linkingPage] @@ -1211,31 +1221,42 @@ """ if globalvar.autonomous: if self.originPage.isDisambig() and not page.isDisambig(): - pywikibot.output(u"NOTE: Ignoring link from disambiguation page %s to non-disambiguation %s" % (self.originPage, page)) + pywikibot.output(u"NOTE: Ignoring link from disambiguation page %s to non-disambiguation %s" + % (self.originPage, page)) return (True, None) elif not self.originPage.isDisambig() and page.isDisambig(): - pywikibot.output(u"NOTE: Ignoring link from non-disambiguation page %s to disambiguation %s" % (self.originPage, page)) + pywikibot.output(u"NOTE: Ignoring link from non-disambiguation page %s to disambiguation %s" + % (self.originPage, page)) return (True, None) else: choice = 'y' if self.originPage.isDisambig() and not page.isDisambig(): disambig = self.getFoundDisambig(page.site) if disambig: - pywikibot.output(u"NOTE: Ignoring non-disambiguation page %s for %s because disambiguation page %s has already been found." % (page, self.originPage, disambig)) + pywikibot.output(u"NOTE: Ignoring non-disambiguation page %s for %s because disambiguation page %s has already been found." + % (page, self.originPage, disambig)) return (True, None) else: - choice = pywikibot.inputChoice(u'WARNING: %s is a disambiguation page, but %s doesn\'t seem to be one. Follow it anyway?' % (self.originPage, page), ['Yes', 'No', 'Add an alternative', 'Give up'], ['y', 'n', 'a', 'g']) + choice = pywikibot.inputChoice(u'WARNING: %s is a disambiguation page, but %s doesn\'t seem to be one. Follow it anyway?' + % (self.originPage, page), + ['Yes', 'No', 'Add an alternative', 'Give up'], + ['y', 'n', 'a', 'g']) elif not self.originPage.isDisambig() and page.isDisambig(): nondisambig = self.getFoundNonDisambig(page.site) if nondisambig: - pywikibot.output(u"NOTE: Ignoring disambiguation page %s for %s because non-disambiguation page %s has already been found." % (page, self.originPage, nondisambig)) + pywikibot.output(u"NOTE: Ignoring disambiguation page %s for %s because non-disambiguation page %s has already been found." + % (page, self.originPage, nondisambig)) return (True, None) else: - choice = pywikibot.inputChoice(u'WARNING: %s doesn\'t seem to be a disambiguation page, but %s is one. Follow it anyway?' % (self.originPage, page), ['Yes', 'No', 'Add an alternative', 'Give up'], ['y', 'n', 'a', 'g']) + choice = pywikibot.inputChoice(u'WARNING: %s doesn\'t seem to be a disambiguation page, but %s is one. Follow it anyway?' + % (self.originPage, page), + ['Yes', 'No', 'Add an alternative', 'Give up'], + ['y', 'n', 'a', 'g']) if choice == 'n': return (True, None) elif choice == 'a': - newHint = pywikibot.input(u'Give the alternative for language %s, not using a language code:' % page.site.language()) + newHint = pywikibot.input(u'Give the alternative for language %s, not using a language code:' + % page.site.language()) alternativePage = pywikibot.Page(page.site, newHint) return (True, alternativePage) elif choice == 'g': @@ -1313,7 +1334,9 @@ if globalvar.skipauto: dictName, year = page.autoFormat() if dictName is not None: - pywikibot.output(u'WARNING: %s:%s relates to %s:%s, which is an auto entry %s(%s)' % (self.originPage.site.language(), self.originPage, page.site.language(),page,dictName,year)) + pywikibot.output(u'WARNING: %s:%s relates to %s:%s, which is an auto entry %s(%s)' + % (self.originPage.site.language(), self.originPage, + page.site.language(), page,dictName,year)) # Abort processing if the bot is running in autonomous mode. if globalvar.autonomous: @@ -1363,7 +1386,7 @@ if globalvar.initialredirect: if globalvar.contentsondisk: redirectTargetPage = StoredPage(redirectTargetPage) - #don't follow double redirects; it might be a self loop + # don't follow another redirect; it might be a self loop if not redirectTargetPage.isRedirectPage() \ and not redirectTargetPage.isCategoryRedirect(): self.originPage = redirectTargetPage @@ -1732,7 +1755,7 @@ # http://is.wikipedia.org/wiki/Wikipediaspjall:V%C3%A9lmenni # allow edits for the same conditions as -whenneeded # or the last edit wasn't a bot - # or the last edit as 1 month ago + # or the last edit was 1 month ago smallWikiAllowed = True if globalvar.autonomous and page.site.sitename() == 'wikipedia:is': old={} @@ -2078,16 +2101,22 @@ if expectedPage != page: try: linkedPage = linkedPagesDict[expectedPage.site] - pywikibot.output(u"WARNING: %s: %s does not link to %s but to %s" % (page.site.family.name, page, expectedPage, linkedPage)) + pywikibot.output(u"WARNING: %s: %s does not link to %s but to %s" + % (page.site.family.name, page, + expectedPage, linkedPage)) except KeyError: - pywikibot.output(u"WARNING: %s: %s does not link to %s" % (page.site.family.name, page, expectedPage)) + pywikibot.output(u"WARNING: %s: %s does not link to %s" + % (page.site.family.name, page, + expectedPage)) # Check for superfluous links for linkedPage in linkedPages: if linkedPage not in expectedPages: # Check whether there is an alternative page on that language. # In this case, it was already reported above. if linkedPage.site not in expectedSites: - pywikibot.output(u"WARNING: %s: %s links to incorrect %s" % (page.site.family.name, page, linkedPage)) + pywikibot.output(u"WARNING: %s: %s links to incorrect %s" + % (page.site.family.name, page, + linkedPage)) except (socket.error, IOError): pywikibot.output(u'ERROR: could not report backlinks')

1 0

SVN: [8772] branches/rewrite/pywikibot/families/wiktionary_family.py
by xqt＠svn.wikimedia.org 13 Dec '10

13 Dec '10

Revision: 8772 Author: xqt Date: 2010-12-13 16:09:10 +0000 (Mon, 13 Dec 2010) Log Message: ----------- update family file from trunk r8771 Modified Paths: -------------- branches/rewrite/pywikibot/families/wiktionary_family.py Modified: branches/rewrite/pywikibot/families/wiktionary_family.py =================================================================== --- branches/rewrite/pywikibot/families/wiktionary_family.py 2010-12-13 13:54:07 UTC (rev 8771) +++ branches/rewrite/pywikibot/families/wiktionary_family.py 2010-12-13 16:09:10 UTC (rev 8772) @@ -30,21 +30,66 @@ for lang in self.languages_by_size: self.langs[lang] = '%s.wiktionary.org' % lang - # Other than most Wikipedias, page names must not start with a capital - # letter on ALL Wiktionaries. - self.nocapitalize = self.langs.keys() - # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… - self.cross_allowed = [ - 'ang', 'ast', 'az', 'bg', 'bn', 'da', 'eo', 'es', 'fa', 'fy', 'ga', 'gd', 'hu', - 'ia', 'ie', 'ik', 'jv', 'ka', 'li', 'lt', 'mk', 'nl', 'no', 'oc', 'pt', 'sk', 'tg', 'th', 'ti', - 'ts', 'ug', 'uk', 'vo', 'za', 'zh-min-nan', 'zh', 'zu', - ] # CentralAuth cross avaliable projects. self.cross_projects = [ 'wikipedia', 'wikibooks', 'wikiquote', 'wikisource', 'wikinews', 'wikiversity', 'meta', 'mediawiki', 'test', 'incubator', 'commons', 'species' ] + # Global bot allowed languages on + # http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… + self.cross_allowed = [ + 'ang', 'ast', 'az', 'bg', 'bn', 'da', 'eo', 'es', 'fa', 'fy', 'ga', + 'gd', 'hu', 'ia', 'ie', 'ik', 'jv', 'ka', 'li', 'lt', 'mk', 'nl', + 'no', 'oc', 'pt', 'sk', 'tg', 'th', 'ti', 'ts', 'ug', 'uk', 'vo', + 'za', 'zh-min-nan', 'zh', 'zu', + ] + + # Other than most Wikipedias, page names must not start with a capital + # letter on ALL Wiktionaries. + self.nocapitalize = self.langs.keys() + + self.alphabetic_roman = [ + 'aa', 'af', 'ak', 'als', 'an', 'roa-rup', 'ast', 'gn', 'ay', 'az', + 'id', 'ms', 'bm', 'zh-min-nan', 'jv', 'su', 'mt', 'bi', 'bo', 'bs', + 'br', 'ca', 'cs', 'ch', 'sn', 'co', 'za', 'cy', 'da', 'de', 'na', + 'mh', 'et', 'ang', 'en', 'es', 'eo', 'eu', 'to', 'fr', 'fy', 'fo', + 'ga', 'gv', 'sm', 'gd', 'gl', 'hr', 'io', 'ia', 'ie', 'ik', 'xh', + 'is', 'zu', 'it', 'kl', 'csb', 'kw', 'rw', 'rn', 'sw', 'ky', 'ku', + 'la', 'lv', 'lb', 'lt', 'li', 'ln', 'jbo', 'hu', 'mg', 'mi', 'mo', + 'my', 'fj', 'nah', 'nl', 'cr', 'no', 'nn', 'hsb', 'oc', 'om', 'ug', + 'uz', 'nds', 'pl', 'pt', 'ro', 'rm', 'qu', 'sg', 'sc', 'st', 'tn', + 'sq', 'scn', 'simple', 'ss', 'sk', 'sl', 'so', 'sh', 'fi', 'sv', + 'tl', 'tt', 'vi', 'tpi', 'tr', 'tw', 'vo', 'wa', 'wo', 'ts', 'yo', + 'el', 'av', 'ab', 'ba', 'be', 'bg', 'mk', 'mn', 'ru', 'sr', 'tg', + 'uk', 'kk', 'hy', 'yi', 'he', 'ur', 'ar', 'tk', 'sd', 'fa', 'ha', + 'ps', 'dv', 'ks', 'ne', 'pi', 'bh', 'mr', 'sa', 'hi', 'as', 'bn', + 'pa', 'gu', 'or', 'ta', 'te', 'kn', 'ml', 'si', 'th', 'lo', 'dz', + 'ka', 'ti', 'am', 'chr', 'iu', 'km', 'zh', 'ja', 'ko', + ] + + + # Which languages have a special order for putting interlanguage links, + # and what order is it? If a language is not in interwiki_putfirst, + # alphabetical order on language code is used. For languages that are in + # interwiki_putfirst, interwiki_putfirst is checked first, and + # languages are put in the order given there. All other languages are put + # after those, in code-alphabetical order. + + self.interwiki_putfirst = { + 'da': self.alphabetic, + 'en': self.alphabetic, + 'et': self.alphabetic, + 'fi': self.alphabetic, + 'fy': self.fyinterwiki, + 'he': ['en'], + 'hu': ['en'], + 'ms': self.alphabetic_revised, + 'pl': self.alphabetic, + 'sv': self.alphabetic_roman, + 'simple': self.alphabetic, + } + self.obsolete = { 'aa': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Af… 'ab': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ab… @@ -80,26 +125,6 @@ 'zh-cn': 'zh' } - # Which languages have a special order for putting interlanguage links, - # and what order is it? If a language is not in interwiki_putfirst, - # alphabetical order on language code is used. For languages that are in - # interwiki_putfirst, interwiki_putfirst is checked first, and - # languages are put in the order given there. All other languages are put - # after those, in code-alphabetical order. - - self.interwiki_putfirst = { - 'da': self.alphabetic, - 'en': self.alphabetic, - 'et': self.alphabetic, - 'fi': self.alphabetic, - 'fy': self.fyinterwiki, - 'he': ['en'], - 'hu': ['en'], - 'ms': self.alphabetic_revised, - 'pl': self.alphabetic, - 'simple': self.alphabetic - } - self.interwiki_on_one_line = ['pl'] self.interwiki_attop = ['pl']

1 0

SVN: [8771] trunk/pywikipedia/families/wiktionary_family.py
by xqt＠svn.wikimedia.org 13 Dec '10

13 Dec '10

Revision: 8771 Author: xqt Date: 2010-12-13 13:54:07 +0000 (Mon, 13 Dec 2010) Log Message: ----------- new sorting order for sv-wiki per request http://meta.wikimedia.org/wiki/User_talk:Xqt#iw_sort_order Modified Paths: -------------- trunk/pywikipedia/families/wiktionary_family.py Modified: trunk/pywikipedia/families/wiktionary_family.py =================================================================== --- trunk/pywikipedia/families/wiktionary_family.py 2010-12-12 22:47:38 UTC (rev 8770) +++ trunk/pywikipedia/families/wiktionary_family.py 2010-12-13 13:54:07 UTC (rev 8771) @@ -425,21 +425,65 @@ 'en': u'Sign gloss talk', } - # Other than most Wikipedias, page names must not start with a capital - # letter on ALL Wiktionaries. - self.nocapitalize = self.langs.keys() - - # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… - self.cross_allowed = [ - 'ang', 'ast', 'az', 'bg', 'bn', 'da', 'eo', 'es', 'fa', 'fy', 'ga', 'gd', 'hu', - 'ia', 'ie', 'ik', 'jv', 'ka', 'li', 'lt', 'mk', 'nl', 'no', 'oc', 'pt', 'sk', 'tg', 'th', 'ti', - 'ts', 'ug', 'uk', 'vo', 'za', 'zh-min-nan', 'zh', 'zu', - ] # CentralAuth cross avaliable projects. self.cross_projects = [ 'wikipedia', 'wikibooks', 'wikiquote', 'wikisource', 'wikinews', 'wikiversity', 'meta', 'mediawiki', 'test', 'incubator', 'commons', 'species' ] + # Global bot allowed languages on + # http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… + self.cross_allowed = [ + 'ang', 'ast', 'az', 'bg', 'bn', 'da', 'eo', 'es', 'fa', 'fy', 'ga', + 'gd', 'hu', 'ia', 'ie', 'ik', 'jv', 'ka', 'li', 'lt', 'mk', 'nl', + 'no', 'oc', 'pt', 'sk', 'tg', 'th', 'ti', 'ts', 'ug', 'uk', 'vo', + 'za', 'zh-min-nan', 'zh', 'zu', + ] + + # Other than most Wikipedias, page names must not start with a capital + # letter on ALL Wiktionaries. + self.nocapitalize = self.langs.keys() + + self.alphabetic_roman = [ + 'aa', 'af', 'ak', 'als', 'an', 'roa-rup', 'ast', 'gn', 'ay', 'az', + 'id', 'ms', 'bm', 'zh-min-nan', 'jv', 'su', 'mt', 'bi', 'bo', 'bs', + 'br', 'ca', 'cs', 'ch', 'sn', 'co', 'za', 'cy', 'da', 'de', 'na', + 'mh', 'et', 'ang', 'en', 'es', 'eo', 'eu', 'to', 'fr', 'fy', 'fo', + 'ga', 'gv', 'sm', 'gd', 'gl', 'hr', 'io', 'ia', 'ie', 'ik', 'xh', + 'is', 'zu', 'it', 'kl', 'csb', 'kw', 'rw', 'rn', 'sw', 'ky', 'ku', + 'la', 'lv', 'lb', 'lt', 'li', 'ln', 'jbo', 'hu', 'mg', 'mi', 'mo', + 'my', 'fj', 'nah', 'nl', 'cr', 'no', 'nn', 'hsb', 'oc', 'om', 'ug', + 'uz', 'nds', 'pl', 'pt', 'ro', 'rm', 'qu', 'sg', 'sc', 'st', 'tn', + 'sq', 'scn', 'simple', 'ss', 'sk', 'sl', 'so', 'sh', 'fi', 'sv', + 'tl', 'tt', 'vi', 'tpi', 'tr', 'tw', 'vo', 'wa', 'wo', 'ts', 'yo', + 'el', 'av', 'ab', 'ba', 'be', 'bg', 'mk', 'mn', 'ru', 'sr', 'tg', + 'uk', 'kk', 'hy', 'yi', 'he', 'ur', 'ar', 'tk', 'sd', 'fa', 'ha', + 'ps', 'dv', 'ks', 'ne', 'pi', 'bh', 'mr', 'sa', 'hi', 'as', 'bn', + 'pa', 'gu', 'or', 'ta', 'te', 'kn', 'ml', 'si', 'th', 'lo', 'dz', + 'ka', 'ti', 'am', 'chr', 'iu', 'km', 'zh', 'ja', 'ko', + ] + + + # Which languages have a special order for putting interlanguage links, + # and what order is it? If a language is not in interwiki_putfirst, + # alphabetical order on language code is used. For languages that are in + # interwiki_putfirst, interwiki_putfirst is checked first, and + # languages are put in the order given there. All other languages are put + # after those, in code-alphabetical order. + + self.interwiki_putfirst = { + 'da': self.alphabetic, + 'en': self.alphabetic, + 'et': self.alphabetic, + 'fi': self.alphabetic, + 'fy': self.fyinterwiki, + 'he': ['en'], + 'hu': ['en'], + 'ms': self.alphabetic_revised, + 'pl': self.alphabetic, + 'sv': self.alphabetic_roman, + 'simple': self.alphabetic, + } + self.obsolete = { 'aa': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Af… 'ab': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ab… @@ -475,26 +519,6 @@ 'zh-cn': 'zh' } - # Which languages have a special order for putting interlanguage links, - # and what order is it? If a language is not in interwiki_putfirst, - # alphabetical order on language code is used. For languages that are in - # interwiki_putfirst, interwiki_putfirst is checked first, and - # languages are put in the order given there. All other languages are put - # after those, in code-alphabetical order. - - self.interwiki_putfirst = { - 'da': self.alphabetic, - 'en': self.alphabetic, - 'et': self.alphabetic, - 'fi': self.alphabetic, - 'fy': self.fyinterwiki, - 'he': ['en'], - 'hu': ['en'], - 'ms': self.alphabetic_revised, - 'pl': self.alphabetic, - 'simple': self.alphabetic - } - self.interwiki_on_one_line = ['pl'] self.interwiki_attop = ['pl']

1 0

SVN: [8770] trunk/pywikipedia/reflinks.py
by xqt＠svn.wikimedia.org 12 Dec '10

12 Dec '10

Revision: 8770 Author: xqt Date: 2010-12-12 22:47:38 +0000 (Sun, 12 Dec 2010) Log Message: ----------- support of links containing unicode characters (bug # 3135010 patch submitted by ebraminio) Modified Paths: -------------- trunk/pywikipedia/reflinks.py Modified: trunk/pywikipedia/reflinks.py =================================================================== --- trunk/pywikipedia/reflinks.py 2010-12-12 22:36:06 UTC (rev 8769) +++ trunk/pywikipedia/reflinks.py 2010-12-12 22:47:38 UTC (rev 8770) @@ -528,7 +528,11 @@ f = None try: socket.setdefaulttimeout(20) - f = urllib2.urlopen(ref.url) + try: + f = urllib2.urlopen(ref.url.decode("utf8")) + except UnicodeError: + ref.url = urllib2.quote(ref.url.encode("utf8"),"://") + f = urllib2.urlopen(ref.url) #Try to get Content-Type from server headers = f.info() contentType = headers.getheader('Content-Type')

1 0

SVN: [8769] trunk/pywikipedia/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 12 Dec '10

12 Dec '10

Revision: 8769 Author: xqt Date: 2010-12-12 22:36:06 +0000 (Sun, 12 Dec 2010) Log Message: ----------- additional wikipedia alias for fa-wiki (bug # 3135013) Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-12-10 12:12:33 UTC (rev 8768) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-12-12 22:36:06 UTC (rev 8769) @@ -97,7 +97,7 @@ 'eo': u'Vikipedio', 'et': u'Vikipeedia', 'ext': u'Güiquipeya', - 'fa': u'ویکی‌پدیا', + 'fa': [u'ویکی‌پدیا', u'وپ'], 'fr': [u'Wikipédia', u'Wikipedia'], 'frp': u'Vouiquipèdia', 'fur': u'Vichipedie',

1 0

SVN: [8768]
by xqt＠svn.wikimedia.org 10 Dec '10

10 Dec '10

Revision: 8768 Author: xqt Date: 2010-12-10 12:12:33 +0000 (Fri, 10 Dec 2010) Log Message: ----------- new self.alphabetic sorting order for sv-wiki http://sv.wikipedia.org/wiki/Wikipedia:Bybrunnen/Arkiv/2009/Mars#Ska_vi_beg… Modified Paths: -------------- branches/rewrite/pywikibot/families/wikipedia_family.py trunk/pywikipedia/families/wikipedia_family.py Modified: branches/rewrite/pywikibot/families/wikipedia_family.py =================================================================== --- branches/rewrite/pywikibot/families/wikipedia_family.py 2010-12-10 08:30:41 UTC (rev 8767) +++ branches/rewrite/pywikibot/families/wikipedia_family.py 2010-12-10 12:12:33 UTC (rev 8768) @@ -361,6 +361,7 @@ 'pl': self.alphabetic, 'simple': self.alphabetic, 'sr': self.alphabetic_latin, + 'sv': self.alphabetic, 'te': ['en', 'hi', 'kn', 'ta', 'ml'], 'ur': ['ar', 'fa', 'en'] + self.alphabetic, 'vi': self.alphabetic_revised, Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-12-10 08:30:41 UTC (rev 8767) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-12-10 12:12:33 UTC (rev 8768) @@ -991,6 +991,7 @@ 'pl': self.alphabetic, 'simple': self.alphabetic, 'sr': self.alphabetic_latin, + 'sv': self.alphabetic, 'te': ['en', 'hi', 'kn', 'ta', 'ml'], 'ur': ['ar', 'fa', 'en'] + self.alphabetic, 'vi': self.alphabetic_revised,

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn December 2010