Pywikipedia-l

pywikipedia-l@lists.wikimedia.org

6393 discussions

SVN: [3904] trunk/spelling/
by valhallasw＠svn.wikimedia.org 27 Jul '07

27 Jul '07

Revision: 3904 Author: valhallasw Date: 2007-07-26 22:38:57 +0000 (Thu, 26 Jul 2007) Log Message: ----------- Copying spelling to trunk\; importing it later using svn:externals Added Paths: ----------- trunk/spelling/ Copied: trunk/spelling (from rev 3903, trunk/pywikipedia/spelling)

1 0

SVN: [3903] trunk/pywikipedia/login.py
by wikipedian＠svn.wikimedia.org 26 Jul '07

26 Jul '07

Revision: 3903 Author: wikipedian Date: 2007-07-26 18:23:37 +0000 (Thu, 26 Jul 2007) Log Message: ----------- bot lists: fixed error message disabled check on the simple english wikipedia Modified Paths: -------------- trunk/pywikipedia/login.py Modified: trunk/pywikipedia/login.py =================================================================== --- trunk/pywikipedia/login.py 2007-07-26 16:48:49 UTC (rev 3902) +++ trunk/pywikipedia/login.py 2007-07-26 18:23:37 UTC (rev 3903) @@ -53,7 +53,9 @@ botList = { 'wikipedia': { 'en': u'Wikipedia:Registered bots', - 'simple': u'Wikipedia:Bots', + # Disabled because they are now using a template system which + # we can't check with our current code. + #'simple': u'Wikipedia:Bots', }, 'gentoo': { 'en': u'Help:Bots', @@ -219,7 +221,7 @@ wikipedia.output(u"Logging in to %s as %s" % (self.site, self.username)) # Ensure bot policy on the English Wikipedia if not self.botAllowed(): - wikipedia.output(u'*** Your username is not listed on [[Wikipedia:Bots]].\n*** Please make sure you are allowed to use the robot before actually using it!') + wikipedia.output(u'*** Your username is not listed on [[%s]].\n*** Please make sure you are allowed to use the robot before actually using it!' % botList[self.site.family.name][self.site.lang]) cookiedata = self.getCookie() if cookiedata: self.storecookiedata(cookiedata)

1 0

SVN: [3902] trunk/pywikipedia/editarticle.py
by wikipedian＠svn.wikimedia.org 26 Jul '07

26 Jul '07

Revision: 3902 Author: wikipedian Date: 2007-07-26 16:48:49 +0000 (Thu, 26 Jul 2007) Log Message: ----------- line jumping code: use startswith() because some users might use parameters. Modified Paths: -------------- trunk/pywikipedia/editarticle.py Modified: trunk/pywikipedia/editarticle.py =================================================================== --- trunk/pywikipedia/editarticle.py 2007-07-26 15:17:34 UTC (rev 3901) +++ trunk/pywikipedia/editarticle.py 2007-07-26 16:48:49 UTC (rev 3902) @@ -41,18 +41,18 @@ column = jumpIndex - (text[:jumpIndex].rfind('\n') + 1) else: line = column = 0 - # Linux editors - if config.editor == 'kate': + # Linux editors. We use startswith() because some users might use parameters. + if config.editor.startswith('kate'): command += " -l %i -c %i" % (line, column) - elif config.editor == 'gedit': + elif config.editor.startswith('gedit'): command += " +%i" % (line + 1) # seems not to support columns - elif config.editor == 'emacs': + elif config.editor.startswith('emacs'): command += " +%i" % (line + 1) # seems not to support columns - elif config.editor == 'jedit': + elif config.editor.startswith('jedit'): command += " +line:%i" % (line + 1) # seems not to support columns - elif config.editor == 'vim': + elif config.editor.startswith('vim'): command += " +%i" % (line + 1) # seems not to support columns - elif config.editor == 'nano': + elif config.editor.startswith('nano'): command += " +%i,%i" % (line + 1, column + 1) # Windows editors elif config.editor.lower().endswith('notepad++.exe'):

1 0

SVN: [3901] trunk/pywikipedia
by wikipedian＠svn.wikimedia.org 26 Jul '07

26 Jul '07

Revision: 3901 Author: wikipedian Date: 2007-07-26 15:17:34 +0000 (Thu, 26 Jul 2007) Log Message: ----------- Added more secure -pass parameter to login.py so that you don't have to run the insecure -pass:XYZ anymore Added password parameter for wikipedia.input() Added docu for input methods Moved lower-casing to wikipedia.input() Modified Paths: -------------- trunk/pywikipedia/login.py trunk/pywikipedia/userinterfaces/cgi_interface.py trunk/pywikipedia/userinterfaces/terminal_interface.py trunk/pywikipedia/userinterfaces/tkinter_interface.py trunk/pywikipedia/userinterfaces/wxpython_interface.py trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/login.py =================================================================== --- trunk/pywikipedia/login.py 2007-07-26 13:06:28 UTC (rev 3900) +++ trunk/pywikipedia/login.py 2007-07-26 15:17:34 UTC (rev 3901) @@ -8,26 +8,30 @@ Parameters: + -all Try to log in on all sites where a username is defined in + user-config.py. + + -pass Useful in combination with -all when you have accounts for + several sites and use the same password for all of them. + Asks you for the password, then logs in on all given sites. + -pass:XXXX Uses XXXX as password. Be careful if you use this parameter because your password will be shown on your - screen. - + screen, and will probably be saved in your command line + history. This is NOT RECOMMENDED for use on computers + where others have either physical or remote access. + Use -pass instead. + -sysop Log in with your sysop account. - - -all Try to log in on all sites where a username is defined in - user-config.py. - - -force When doing -all, ignores if the user is already loged in, - and tries to login for all listed sites. - This may be useful if you have changed the account name - and need to aquire new login cookies. + -force Ignores if the user is already logged in, and tries to log in. + If not given as parameter, the script will ask for your username and password (password entry will be hidden), log in to your home wiki using this combination, and store the resulting cookies (containing your password hash, so keep it secured!) in a file in the login-data subdirectory. -All bots in this library will be looking for this cookie file and will use the +All scripts in this library will be looking for this cookie file and will use the login information if it is present. To log out, throw away the XX-login.data file that is created in the login-data @@ -40,7 +44,7 @@ # __version__='$Id$' -import re, sys, getpass +import re, sys import httplib, urllib2 import wikipedia, config @@ -206,13 +210,9 @@ def login(self, retry = False): if not self.password: - # As we don't want the password to appear on the screen, we use getpass(). - s = u'Password for user %s on %s: ' % (self.username, self.site) - self.password = getpass.getpass(s.encode(config.console_encoding)) - # Convert the password from the encoding your shell uses to the one your wiki - # uses, via Unicode. This is the same as wikipedia.input() does with the - # username, but input() uses raw_input() instead of getpass(). - self.password = unicode(self.password, config.console_encoding) + # As we don't want the password to appear on the screen, we set + # password = True + self.password = wikipedia.input(u'Password for user %s on %s:' % (self.username, self.site), password = True) self.password = self.password.encode(self.site.encoding()) @@ -239,8 +239,11 @@ logall = False forceLogin = False for arg in wikipedia.handleArgs(): - if arg.startswith("-pass:"): - password = arg[6:] + if arg.startswith("-pass"): + if len(arg) == 5: + password = wikipedia.input(u'Password for all accounts:', password = True) + else: + password = arg[6:] elif arg == "-sysop": sysop = True elif arg == "-all": Modified: trunk/pywikipedia/userinterfaces/cgi_interface.py =================================================================== --- trunk/pywikipedia/userinterfaces/cgi_interface.py 2007-07-26 13:06:28 UTC (rev 3900) +++ trunk/pywikipedia/userinterfaces/cgi_interface.py 2007-07-26 15:17:34 UTC (rev 3901) @@ -9,5 +9,6 @@ if toStdout: sys.stdout.write(text.encode('UTF-8', 'replace')) - def input(self, question, colors = None): + def input(self, question, colors = None, password = False): + # CGI is output-only. self.output(question + ' ', newline = False, toStdout = True) Modified: trunk/pywikipedia/userinterfaces/terminal_interface.py =================================================================== --- trunk/pywikipedia/userinterfaces/terminal_interface.py 2007-07-26 13:06:28 UTC (rev 3900) +++ trunk/pywikipedia/userinterfaces/terminal_interface.py 2007-07-26 15:17:34 UTC (rev 3901) @@ -169,7 +169,7 @@ targetStream = sys.stderr self.printColorized(text, colors, targetStream) - def input(self, question, colors = None): + def input(self, question, colors = None, password = False): """ Works like raw_input(), but returns a unicode string instead of ASCII. @@ -184,7 +184,11 @@ self.output(question + ' ', colors = colors + [None], newline=False) else: self.output(question + ' ', newline = False) - text = raw_input() + if password: + import getpass + text = getpass.getpass('') + else: + text = raw_input() text = unicode(text, config.console_encoding) return text @@ -204,7 +208,7 @@ prompt = '%s (%s)' % (question, ', '.join(options)) answer = self.input(prompt) if answer.lower() in hotkeys or answer.upper() in hotkeys: - return answer.lower() + return answer elif default and answer=='': # empty string entered return default Modified: trunk/pywikipedia/userinterfaces/tkinter_interface.py =================================================================== --- trunk/pywikipedia/userinterfaces/tkinter_interface.py 2007-07-26 13:06:28 UTC (rev 3900) +++ trunk/pywikipedia/userinterfaces/tkinter_interface.py 2007-07-26 15:17:34 UTC (rev 3901) @@ -196,11 +196,11 @@ # auto-scroll down self.logBox.see(END) - def input(self, question, colors=None): + def input(self, question, colors=None, password = False): """ Returns a unicode string. """ - + # TODO: hide input if password = True answer = tkSimpleDialog.askstring('title', question) return answer @@ -215,4 +215,4 @@ d = CustomMessageBox(self.parent, question, options, hotkeys) self.parent.wait_window(d.top) answer = d.ask() - return answer.lower() + return answer Modified: trunk/pywikipedia/userinterfaces/wxpython_interface.py =================================================================== --- trunk/pywikipedia/userinterfaces/wxpython_interface.py 2007-07-26 13:06:28 UTC (rev 3900) +++ trunk/pywikipedia/userinterfaces/wxpython_interface.py 2007-07-26 15:17:34 UTC (rev 3901) @@ -23,16 +23,14 @@ # comma at the end means "don't print newline" print text.encode(config.console_encoding, 'replace'), - def input(self, question, colors = None): + def input(self, question, colors = None, password = False): """ Works like raw_input(), but returns a unicode string instead of ASCII. Unlike raw_input, this function automatically adds a space after the question. """ - - # sound the terminal bell to notify the user - #sys.stdout.write('\07') + # TODO: hide input if password = True answer = dialog = wxTextEntryDialog ( None, 'question', 'Title Here', '' ) #tkSimpleDialog.askstring('title', question) @@ -54,6 +52,6 @@ prompt = '%s (%s)' % (question, ', '.join(options)) answer = self.input(prompt) if answer.lower() in hotkeys or answer.upper() in hotkeys: - return answer.lower() + return answer ui = UI() print ui.input('Test?') Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2007-07-26 13:06:28 UTC (rev 3900) +++ trunk/pywikipedia/wikipedia.py 2007-07-26 15:17:34 UTC (rev 3901) @@ -4467,7 +4467,7 @@ If toStdout is True, the text will be sent to standard output, so that it can be piped to another process. All other text will - be sent to stderr. + be sent to stderr. See: http://en.wikipedia.org/wiki/Pipeline_%28Unix%29 """ output_lock.acquire() try: @@ -4490,12 +4490,40 @@ finally: output_lock.release() -def input(question, colors = None): - return ui.input(question, colors) +def input(question, colors = None, password = False): + """ + Asks the user a question, then returns the user's answer. + Parameters: + * question - a unicode string that will be shown to the user. Don't add a + space after the question mark/colon, this method will do this + for you. + * colors - same as in output(). + * password - if True, hides the user's input (for password entry). + + Returns a unicode string. + """ + return ui.input(question, colors, password) + def inputChoice(question, answers, hotkeys, default = None): - return ui.inputChoice(question, answers, hotkeys, default) + """ + Asks the user a question and offers several options, then returns the + user's choice. The user's input will be case-insensitive, so the hotkeys + should be distinctive case-insensitively. + Parameters: + * question - a unicode string that will be shown to the user. Don't add a + space after the question mark, this method will do this + for you. + * answers - a list of strings that represent the options. + * hotkeys - a list of one-letter strings, one for each answer. + * default - an element of hotkeys, or None. The default choice that will + be returned when the user just presses Enter. + + Returns a one-letter string in lowercase. + """ + return ui.inputChoice(question, answers, hotkeys, default).lower() + def showHelp(moduleName = None): # the parameter moduleName is deprecated and should be left out. moduleName = moduleName or sys.argv[0][:sys.argv[0].rindex('.')]

1 0

SVN: [3900] trunk/pywikipedia
by wikipedian＠svn.wikimedia.org 26 Jul '07

26 Jul '07

Revision: 3900 Author: wikipedian Date: 2007-07-26 13:06:28 +0000 (Thu, 26 Jul 2007) Log Message: ----------- Deleted class XmlPage. I tagged this as delete-me long ago, and it is unused and a really, really bad idea. Modified Paths: -------------- trunk/pywikipedia/family.py trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2007-07-25 21:33:20 UTC (rev 3899) +++ trunk/pywikipedia/family.py 2007-07-26 13:06:28 UTC (rev 3900) @@ -2578,9 +2578,6 @@ def withoutinterwiki_address(self, code, limit=500): return "%s?title=%s:Withoutinterwiki&limit=%d" % (self.path(code), self.special_namespace_url(code), limit) - def linksearch_address(self, code, url, limit=500): - return "%s?title=%s:Linksearch&target=%s&limit=%d" % (self.path(code), self.special_namespace_url(code), url, limit) - def code2encoding(self, code): """Return the encoding for a specific language wiki""" return 'utf-8' Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2007-07-25 21:33:20 UTC (rev 3899) +++ trunk/pywikipedia/wikipedia.py 2007-07-26 13:06:28 UTC (rev 3900) @@ -2162,30 +2162,6 @@ result.append(Page(self.site(), match.group('title'))) return result -class XmlPage(Page): - # In my opinion, this should be deleted. --Daniel Herding - '''A subclass of Page that wraps an XMLEntry object (from xmlreader.py). - - Sample usage: - >>> source = xmlreader.XmlDump(some_file_name) - >>> for entry in source.parse(): - ... page = XmlPage(getSite(), entry) - ... # do something with page... - ''' - - def __init__(self, site, xmlentry): - if not isinstance(xmlentry, xmlreader.XmlEntry): - raise TypeError("Invalid argument to XmlPage constructor.") - Page.__init__(self, site, xmlentry.title) - self.editRestriction = xmlentry.editRestriction - self.moveRestriction = xmlentry.moveRestriction - self._contents = xmlentry.text - self._xml = xmlentry # save XML source in case we need it later - m = self.site().redirectRegex().match(self._contents) - if m: - self._redirarg = m.group(1) - self._getexception = IsRedirectPage - class GetAll(object): def __init__(self, site, pages, throttle, force): """First argument is Site object.

1 0

SVN: [3899] trunk/pywikipedia/wikipedia.py
by wikipedian＠svn.wikimedia.org 26 Jul '07

26 Jul '07

Revision: 3899 Author: wikipedian Date: 2007-07-25 21:33:20 +0000 (Wed, 25 Jul 2007) Log Message: ----------- fixed serious bug [ 1757382 ] edit conflit undetected Andre Engels did it properly in wikipedia.py CVS r1.927 (SVN r3710) with the description "Avoid 'solving' edit conflicts by throwing away the conflicting edit." Bryan broke it in wikipedia.py CVS r1.950 (SVN r3837) with the description "Undo the change in r1.927 to get a token of the page itself instead of the sandbox, to prevent edit conflicts when editting as sysop." I basically reverted it to Andre's version. I didn't test if unwanted edit conflicts are raised when someone edits the sandbox. But even if that's the case, having an edit conflict here and there is better than the catastrophic situation that we have at the moment (bots overwrite other user's changes). Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2007-07-25 20:19:06 UTC (rev 3898) +++ trunk/pywikipedia/wikipedia.py 2007-07-25 21:33:20 UTC (rev 3899) @@ -1038,10 +1038,10 @@ If watchArticle is None, leaves the watchlist status unchanged. """ - # Fetch the page to get an edit token. If we already have + # Fetch a page to get an edit token. If we already have # fetched a page, this will do nothing, because get() is cached. try: - self.get(force = True, get_redirect = True) + self.site().sandboxpage.get(force = True, get_redirect = True) except NoPage: pass

1 0

SVN: [3898] trunk/pywikipedia/wikipedia.py
by russblau＠svn.wikimedia.org 25 Jul '07

25 Jul '07

Revision: 3898 Author: russblau Date: 2007-07-25 20:19:06 +0000 (Wed, 25 Jul 2007) Log Message: ----------- Fix regexes that got modified in last revision. Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2007-07-25 20:09:29 UTC (rev 3897) +++ trunk/pywikipedia/wikipedia.py 2007-07-25 20:19:06 UTC (rev 3898) @@ -3491,7 +3491,7 @@ path = self.longpages_address(n=number) get_throttle() html = self.getUrl(path) - entryR = re.compile(ur'<li>$<a href=".+?" title=".+?">hist</a>$ <a href=".+?" title="(?P<title>.+?)">.+?</a> \[(?P<length>\d+)(.+?)\]</li>') + entryR = re.compile(ur'<li>$<a href=".+?" title=".+?">hist</a>$ ‎<a href=".+?" title="(?P<title>.+?)">.+?</a> ‎\[(?P<length>\d+)(.+?)\]</li>') for m in entryR.finditer(html): title = m.group('title') length = int(m.group('length')) @@ -3510,7 +3510,7 @@ path = self.shortpages_address(n = number) get_throttle() html = self.getUrl(path) - entryR = re.compile(ur'<li>$<a href=".+?" title=".+?">hist</a>$ <a href=".+?" title="(?P<title>.+?)">.+?</a> \[(?P<length>\d+)(.+?)\]</li>') + entryR = re.compile(ur'<li>$<a href=".+?" title=".+?">hist</a>$ ‎<a href=".+?" title="(?P<title>.+?)">.+?</a> ‎\[(?P<length>\d+)(.+?)\]</li>') for m in entryR.finditer(html): title = m.group('title') length = int(m.group('length'))

1 0

SVN: [3897] trunk/pywikipedia/wikipedia.py
by russblau＠svn.wikimedia.org 25 Jul '07

25 Jul '07

Revision: 3897 Author: russblau Date: 2007-07-25 20:09:29 +0000 (Wed, 25 Jul 2007) Log Message: ----------- Catch NoPage exception in Page.templates() Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2007-07-25 11:56:14 UTC (rev 3896) +++ trunk/pywikipedia/wikipedia.py 2007-07-25 20:09:29 UTC (rev 3897) @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- """ Library to get and put pages on a MediaWiki. @@ -1416,7 +1416,7 @@ """ try: thistxt = self.get() - except IsRedirectPage: + except (IsRedirectPage, NoPage): return [] # remove commented-out stuff etc. @@ -3491,7 +3491,7 @@ path = self.longpages_address(n=number) get_throttle() html = self.getUrl(path) - entryR = re.compile(ur'<li>$<a href=".+?" title=".+?">hist</a>$ ‎<a href=".+?" title="(?P<title>.+?)">.+?</a> ‎\[(?P<length>\d+)(.+?)\]</li>') + entryR = re.compile(ur'<li>$<a href=".+?" title=".+?">hist</a>$ <a href=".+?" title="(?P<title>.+?)">.+?</a> \[(?P<length>\d+)(.+?)\]</li>') for m in entryR.finditer(html): title = m.group('title') length = int(m.group('length')) @@ -3510,7 +3510,7 @@ path = self.shortpages_address(n = number) get_throttle() html = self.getUrl(path) - entryR = re.compile(ur'<li>$<a href=".+?" title=".+?">hist</a>$ ‎<a href=".+?" title="(?P<title>.+?)">.+?</a> ‎\[(?P<length>\d+)(.+?)\]</li>') + entryR = re.compile(ur'<li>$<a href=".+?" title=".+?">hist</a>$ <a href=".+?" title="(?P<title>.+?)">.+?</a> \[(?P<length>\d+)(.+?)\]</li>') for m in entryR.finditer(html): title = m.group('title') length = int(m.group('length'))

1 0

SVN commits
by Russell Blau 25 Jul '07

25 Jul '07

Can someone explain how to do a commit to the new repository? I'm using TortoiseSVN on a Windows XP machine. Checking out the files worked fine; but trying to commit gets me the following error: C:\...\pywikipedia>svn commit wikipedia.py --username russblau --message "Catch NoPage exception in Page.templates()" svn: Commit failed (details follow): svn: Can't create directory '/svnroot/pywikipedia/db/transactions/3896-1.txn': P ermission denied I've got developer access (right?) and I've got my SSH key loaded in Pageant. What else do I need to do to be able to commit? Russ

2 1

SVN: [3896] trunk/pywikipedia/families/wikisource_family.py
by thomasv＠svn.wikimedia.org 25 Jul '07

25 Jul '07

Revision: 3896 Author: thomasv Date: 2007-07-25 11:56:14 +0000 (Wed, 25 Jul 2007) Log Message: ----------- oops, forgot this... Modified Paths: -------------- trunk/pywikipedia/families/wikisource_family.py Modified: trunk/pywikipedia/families/wikisource_family.py =================================================================== --- trunk/pywikipedia/families/wikisource_family.py 2007-07-25 11:50:43 UTC (rev 3895) +++ trunk/pywikipedia/families/wikisource_family.py 2007-07-25 11:56:14 UTC (rev 3896) @@ -139,3 +139,6 @@ 'no','pl','pt','ro','ru','sk','sl','sr', 'sv','te','th','tr','uk','vi','yi','zh'] + def version(self, code): + return "1.11" +

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

Pywikipedia-l