Pywikipedia-svn January 2010

pywikipedia-svn@lists.wikimedia.org

7 participants
53 discussions

SVN: [7862] trunk/pywikipedia/welcome.py
by filnik＠svn.wikimedia.org 06 Jan '10

06 Jan '10

Revision: 7862 Author: filnik Date: 2010-01-06 10:53:08 +0000 (Wed, 06 Jan 2010) Log Message: ----------- Bugfix: another bug due to the rewrite...................... Modified Paths: -------------- trunk/pywikipedia/welcome.py Modified: trunk/pywikipedia/welcome.py =================================================================== --- trunk/pywikipedia/welcome.py 2010-01-06 06:49:23 UTC (rev 7861) +++ trunk/pywikipedia/welcome.py 2010-01-06 10:53:08 UTC (rev 7862) @@ -864,7 +864,7 @@ welcome_comment = wikipedia.translate(self.site, summary) try: #append welcomed, welcome_count++ - ustp.put(welcome_text, welcome_comment) + ustp.put(welcome_text, welcome_comment, minorEdit=False) welcomed_count += 1 self._totallyCount += 1 self.welcomed_users.append(users)

1 0

SVN: [7861] trunk/pywikipedia/disambredir.py
by xqt＠svn.wikimedia.org 05 Jan '10

05 Jan '10

