Pywikipedia-svn May 2009

pywikipedia-svn@lists.wikimedia.org

8 participants
154 discussions

SVN: [6804] branches/rewrite/pywikibot/pagegenerators.py
by nicdumz＠svn.wikimedia.org 03 May '09

03 May '09

Revision: 6804 Author: nicdumz Date: 2009-05-03 11:52:21 +0000 (Sun, 03 May 2009) Log Message: ----------- Missing imports Modified Paths: -------------- branches/rewrite/pywikibot/pagegenerators.py Modified: branches/rewrite/pywikibot/pagegenerators.py =================================================================== --- branches/rewrite/pywikibot/pagegenerators.py 2009-05-03 10:34:08 UTC (rev 6803) +++ branches/rewrite/pywikibot/pagegenerators.py 2009-05-03 11:52:21 UTC (rev 6804) @@ -19,12 +19,14 @@ __version__ = '$Id$' import pywikibot +from pywikibot import config2 as config import itertools import Queue import re import sys import threading +import codecs # ported from version 1 for backwards-compatibility

1 0

SVN: [6803] branches/rewrite/pywikibot/page.py
by nicdumz＠svn.wikimedia.org 03 May '09

03 May '09

Revision: 6803 Author: nicdumz Date: 2009-05-03 10:34:08 +0000 (Sun, 03 May 2009) Log Message: ----------- Typo UnSafe -> Unsafe Modified Paths: -------------- branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2009-05-03 10:20:14 UTC (rev 6802) +++ branches/rewrite/pywikibot/page.py 2009-05-03 10:34:08 UTC (rev 6803) @@ -1972,7 +1972,7 @@ return link @staticmethod - def langlinkUnSafe(lang, title, source): + def langlinkUnsafe(lang, title, source): """ Create a "lang:title" Link linked from source. Assumes that the lang & title come clean, no checks are made.

1 0

SVN: [6802] trunk/pywikipedia/diskcache.py
by cosoleto＠svn.wikimedia.org 03 May '09

03 May '09

Revision: 6802 Author: cosoleto Date: 2009-05-03 10:20:14 +0000 (Sun, 03 May 2009) Log Message: ----------- Fix error: === [[Tillamook]] === Modified Paths: -------------- trunk/pywikipedia/diskcache.py Modified: trunk/pywikipedia/diskcache.py =================================================================== --- trunk/pywikipedia/diskcache.py 2009-05-03 08:54:27 UTC (rev 6801) +++ trunk/pywikipedia/diskcache.py 2009-05-03 10:20:14 UTC (rev 6802) @@ -66,7 +66,6 @@ def delete(self): self.cache_file.close() os.unlink(self.cache_path) - os = None def __getitem__(self, key): key = key.lower()

1 0

SVN: [6801] trunk/pywikipedia/interwiki.py
by nicdumz＠svn.wikimedia.org 03 May '09

03 May '09

Revision: 6801 Author: nicdumz Date: 2009-05-03 08:54:27 +0000 (Sun, 03 May 2009) Log Message: ----------- Pages such as #redirect [[cs:#foo]] raise InvalidTitle. Catch the error, and ignore the page Modified Paths: -------------- trunk/pywikipedia/interwiki.py Modified: trunk/pywikipedia/interwiki.py =================================================================== --- trunk/pywikipedia/interwiki.py 2009-05-03 08:52:16 UTC (rev 6800) +++ trunk/pywikipedia/interwiki.py 2009-05-03 08:54:27 UTC (rev 6801) @@ -1073,7 +1073,13 @@ continue elif page.isRedirectPage(): - redirectTargetPage = page.getRedirectTarget() + try: + redirectTargetPage = page.getRedirectTarget() + except wikipedia.InvalidTitle: + # MW considers #redirect [[en:#foo]] as a redirect page, + # but we can't do anything useful with such pages + wikipedia.output(u"NOTE: %s redirects to an invalid title" % page.aslink(True)) + continue wikipedia.output(u"NOTE: %s is redirect to %s" % (page.aslink(True), redirectTargetPage.aslink(True))) if page == self.originPage: if globalvar.initialredirect:

1 0

SVN: [6800] trunk/pywikipedia/wikipedia.py
by nicdumz＠svn.wikimedia.org 03 May '09

03 May '09

Revision: 6800 Author: nicdumz Date: 2009-05-03 08:52:16 +0000 (Sun, 03 May 2009) Log Message: ----------- Do not capture parser functions when parsing for templates. Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-05-03 02:34:29 UTC (rev 6799) +++ trunk/pywikipedia/wikipedia.py 2009-05-03 08:52:16 UTC (rev 6800) @@ -1902,7 +1902,7 @@ inside = {} count = 0 Rtemplate = re.compile( - ur'{{(msg:)?(?P<name>[^{\|]+?)(\|(?P<params>[^{]+?))?}}') + ur'{{(msg:)?(?!#)(?P<name>[^{\|]+?)(\|(?P<params>[^{]+?))?}}') Rlink = re.compile(ur'\[\[[^\]]+\]\]') Rmath = re.compile(ur'<math>[^<]+</math>') Rmarker = re.compile(ur'%s(\d+)%s' % (marker, marker))

1 0

SVN: [6799] trunk/pywikipedia/checkimages.py
by cosoleto＠svn.wikimedia.org 02 May '09

02 May '09

Revision: 6799 Author: cosoleto Date: 2009-05-03 02:34:29 +0000 (Sun, 03 May 2009) Log Message: ----------- Fixed reference to not existent variable (pointed out by pychecker). Modified Paths: -------------- trunk/pywikipedia/checkimages.py Modified: trunk/pywikipedia/checkimages.py =================================================================== --- trunk/pywikipedia/checkimages.py 2009-05-03 02:28:27 UTC (rev 6798) +++ trunk/pywikipedia/checkimages.py 2009-05-03 02:34:29 UTC (rev 6799) @@ -1632,7 +1632,7 @@ try: textRegex = pageRegex.get() except wikipedia.NoPage: - wikipedia.output(u"%s doesn't exist!" % page.title()) + wikipedia.output(u"%s doesn't exist!" % pageRegex.title()) textRegex = '' # No source, so the bot will quit later. # If generator is the regex' one, use your own Generator using an url or page and a regex. if generator == 'regex' and regexGen == True:

1 0

SVN: [6798] trunk/pywikipedia
by cosoleto＠svn.wikimedia.org 02 May '09

02 May '09

Revision: 6798 Author: cosoleto Date: 2009-05-03 02:28:27 +0000 (Sun, 03 May 2009) Log Message: ----------- Removed unused modules found by pychecker. Modified Paths: -------------- trunk/pywikipedia/category.py trunk/pywikipedia/image.py trunk/pywikipedia/imagecopy.py trunk/pywikipedia/isbn.py trunk/pywikipedia/replace.py trunk/pywikipedia/speedy_delete.py trunk/pywikipedia/titletranslate.py trunk/pywikipedia/unlink.py trunk/pywikipedia/upload.py trunk/pywikipedia/userlib.py trunk/pywikipedia/welcome.py trunk/pywikipedia/xmlreader.py Modified: trunk/pywikipedia/category.py =================================================================== --- trunk/pywikipedia/category.py 2009-05-03 02:26:45 UTC (rev 6797) +++ trunk/pywikipedia/category.py 2009-05-03 02:28:27 UTC (rev 6798) @@ -80,7 +80,7 @@ # # Distributed under the terms of the MIT license. # -import os, re, sys, pickle, bz2 +import os, re, pickle, bz2 import wikipedia, catlib, config, pagegenerators # This is required for the text that is shown when you run this script Modified: trunk/pywikipedia/image.py =================================================================== --- trunk/pywikipedia/image.py 2009-05-03 02:26:45 UTC (rev 6797) +++ trunk/pywikipedia/image.py 2009-05-03 02:28:27 UTC (rev 6798) @@ -34,9 +34,9 @@ # # Distributed under the terms of the MIT license. # -import wikipedia, config +import wikipedia import replace, pagegenerators -import re, sys, string +import re class ImageRobot: """ Modified: trunk/pywikipedia/imagecopy.py =================================================================== --- trunk/pywikipedia/imagecopy.py 2009-05-03 02:26:45 UTC (rev 6797) +++ trunk/pywikipedia/imagecopy.py 2009-05-03 02:28:27 UTC (rev 6798) @@ -85,7 +85,7 @@ from Tkinter import * import os, sys, re, codecs import urllib, httplib, urllib2 -import catlib, thread, webbrowser +import webbrowser import time, threading import wikipedia, config, socket import pagegenerators, add_text Modified: trunk/pywikipedia/isbn.py =================================================================== --- trunk/pywikipedia/isbn.py 2009-05-03 02:26:45 UTC (rev 6797) +++ trunk/pywikipedia/isbn.py 2009-05-03 02:28:27 UTC (rev 6798) @@ -38,7 +38,7 @@ __version__='$Id$' -import wikipedia, pagegenerators, catlib, config +import wikipedia, pagegenerators import sys, re docuReplacements = { Modified: trunk/pywikipedia/replace.py =================================================================== --- trunk/pywikipedia/replace.py 2009-05-03 02:26:45 UTC (rev 6797) +++ trunk/pywikipedia/replace.py 2009-05-03 02:28:27 UTC (rev 6798) @@ -114,7 +114,7 @@ from __future__ import generators import sys, re, time -import wikipedia, pagegenerators, catlib, config +import wikipedia, pagegenerators import editarticle import webbrowser Modified: trunk/pywikipedia/speedy_delete.py =================================================================== --- trunk/pywikipedia/speedy_delete.py 2009-05-03 02:26:45 UTC (rev 6797) +++ trunk/pywikipedia/speedy_delete.py 2009-05-03 02:28:27 UTC (rev 6798) @@ -33,9 +33,9 @@ # # Distributed under the terms of the MIT license. # -import wikipedia, config -import replace, pagegenerators, catlib -import re, sys, string, time +import wikipedia +import pagegenerators, catlib +import time class SpeedyRobot: """ Modified: trunk/pywikipedia/titletranslate.py =================================================================== --- trunk/pywikipedia/titletranslate.py 2009-05-03 02:26:45 UTC (rev 6797) +++ trunk/pywikipedia/titletranslate.py 2009-05-03 02:28:27 UTC (rev 6798) @@ -9,7 +9,7 @@ # import re -import wikipedia, date, time +import wikipedia, date def translate(page, hints = None, auto = True, removebrackets = False): """ Modified: trunk/pywikipedia/unlink.py =================================================================== --- trunk/pywikipedia/unlink.py 2009-05-03 02:26:45 UTC (rev 6797) +++ trunk/pywikipedia/unlink.py 2009-05-03 02:28:27 UTC (rev 6798) @@ -24,9 +24,9 @@ __version__='$Id$' -import wikipedia, pagegenerators, catlib +import wikipedia, pagegenerators import editarticle -import re, sys +import re # Summary messages in different languages msg = { Modified: trunk/pywikipedia/upload.py =================================================================== --- trunk/pywikipedia/upload.py 2009-05-03 02:26:45 UTC (rev 6797) +++ trunk/pywikipedia/upload.py 2009-05-03 02:28:27 UTC (rev 6798) @@ -23,8 +23,8 @@ # __version__='$Id$' -import os, sys, re, time -import urllib, httplib +import os, sys, time +import urllib import wikipedia, config def post_multipart(site, address, fields, files, cookies): Modified: trunk/pywikipedia/userlib.py =================================================================== --- trunk/pywikipedia/userlib.py 2009-05-03 02:26:45 UTC (rev 6797) +++ trunk/pywikipedia/userlib.py 2009-05-03 02:28:27 UTC (rev 6798) @@ -4,7 +4,7 @@ """ __version__ = '$Id$' -import re, httplib +import re import wikipedia Modified: trunk/pywikipedia/welcome.py =================================================================== --- trunk/pywikipedia/welcome.py 2009-05-03 02:26:45 UTC (rev 6797) +++ trunk/pywikipedia/welcome.py 2009-05-03 02:28:27 UTC (rev 6798) @@ -175,7 +175,7 @@ import wikipedia, config, string, locale, query import time, re, cPickle, os, urllib -import codecs, sys +import codecs from datetime import timedelta locale.setlocale(locale.LC_ALL, '') Modified: trunk/pywikipedia/xmlreader.py =================================================================== --- trunk/pywikipedia/xmlreader.py 2009-05-03 02:26:45 UTC (rev 6797) +++ trunk/pywikipedia/xmlreader.py 2009-05-03 02:28:27 UTC (rev 6798) @@ -17,7 +17,7 @@ """ __version__='$Id$' -import threading, time +import threading import xml.sax import codecs, re import wikipedia

1 0

SVN: [6797] trunk/pywikipedia/diskcache.py
by cosoleto＠svn.wikimedia.org 02 May '09

02 May '09

Revision: 6797 Author: cosoleto Date: 2009-05-03 02:26:45 +0000 (Sun, 03 May 2009) Log Message: ----------- Removed unused and re-imported modules pointed out by pychecker. Modified Paths: -------------- trunk/pywikipedia/diskcache.py Modified: trunk/pywikipedia/diskcache.py =================================================================== --- trunk/pywikipedia/diskcache.py 2009-05-02 20:23:36 UTC (rev 6796) +++ trunk/pywikipedia/diskcache.py 2009-05-03 02:26:45 UTC (rev 6797) @@ -2,7 +2,6 @@ import random import config -import sys import os # http://mail.python.org/pipermail/python-list/2006-March/375280.html @@ -66,7 +65,6 @@ def delete(self): self.cache_file.close() - import os os.unlink(self.cache_path) os = None

1 0

SVN: [6796] branches/rewrite/pywikibot/page.py
by russblau＠svn.wikimedia.org 02 May '09

02 May '09

Revision: 6796 Author: russblau Date: 2009-05-02 20:23:36 +0000 (Sat, 02 May 2009) Log Message: ----------- fix Bug #2785484 in Page.__str__() Modified Paths: -------------- branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2009-05-02 17:57:23 UTC (rev 6795) +++ branches/rewrite/pywikibot/page.py 2009-05-02 20:23:36 UTC (rev 6796) @@ -213,7 +213,8 @@ def __str__(self): """Return a console representation of the pagelink.""" return self.title(asLink=True, forceInterwiki=True - ).encode(config.console_encoding) + ).encode(config.console_encoding, + "xmlcharrefreplace") def __unicode__(self): return self.title(asLink=True, forceInterwiki=True)

1 0

SVN: [6795] branches/rewrite/pywikibot/data/api.py
by russblau＠svn.wikimedia.org 02 May '09

02 May '09

Revision: 6795 Author: russblau Date: 2009-05-02 17:57:23 +0000 (Sat, 02 May 2009) Log Message: ----------- refactor Request.submit() to make debugging easier, allows printing a Request object to see what will actually be sent to the API server. Modified Paths: -------------- branches/rewrite/pywikibot/data/api.py Modified: branches/rewrite/pywikibot/data/api.py =================================================================== --- branches/rewrite/pywikibot/data/api.py 2009-05-02 16:57:24 UTC (rev 6794) +++ branches/rewrite/pywikibot/data/api.py 2009-05-02 17:57:23 UTC (rev 6795) @@ -52,7 +52,7 @@ pass -class Request(DictMixin): +class Request(object, DictMixin): """A request to a Site's api.php interface. Attributes of this object (except for the special parameters listed @@ -133,14 +133,9 @@ def iteritems(self): return self.params.iteritems() - - def submit(self): - """Submit a query and parse the response. - @return: The data retrieved from api.php (a dict) - - """ - from pywikibot.comms import http + def http_params(self): + """Return the parameters formatted for inclusion in an HTTP request.""" for key in self.params: if isinstance(self.params[key], basestring): @@ -173,7 +168,23 @@ self.site.encoding()) except Exception: logger.exception("key=%s, params=%s\n" % (key, self.params[key])) - params = urllib.urlencode(self.params) + return urllib.urlencode(self.params) + + def __str__(self): + return urllib.unquote(self.site.scriptpath() + + "/api.php?" + + self.http_params() + ) + + def submit(self): + """Submit a query and parse the response. + + @return: The data retrieved from api.php (a dict) + + """ + from pywikibot.comms import http + + params = self.http_params() while True: action = self.params.get("action", "") write = action in (

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn May 2009