Revision: 7861 Author: xqt Date: 2010-01-06 06:49:23 +0000 (Wed, 06 Jan 2010) Log Message: ----------- declare globals (bugfix for #2926481) Modified Paths: -------------- trunk/pywikipedia/disambredir.py Modified: trunk/pywikipedia/disambredir.py =================================================================== --- trunk/pywikipedia/disambredir.py 2010-01-06 06:06:54 UTC (rev 7860) +++ trunk/pywikipedia/disambredir.py 2010-01-06 06:49:23 UTC (rev 7861) @@ -124,13 +124,10 @@ page.put(text, comment) def main(): + global mysite, linktrail, page start = [] - test = False for arg in wikipedia.handleArgs(): - if arg.startswith("-test"): - test = True - else: - start.append(arg) + start.append(arg) if start: start = " ".join(start) else:

1 0

SVN: [7860] trunk/pywikipedia/families/wikipedia_family.py
by xqt＠svn.wikimedia.org 05 Jan '10

05 Jan '10

Revision: 7860 Author: xqt Date: 2010-01-06 06:06:54 +0000 (Wed, 06 Jan 2010) Log Message: ----------- removal of old unused Disambig templates for pl.wiki, add Disambig template and kategory for szl.wiki (#2926489), update self.languages_by_size Modified Paths: -------------- trunk/pywikipedia/families/wikipedia_family.py Modified: trunk/pywikipedia/families/wikipedia_family.py =================================================================== --- trunk/pywikipedia/families/wikipedia_family.py 2010-01-06 05:50:13 UTC (rev 7859) +++ trunk/pywikipedia/families/wikipedia_family.py 2010-01-06 06:06:54 UTC (rev 7860) @@ -16,7 +16,7 @@ 'ko', 'eo', 'da', 'vo', 'ar', 'id', 'sk', 'vi', 'sr', 'he', 'lt', 'bg', 'fa', 'sl', 'hr', 'et', 'new', 'ms', 'simple', 'gl', 'th', 'nn', 'hi', 'ht', 'eu', 'el', 'te', 'ceb', 'mk', 'ka', - 'la', 'br', 'az', 'bs', 'lb', 'is', 'sh', 'mr', 'cy', 'sq', + 'la', 'br', 'az', 'bs', 'lb', 'sh', 'is', 'mr', 'cy', 'sq', 'lv', 'bpy', 'tl', 'jv', 'be-x-old', 'pms', 'bn', 'ta', 'oc', 'an', 'io', 'be', 'sw', 'nds', 'scn', 'su', 'fy', 'af', 'nap', 'zh-yue', 'ku', 'ast', 'ur', 'bat-smg', 'gu', 'ml', 'wa', 'qu', 'war', 'cv', @@ -26,18 +26,18 @@ 'fiu-vro', 'nds-nl', 'tk', 'vls', 'sa', 'mn', 'fo', 'am', 'nrm', 'dv', 'pag', 'rm', 'map-bms', 'wuu', 'gv', 'bar', 'ne', 'my', 'sco', 'se', 'diq', 'fur', 'pnb', 'lij', 'nov', 'si', 'mt', 'bh', 'mzn', 'csb', - 'ilo', 'pi', 'zh-classical', 'lad', 'km', 'ug', 'frp', 'sc', 'mg', 'ang', - 'kw', 'pdc', 'haw', 'szl', 'ps', 'hif', 'kv', 'ie', 'pa', 'to', + 'ilo', 'pi', 'zh-classical', 'lad', 'km', 'ug', 'sc', 'frp', 'mg', 'ang', + 'kw', 'pdc', 'haw', 'szl', 'ps', 'hif', 'kv', 'pa', 'ie', 'to', 'hak', 'bo', 'myv', 'crh', 'gn', 'ln', 'stq', 'nv', 'jbo', 'arc', 'mhr', 'ext', 'wo', 'ace', 'ky', 'tpi', 'ty', 'cbk-zam', 'so', 'eml', - 'zea', 'srn', 'ay', 'ckb', 'pap', 'ig', 'kab', 'kg', 'or', 'ba', + 'zea', 'srn', 'ckb', 'ay', 'pap', 'ig', 'kab', 'kg', 'or', 'ba', 'lo', 'udm', 'dsb', 'rmy', 'cu', 'kaa', 'ce', 'sm', 'av', 'ks', 'xal', 'tet', 'got', 'ab', 'sd', 'mdf', 'na', 'pnt', 'iu', 'bm', - 'kl', 'pih', 'as', 'cdo', 'mwl', 'chr', 'ee', 'om', 'zu', 'ti', - 'ts', 'za', 'ss', 've', 'bi', 'ha', 'cr', 'dz', 'bxr', 'ch', - 'bug', 'xh', 'tn', 'ki', 'ik', 'rw', 'st', 'ny', 'tw', 'chy', - 'ak', 'fj', 'sn', 'ff', 'lg', 'lbe', 'rn', 'tum', 'sg', 'ng', - 'pcd', + 'kl', 'pih', 'as', 'pcd', 'cdo', 'mwl', 'chr', 'ee', 'om', 'zu', + 'ti', 'ts', 'za', 'ss', 've', 'bi', 'ha', 'cr', 'dz', 'bxr', + 'ch', 'bug', 'xh', 'tn', 'ki', 'ik', 'rw', 'st', 'ny', 'tw', + 'chy', 'ak', 'fj', 'sn', 'ff', 'lg', 'lbe', 'rn', 'tum', 'sg', + 'ng', ] if family.config.SSL_connection: @@ -775,7 +775,7 @@ 'nv': [u'Dab'], 'nrm': [u'Page dé frouque'], 'oc': [u'Omonimia', u'Disambig'], - 'pl': [u'Disambig', u'DisambRulers', u'DisambigC', u'Strona ujednoznaczniająca'], + 'pl': [u'Disambig'], 'pms': [u'Gestion dij sinònim'], 'pt': [u'Desambiguação', u'Disambig', u'Desambig'], 'qu': [u"Sut'ichana qillqa", u'Disambig', u'SJM'], @@ -799,6 +799,7 @@ 'su': [u'Disambig'], 'sv': None, 'sw': [u'Maana'], + 'szl': [u'Disambig'], 'ta': [u'பக்கவழி நெறிப்படுத்தல்'], 'te': [u'అయోమయ నివృత్తి', u'వివరమైన అయోమయ నివృత్తి'], 'tg': [u'Ибҳомзудоӣ', u'Disambig', u'Рафъи ибҳом', u'Disambiguation'], @@ -889,6 +890,7 @@ 'sr': u'Вишезначна одредница', 'su': u'Disambiguasi', 'sv': u'Förgreningssider', + 'szl': u'Zajty ujydnoznačńajůnce', 'th': u'การแก้ความกำกวม', 'tl': u'Paglilinaw', 'tr': u'Anlam ayrım',

1 0

SVN: [7859] trunk/pywikipedia/category.py
by xqt＠svn.wikimedia.org 05 Jan '10

05 Jan '10

Revision: 7859 Author: xqt Date: 2010-01-06 05:50:13 +0000 (Wed, 06 Jan 2010) Log Message: ----------- add missing pl messages for category.py (#2926428) Thanks masti! Modified Paths: -------------- trunk/pywikipedia/category.py Modified: trunk/pywikipedia/category.py =================================================================== --- trunk/pywikipedia/category.py 2010-01-05 20:28:28 UTC (rev 7858) +++ trunk/pywikipedia/category.py 2010-01-06 05:50:13 UTC (rev 7859) @@ -507,6 +507,7 @@ 'kk':u'Бот: %s дегеннен (%d буын) тізімдеді', 'nds-nl':u'Bot: lieste van %s (%d pagina\'s)', 'nl':u'Bot: Lijst van %s (%d pagina\'s)', + 'pl':u'Robot: listuje kategorię %s (%d stron)', 'sv':u'Robot: Skapar en lista från %s (%d)', 'pt':u'Bot: Listando de %s (%d entradas)', 'zh':u'機器人: 從%s提取列表(%d個項目)', @@ -570,6 +571,7 @@ 'nl':u'Bot: Categorie is opgeheven', 'no':u'Robot: Kategorien ble oppløst', 'nn':u'robot: kategorien blei løyst opp', + 'pl':u'Robot: Kategoria została usunięta', 'pt':u'Bot: Categoria foi unida', 'ru':u'Робот: категория расформирована', 'sv':u'Robot: Kategorin upplöstes', @@ -599,6 +601,7 @@ 'nl':u'Bot: Verwijderd uit %s', 'no':u'Robot: Fjerner ifra %s', 'nn':u'robot: fjerna ifrå %s', + 'pl':u'Robot: Usuwa z kategorii %s', 'pt':u'Bot: Removendo [[%s]]', 'ru':u'Робот: исключение из %s', 'sr':u'Бот: Уклањање из категорије [[%s]]', @@ -850,6 +853,7 @@ 'nl': u'(ook in %s)', 'no': u'(også i %s)', 'nn': u'(òg i %s)', + 'pl': u'(również w %s)', 'pt': u'(também em %s)', 'ru': u'(также в %s)', 'sv': u'(också i %s)',

1 0

SVN: [7858] branches/rewrite/pywikibot
by russblau＠svn.wikimedia.org 05 Jan '10

05 Jan '10

Revision: 7858 Author: russblau Date: 2010-01-05 20:28:28 +0000 (Tue, 05 Jan 2010) Log Message: ----------- Fix for #2618858: logfiles format Modified Paths: -------------- branches/rewrite/pywikibot/bot.py branches/rewrite/pywikibot/userinterfaces/terminal_interface.py Modified: branches/rewrite/pywikibot/bot.py =================================================================== --- branches/rewrite/pywikibot/bot.py 2010-01-05 17:43:13 UTC (rev 7857) +++ branches/rewrite/pywikibot/bot.py 2010-01-05 20:28:28 UTC (rev 7858) @@ -32,6 +32,31 @@ from pywikibot import config +# User interface initialization +# search for user interface module in the 'userinterfaces' subdirectory +uiModule = __import__("pywikibot.userinterfaces.%s_interface" + % config.userinterface, + fromlist=['UI'] ) +ui = uiModule.UI() + +# next bit filched from 1.5.2's inspect.py +def currentframe(): + """Return the frame object for the caller's stack frame.""" + try: + raise Exception + except: + return sys.exc_traceback.tb_frame.f_back + +if hasattr(sys, '_getframe'): + # less portable but more efficient + currentframe = lambda: sys._getframe(2) + # frame0 is this lambda, frame1 is output() in this module, + # so frame2 is whatever called output() + +# done filching + +# Logging module configuration + class MaxLevelFilter(logging.Filter): """Filter that only passes records at or below a specific level. @@ -49,14 +74,6 @@ return True -# User interface initialization -# search for user interface module in the 'userinterfaces' subdirectory -uiModule = __import__("pywikibot.userinterfaces.%s_interface" - % config.userinterface, - fromlist=['UI'] ) -ui = uiModule.UI() - - class RotatingFileHandler(logging.handlers.RotatingFileHandler): """Strip trailing newlines before outputting text to file""" def format(self, record): @@ -71,7 +88,7 @@ * our pywikibot.Error traces are encoded in our console encoding, which is needed for plainly printing them. * but when it comes to logging using logging.exception, - the Python logging module will try to use these traces, + the Python logging module will try to use these traces, and it will fail if they are console encoded strings. Formatter.formatException also strips the trailing \n, which we need. @@ -112,11 +129,17 @@ if root.level == 30: # init_handlers sets this level init_handlers(strm=ui.output_stream) + frame = currentframe() + module = os.path.basename(frame.f_code.co_filename) + context = {'caller_name': frame.f_code.co_name, + 'caller_file': module, + 'caller_line': frame.f_lineno} + if decoder: text = unicode(text, decoder) elif not isinstance(text, unicode): if not isinstance(text, str): - # looks like text is a non-text object. + # looks like text is a non-text object. # Maybe it has a __unicode__ builtin ? # (allows to print Page, Site...) text = unicode(text) @@ -129,7 +152,7 @@ text += "\n" if toStdout: level = STDOUT - ui.output(text, level=level) + ui.output(text, level=level, context=context) def input(question, password=False): """Ask the user a question, return the user's answer. @@ -248,11 +271,11 @@ logfile = config.datafilepath("%s-bot.log" % moduleName) file_handler = RotatingFileHandler( filename=logfile, maxBytes=2 << 20, backupCount=5) - + file_handler.setLevel(DEBUG) form = LoggingFormatter( - fmt="%(asctime)s %(filename)18s, %(lineno)d: " - "%(levelname)-8s %(message)s", + fmt="%(asctime)s %(caller_file)18s, %(caller_line)4s " + "in %(caller_name)18s: %(levelname)-8s %(message)s", datefmt="%Y-%m-%d %H:%M:%S" ) file_handler.setFormatter(form) @@ -486,7 +509,7 @@ """ Only accepts options defined in availableOptions """ - self.setOptions(**kwargs) + self.setOptions(**kwargs) def setOptions(self, **kwargs): """ @@ -496,7 +519,7 @@ self.options = {} validOptions = set(Bot.availableOptions) - receivedOptions = set(kwargs) + receivedOptions = set(kwargs) for opt in receivedOptions & validOptions: self.options[opt] = kwargs[opt] @@ -505,7 +528,7 @@ pywikibot.output(u'%s is not a valid option. It was ignored\n' % opt, level=pywikibot.WARNING) - + def getOption(self, option): """ Get the current value of an option. @@ -542,7 +565,7 @@ if choice == 'a': # Remember the choice self.options['always'] = True - + if choice != 'n': page.put(newtext, async=(choice=='a')) Modified: branches/rewrite/pywikibot/userinterfaces/terminal_interface.py =================================================================== --- branches/rewrite/pywikibot/userinterfaces/terminal_interface.py 2010-01-05 17:43:13 UTC (rev 7857) +++ branches/rewrite/pywikibot/userinterfaces/terminal_interface.py 2010-01-05 20:28:28 UTC (rev 7858) @@ -120,7 +120,7 @@ self.OutputHandlerClass = TerminalHandler self.output_stream = sys.stderr - def output(self, text, level=logging.INFO): + def output(self, text, level=logging.INFO, context=None): """ If a character can't be displayed in the encoding used by the user's terminal, it will be replaced with a question mark or by a @@ -128,7 +128,7 @@ """ self.writelock.acquire() try: - logging.getLogger("pywiki").log(level, text) + logging.getLogger("pywiki").log(level, text, extra=context) finally: self.writelock.release() @@ -144,7 +144,7 @@ if config.ring_bell: sys.stdout.write('\07') - # While we're waiting for user input, + # While we're waiting for user input, # we don't want terminal writes from other Threads self.writelock.acquire() self.output(question + ' ', level=pywikibot.INPUT) @@ -177,17 +177,17 @@ options[i] = '%s[%s]%s' % (option[:pos], caseHotkey, option[pos+1:]) else: options[i] = '%s [%s]' % (option, caseHotkey) - + answer = '' - # While we're waiting for user input, + # While we're waiting for user input, # we don't want terminal writes from other Threads self.writelock.acquire() try: # loop until the user entered a valid choice while True: prompt = '%s (%s)' % (question, ', '.join(options)) - + # it's okay to enter input with the lock, RLock is reentrant. answer = self.input(prompt) if answer.lower() in hotkeys or answer.upper() in hotkeys: @@ -202,7 +202,7 @@ def editText(self, text, jumpIndex = None, highlight = None): """ Uses a Tkinter edit box because we don't have a console editor - + Parameters: * text - a Unicode string * jumpIndex - an integer: position at which to put the caret @@ -347,7 +347,7 @@ # Note: A transliteration replacement might be longer than the # original character; e.g., ч is transliterated to ch. # the resulting list will have as many elements as there are - # characters in the original text, but some list elements may + # characters in the original text, but some list elements may # contain multiple characters prev = "-" prevchar = -1

1 0

SVN: [7857] trunk/pywikipedia/wikipedia.py
by xqt＠svn.wikimedia.org 05 Jan '10

05 Jan '10

Revision: 7857 Author: xqt Date: 2010-01-05 17:43:13 +0000 (Tue, 05 Jan 2010) Log Message: ----------- pagetext must not decodeEsperantoX() if loaded via API (bugfix for #2922896) Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-01-05 16:44:49 UTC (rev 7856) +++ trunk/pywikipedia/wikipedia.py 2010-01-05 17:43:13 UTC (rev 7857) @@ -784,8 +784,7 @@ pagetext = pageInfo['revisions'][0]['*'] pagetext = pagetext.rstrip() - if self.site().lang == 'eo': - pagetext = decodeEsperantoX(pagetext) + # pagetext must not decodeEsperantoX() if loaded via API m = self.site().redirectRegex().match(pagetext) if m: # page text matches the redirect pattern

1 0

SVN: [7856] trunk/pywikipedia/wikipedia.py
by philip＠svn.wikimedia.org 05 Jan '10

05 Jan '10

Revision: 7856 Author: philip Date: 2010-01-05 16:44:49 +0000 (Tue, 05 Jan 2010) Log Message: ----------- Apply on api-search when enabled use_api and version >= 1.11. Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2010-01-04 14:48:21 UTC (rev 7855) +++ trunk/pywikipedia/wikipedia.py 2010-01-05 16:44:49 UTC (rev 7856) @@ -6515,9 +6515,45 @@ text = self.getUrl(url, sysop = sysop) self._getUserDataOld(text, sysop = sysop, force = force) + + + def search(self, query, number = 10, namespaces = None): + """ + Yield search results for query. + Use API when enabled use_api and version >= 1.11, + or use Special:Search. + """ + if config.use_api and self.versionnumber() >= 11: + _search = self._search_with_api + else: + _search = self._search_without_api + return _search(query, number, namespaces) + + def _search_with_api(self, q, number, namespaces): + """Yield search results (using api) for query.""" + params = { + 'action': 'query', + 'list': 'search', + 'srsearch': q, + 'srlimit': number + } + if namespaces: + params['srnamespace'] = namespaces + offset = 0 + while True: + params['sroffset'] = offset + data = query.GetData(params, self)['query'] + if 'error' in data: + raise RuntimeError('%s' % data['error']) + if not data['search']: + break + for s in data['search']: + offset += 1 + page = Page(self, s['title']) + yield page, s['snippet'], '', s['size'], s['wordcount'], s['timestamp'] - def search(self, query, number = 10, namespaces = None): + def _search_without_api(self, query, number, namespaces): """Yield search results (using Special:Search page) for query.""" throttle = True path = self.search_address(urllib.quote_plus(query.encode('utf-8')),

1 0

SVN: [7855] trunk/pywikipedia/featured.py
by xqt＠svn.wikimedia.org 04 Jan '10

04 Jan '10

Revision: 7855 Author: xqt Date: 2010-01-04 14:48:21 +0000 (Mon, 04 Jan 2010) Log Message: ----------- use redirected template for ro-wiki Modified Paths: -------------- trunk/pywikipedia/featured.py Modified: trunk/pywikipedia/featured.py =================================================================== --- trunk/pywikipedia/featured.py 2010-01-04 14:43:54 UTC (rev 7854) +++ trunk/pywikipedia/featured.py 2010-01-04 14:48:21 UTC (rev 7855) @@ -154,7 +154,7 @@ 'it': ['Link AdQ'], 'no': ['Link UA'], 'oc': ['Ligam AdQ', 'Lien AdQ'], - 'ro': [u'Legătură AF'], + 'ro': [u'Legătură AC', u'Legătură AF'], 'sv': ['UA', 'Link UA'], 'tr': ['Link SM'], 'vi': [u'Liên kết chọn lọc'],

1 0

SVN: [7854] trunk/pywikipedia
by xqt＠svn.wikimedia.org 04 Jan '10

04 Jan '10

Revision: 7854 Author: xqt Date: 2010-01-04 14:43:54 +0000 (Mon, 04 Jan 2010) Log Message: ----------- additional featured templates Modified Paths: -------------- trunk/pywikipedia/add_text.py trunk/pywikipedia/cosmetic_changes.py Modified: trunk/pywikipedia/add_text.py =================================================================== --- trunk/pywikipedia/add_text.py 2010-01-04 12:51:29 UTC (rev 7853) +++ trunk/pywikipedia/add_text.py 2010-01-04 14:43:54 UTC (rev 7854) @@ -155,7 +155,7 @@ u'enllaç[ _]ad', u'enllaz[ _]ad', u'leam[ _]vdc', - u'legătură[ _]af', + u'legătură[ _]a[bcf]', u'liamm[ _]pub', u'lien[ _]adq', u'lien[ _]ba', Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2010-01-04 12:51:29 UTC (rev 7853) +++ trunk/pywikipedia/cosmetic_changes.py 2010-01-04 14:43:54 UTC (rev 7854) @@ -280,7 +280,7 @@ u'enllaç[ _]ad', u'enllaz[ _]ad', u'leam[ _]vdc', - u'legătură[ _]af', + u'legătură[ _]a[bcf]', u'liamm[ _]pub', u'lien[ _]adq', u'lien[ _]ba',

1 0

SVN: [7853] trunk/pywikipedia
by xqt＠svn.wikimedia.org 04 Jan '10

04 Jan '10

Revision: 7853 Author: xqt Date: 2010-01-04 12:51:29 +0000 (Mon, 04 Jan 2010) Log Message: ----------- user unicode for featured templates Modified Paths: -------------- trunk/pywikipedia/add_text.py trunk/pywikipedia/cosmetic_changes.py Modified: trunk/pywikipedia/add_text.py =================================================================== --- trunk/pywikipedia/add_text.py 2010-01-04 09:47:28 UTC (rev 7852) +++ trunk/pywikipedia/add_text.py 2010-01-04 12:51:29 UTC (rev 7853) @@ -144,13 +144,36 @@ if not addText: raise NoEnoughData('You have to specify what text you want to add!') if not summary: - summary = wikipedia.setAction(wikipedia.translate(wikipedia.getSite(), msg) % addText) + summary = wikipedia.translate(wikipedia.getSite(), msg) % addText # When a page is tagged as "really well written" it has a star in the interwiki links. # This is a list of all the templates used (in regex format) to make the stars appear. - starsList = ['link[ _]fa', 'link[ _]adq', 'enllaç[ _]ad', - 'link[ _]ua', 'legătură[ _]af', 'destacado', - 'ua', 'liên k[ _]t[ _]chọn[ _]lọc'] + starsList = [ + u'bueno', + u'cyswllt[ _]erthygl[ _]ddethol', u'dolen[ _]ed', + u'destacado', u'destaca[tu]', + u'enllaç[ _]ad', + u'enllaz[ _]ad', + u'leam[ _]vdc', + u'legătură[ _]af', + u'liamm[ _]pub', + u'lien[ _]adq', + u'lien[ _]ba', + u'liên[ _]kết[ _]bài[ _]chất[ _]lượng[ _]tốt', + u'liên[ _]kết[ _]chọn[ _]lọc', + u'ligam[ _]adq', + u'ligoelstara', + u'ligoleginda', + u'link[ _][afgu]a', u'link[ _]adq', u'link[ _]f[lm]', u'link[ _]km', u'link[ _]sm', u'linkfa', + u'na[ _]lotura', + u'nasc[ _]ar', + u'tengill[ _][úg]g', + u'ua', + u'yüm yg', + u'רא', + u'وصلة مقالة جيدة', + u'وصلة مقالة مختارة', + ] errorCount = 0 site = wikipedia.getSite() @@ -207,13 +230,18 @@ if (site.language()==u'nn'): newtext = newtext + u'\n' + nn_iw_msg # Dealing the stars' issue + allstars = [] for star in starsList: - regex = re.compile('(\{\{(?:template:|)%s\|.*?\}\}\n)' % star, re.I) - risultato = regex.findall(newtext) - if risultato != []: + regex = re.compile('(\{\{(?:template:|)%s\|.*?\}\}[\s]*)' % star, re.I) + found = regex.findall(newtext) + if found != []: newtext = regex.sub('', newtext) - for element in risultato: - newtext += '\n%s' % element + allstars += found + if allstars != []: + newtext = newtext.strip()+'\r\n\r\n' + allstars.sort() + for element in allstars: + newtext += '%s\r\n' % element.strip() # Adding the interwiki newtext = wikipedia.replaceLanguageLinks(newtext, interwikiInside, site) # If instead the text must be added above... Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2010-01-04 09:47:28 UTC (rev 7852) +++ trunk/pywikipedia/cosmetic_changes.py 2010-01-04 12:51:29 UTC (rev 7853) @@ -273,9 +273,32 @@ 3. stars templates for featured and good articles 4. interwiki links """ - starsList = ['link[ _][afgu]a', 'link[ _]adq', 'enllaç[ _]ad', - 'link[ _]fl', 'legătură[ _]af', 'destacado', - 'ua', 'liên k[ _]t[ _]chọn[ _]lọc'] + starsList = [ + u'bueno', + u'cyswllt[ _]erthygl[ _]ddethol', u'dolen[ _]ed', + u'destacado', u'destaca[tu]', + u'enllaç[ _]ad', + u'enllaz[ _]ad', + u'leam[ _]vdc', + u'legătură[ _]af', + u'liamm[ _]pub', + u'lien[ _]adq', + u'lien[ _]ba', + u'liên[ _]kết[ _]bài[ _]chất[ _]lượng[ _]tốt', + u'liên[ _]kết[ _]chọn[ _]lọc', + u'ligam[ _]adq', + u'ligoelstara', + u'ligoleginda', + u'link[ _][afgu]a', u'link[ _]adq', u'link[ _]f[lm]', u'link[ _]km', u'link[ _]sm', u'linkfa', + u'na[ _]lotura', + u'nasc[ _]ar', + u'tengill[ _][úg]g', + u'ua', + u'yüm yg', + u'רא', + u'وصلة مقالة جيدة', + u'وصلة مقالة مختارة', + ] categories = None interwikiLinks = None

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn January 2010