Pywikipedia-svn March 2013

pywikipedia-svn@lists.wikimedia.org

8 participants
171 discussions

SVN: [11271] trunk/pywikipedia/maintenance/check_disambiguationspage.py
by xqt＠svn.wikimedia.org 25 Mar '13

25 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11271 Revision: 11271 Author: xqt Date: 2013-03-25 17:48:25 +0000 (Mon, 25 Mar 2013) Log Message: ----------- fix output message Modified Paths: -------------- trunk/pywikipedia/maintenance/check_disambiguationspage.py Modified: trunk/pywikipedia/maintenance/check_disambiguationspage.py =================================================================== --- trunk/pywikipedia/maintenance/check_disambiguationspage.py 2013-03-25 17:22:35 UTC (rev 11270) +++ trunk/pywikipedia/maintenance/check_disambiguationspage.py 2013-03-25 17:48:25 UTC (rev 11271) @@ -54,8 +54,8 @@ % "', u'".join(l)) if distl - disambigs: l = list(distl - disambigs) - pywikibot.output("missing on MediaWiki message:\n%s," - % "' u".join(l)) + pywikibot.output("missing on MediaWiki message:\n%s" + % ", ".join(l)) else: pywikibot.output('remove %s from family file' % k) print

1 0

SVN: [11270] trunk/pywikipedia/maintenance/check_disambiguationspage.py
by xqt＠svn.wikimedia.org 25 Mar '13

25 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11270 Revision: 11270 Author: xqt Date: 2013-03-25 17:22:35 +0000 (Mon, 25 Mar 2013) Log Message: ----------- Checks whether MediaWiki:Disambiguationpages exists on a site and compares it with Family.disambiguationTemplates dictionary Added Paths: ----------- trunk/pywikipedia/maintenance/check_disambiguationspage.py Added: trunk/pywikipedia/maintenance/check_disambiguationspage.py =================================================================== --- trunk/pywikipedia/maintenance/check_disambiguationspage.py (rev 0) +++ trunk/pywikipedia/maintenance/check_disambiguationspage.py 2013-03-25 17:22:35 UTC (rev 11270) @@ -0,0 +1,74 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +""" +Checks whether MediaWiki:Disambiguationpages exists on a site and compares it +with Family.disambiguationTemplates dictionary + +""" +# +# (C) xqt 2013 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' +# +import sys +sys.path.insert(1, '..') +import pywikibot + +DEFAULT = '_default' +MESSAGE = 'Disambiguationspage' + + +def check_disambig(f): + print u'Processing %s family:' % f.name + for k in sorted(f.disambiguationTemplates.keys()): + isdefault = False + if k == DEFAULT: + continue + print k + ':' + site = pywikibot.getSite(k) + try: + default = set(site.family.disambig(DEFAULT)) + except KeyError: + default = set([u'Disambig']) + try: + distl = set(f.disambig(k, fallback=False)) + except KeyError: + distl = set() + try: + disambigpages = pywikibot.Page(site, MESSAGE, defaultNamespace=8) + disambigs = set(link.title(withNamespace=False) + for link in disambigpages.linkedPages() + if link.namespace() == 10) + except pywikibot.NoPage: + isdefault = True + message = site.mediawiki_message(MESSAGE).strip('{[]}').split(':', + 1)[1] + disambigs = set([message[:1].upper() + message[1:]]) | default + print 'Using default MediaWiki message:', isdefault + if distl != disambigs: + if disambigs - distl: + l = list(disambigs - distl) + pywikibot.output("missing on family file:\n[u'%s']," + % "', u'".join(l)) + if distl - disambigs: + l = list(distl - disambigs) + pywikibot.output("missing on MediaWiki message:\n%s," + % "' u".join(l)) + else: + pywikibot.output('remove %s from family file' % k) + print + else: + print 'No disambiguationTemplates dictionary found' + + +def main(*args): + for arg in pywikibot.handleArgs(*args): + continue + check_disambig(pywikibot.getSite().family) + + +if __name__ == "__main__": + pywikibot.stopme() + main() Property changes on: trunk/pywikipedia/maintenance/check_disambiguationspage.py ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

SVN: [11269] trunk/pywikipedia/maintenance/update_namespaces.py
by xqt＠svn.wikimedia.org 25 Mar '13

25 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11269 Revision: 11269 Author: xqt Date: 2013-03-25 16:41:16 +0000 (Mon, 25 Mar 2013) Log Message: ----------- handle default overriding Modified Paths: -------------- trunk/pywikipedia/maintenance/update_namespaces.py Modified: trunk/pywikipedia/maintenance/update_namespaces.py =================================================================== --- trunk/pywikipedia/maintenance/update_namespaces.py 2013-03-25 14:30:06 UTC (rev 11268) +++ trunk/pywikipedia/maintenance/update_namespaces.py 2013-03-25 16:41:16 UTC (rev 11269) @@ -9,7 +9,7 @@ <family> Work on a given wikimedia family file """ # -# (C) xqt, 2010-2011 +# (C) xqt, 2010-2013 # (C) Pywikipedia bot team, 2007-2009 # # Distributed under the terms of the MIT license. @@ -26,31 +26,34 @@ import re r_namespace_section_main = r'(?s)self\.namespaces\s*\=\s*\{.*\s+%s\s*:\s*\{(.*?)\}' -r_namespace_section_sub = r'(?s)self\.namespaces\[%s]\s*\=\s*\{(.*?)\}' -r_namespace_section_once = r'(?s)self\.namespaces\[%s]\[\'%s\']\s*\=\s*\(.*?)' +r_namespace_section_sub = r'(?s)self\.namespaces\[%s\]\s*\=\s*\{(.*?)\}' +r_namespace_section_once = r"self\.namespaces\[%d\]\['%s'\]\s*\=\s*(.*?)$" r_string = '[u]?[r]?[\'"].*?[\'"]' r_list = '\\[.*?\\]' -r_namespace_def = re.compile(r'[\'"]([a-z_-]*)[\'"]\s*\:\s*((?:%s)|(?:%s))\s*,' % (r_string, r_list)) +r_namespace_def = re.compile( + r'[\'"]([a-z_-]*)[\'"]\s*\:\s*((?:%s)|(?:%s))\s*,' % (r_string, r_list)) -def update_family(family, changes): - global namespace_section_text, namespace_defs, new_defs + +def update_family(family, changes, upmain): if family: output(u'\nUpdating family %s' % family.name) family_file_name = '../families/%s_family.py' % family.name r_namespace_section = r_namespace_section_sub base_indent = 8 - skip_namespace = [] + skip_namespace = () else: output(u'\nUpdating family.py') family_file_name = '../family.py' r_namespace_section = r_namespace_section_main base_indent = 12 - skip_namespace = [4, 5] + skip_namespace = (4, 5) family_file = open(family_file_name, 'r') old_family_text = family_text = family_file.read() family_file.close() - + namespace_defs = {} + oncedefs = {} + oncetext = '' for lang, namespaces in changes.iteritems(): for namespace_id, namespace_list, predefined_namespace in namespaces: if namespace_id in skip_namespace: @@ -58,32 +61,54 @@ msg = u'Setting namespace[%s] for %s to ' \ + (u'[%s]' if len(namespace_list) > 1 else u'%s') output(msg % (namespace_id, lang, ', '.join(namespace_list))) + once = False + if family and not upmain and \ + namespace_id in range(-2, 16) and namespace_id not in (4, 5): + once = True +## namespace_section = re.search(r_namespace_section_once +## % (namespace_id, lang), +## family_text) + else: + namespace_section = re.search(r_namespace_section + % namespace_id, family_text) + if not namespace_section: + continue + namespace_section_text = namespace_section.group(1) + namespace_defs = dict( + [(match.group(1), match.group(2)) for match in + r_namespace_def.finditer(namespace_section_text)]) - namespace_section = re.search(r_namespace_section - % namespace_id, family_text) - #namespace_section2 = re.search(r_namespace_section_once % (namespace_id, lang) ,family_text) - if not namespace_section: - continue - namespace_section_text = namespace_section.group(1) - namespace_defs = dict([(match.group(1), match.group(2)) - for match in r_namespace_def.finditer(namespace_section_text)]) - msg = u'Updating namespace[%s] to ' \ + (u'[%s]' if len(namespace_list) > 1 else u'%s') output(msg % (namespace_id, ', '.join(namespace_list))) - if len(namespace_list) == 1: - namespace_defs[lang] = escape_string(namespace_list[0].encode('utf-8')) + if once: + if len(namespace_list) == 1: + new_defs = escape_string(namespace_list[0].encode('utf-8')) + else: + new_defs = u", ".join(escape_string(ns) for ns in + namespace_list).encode('utf-8') + oncetext += " self.namespaces[%d]['%s'] = [" \ + % (namespace_id, lang) + new_defs + ']\n' else: - namespaces = u", ".join(escape_string(ns) for ns in namespace_list).encode('utf-8') - namespace_defs[lang] = '[%s]' % namespaces + if len(namespace_list) == 1: + namespace_defs[lang] = escape_string( + namespace_list[0].encode('utf-8')) + else: + namespaces = u", ".join(escape_string(ns) for ns in + namespace_list).encode('utf-8') + namespace_defs[lang] = '[%s]' % namespaces + new_defs = namespace_defs.items() + new_defs.sort(key=lambda x: x[0]) - new_defs = namespace_defs.items() - new_defs.sort(key = lambda x: x[0]) - new_text = '\n' + ''.join([(base_indent + 4) * ' ' + "'%s': %s,\n" - % i for i in new_defs]) + ' ' * base_indent - family_text = family_text.replace(namespace_section.group(1), - new_text) + new_text = '\n' + ''.join( + [(base_indent + 4) * ' ' + "'%s': %s,\n" + % i for i in new_defs]) + ' ' * base_indent + family_text = family_text.replace(namespace_section.group(1), + new_text) + family_text = re.sub('(?s)# Override defaults.*?# Most', + '# Override defaults\n%s\n # Most' % oncetext, + family_text) if family_text == old_family_text: output(u'No changes made') elif test_data(family_text): @@ -95,9 +120,11 @@ output(u'Warning! Syntax error!') output(family_text.decode('utf-8')) + def escape_string(string): return "u'%s'" % string.replace('\\', '\\\\').replace("'", "\\'") + def test_data(_test_data): try: exec _test_data @@ -107,30 +134,33 @@ return True return True -def check_and_update(families, update_main = False): + +def check_and_update(families, update_main=False): for family in families: family = wikipedia.Family(family) result = family_check.check_family(family) - update_family(family, result) + update_family(family, result, update_main) if update_main: # Update also the family.py file - update_family(None, result) + update_family(None, result, update_main) + if __name__ == '__main__': try: update_main_family = False update_wikimedia = False - families = ['wiktionary', 'wikiquote','wikisource', 'wikibooks', - 'wikinews', 'wikiversity','meta', 'commons', 'mediawiki', - 'species', 'incubator', 'test', - ] + families = ['commons', 'incubator', 'mediawiki', 'meta', 'species', + 'test', 'wikibooks', 'wikidata', 'wikinews', 'wikiquote', + 'wikisource', 'wikiversity', 'wikivoyage', 'wiktionary'] fam = [] for arg in wikipedia.handleArgs(): - if arg == '-upmain': + if arg == '-upmain': update_main_family = True elif arg == '-wikimedia': update_wikimedia = True fam = families + elif arg == '-skipmain': + fam = families elif arg in families: if not arg in fam: fam.append(arg)

1 0

SVN: [11268] trunk/pywikipedia/wikipedia.py
by amir＠svn.wikimedia.org 25 Mar '13

25 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11268 Revision: 11268 Author: amir Date: 2013-03-25 14:30:06 +0000 (Mon, 25 Mar 2013) Log Message: ----------- adding &bot=1 for editclaime and using json for create Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2013-03-25 14:19:36 UTC (rev 11267) +++ trunk/pywikipedia/wikipedia.py 2013-03-25 14:30:06 UTC (rev 11268) @@ -4265,7 +4265,9 @@ 'title': self._originTitle, 'site': self._siteTitle}) else: - params['data'] = re.sub(ur"\bu\'", u'"',repr(value).decode("unicode-escape")).replace("'", '"') + value=json.dumps(value) + value=value.replace("'", '"') + params['data'] = value if token: params['token'] = token else: @@ -4397,6 +4399,8 @@ 'value': value, } params['token'] = token or self.site().getToken(sysop=sysop) + if botflag: + params['bot'] = 1 output(u"Changing %s" % self.title()) data = query.GetData(params, self.site(), sysop=sysop) if 'error' in data: @@ -4413,6 +4417,8 @@ 'value': value, } params['token'] = token or self.site().getToken(sysop=sysop) + if botflag: + params['bot'] = 1 output(u"Creating %s" % self.title()) data = query.GetData(params, self.site(), sysop=sysop) if 'error' in data: @@ -4477,6 +4483,8 @@ params['token'] = token else: params['token'] = self.site().getToken(sysop = sysop) + if botflag: + params['bot'] = 1 output(u"Adding references to %s" % self.title()) data = query.GetData(params, self.site(), sysop=sysop) if 'error' in data:

1 0

SVN: [11267] branches/rewrite/pywikibot/pagegenerators.py
by legoktm＠svn.wikimedia.org 25 Mar '13

25 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11267 Revision: 11267 Author: legoktm Date: 2013-03-25 14:19:36 +0000 (Mon, 25 Mar 2013) Log Message: ----------- Have CategorizedPageGenerator implement sortkey with API Modified Paths: -------------- branches/rewrite/pywikibot/pagegenerators.py Modified: branches/rewrite/pywikibot/pagegenerators.py =================================================================== --- branches/rewrite/pywikibot/pagegenerators.py 2013-03-25 13:50:12 UTC (rev 11266) +++ branches/rewrite/pywikibot/pagegenerators.py 2013-03-25 14:19:36 UTC (rev 11267) @@ -604,11 +604,16 @@ retrieved page will be downloaded. """ - # TODO: page generator could be modified to use cmstartsortkey ... - for a in category.articles( - recurse=recurse, step=step, total=total, content=content): - if start is None or a.title(withNamespace=False) >= start: - yield a + kwargs = dict(recurse=recurse, + step=step, + total=total, + content=content, + ) + if start: + kwargs['sortby'] = 'sortkey' + kwargs['startsort'] = start + for a in category.site.categorymembers(category, **kwargs): + yield a def SubCategoriesPageGenerator(category, recurse=False, start=None,

1 0

SVN: [11266] branches/rewrite/tests/page_tests.py
by legoktm＠svn.wikimedia.org 25 Mar '13

25 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11266 Revision: 11266 Author: legoktm Date: 2013-03-25 13:50:12 +0000 (Mon, 25 Mar 2013) Log Message: ----------- Use assertType from site_tests.py, PEP8 fixes, +1 wikibase test Modified Paths: -------------- branches/rewrite/tests/page_tests.py Modified: branches/rewrite/tests/page_tests.py =================================================================== --- branches/rewrite/tests/page_tests.py 2013-03-25 13:22:19 UTC (rev 11265) +++ branches/rewrite/tests/page_tests.py 2013-03-25 13:50:12 UTC (rev 11266) @@ -18,8 +18,9 @@ mainpage = pywikibot.Page(pywikibot.page.Link("Main Page", site)) maintalk = pywikibot.Page(pywikibot.page.Link("Talk:Main Page", site)) badpage = pywikibot.Page(pywikibot.page.Link("There is no page with this title", - site)) + site)) + class TestLinkObject(unittest.TestCase): """Test cases for Link objects""" @@ -38,32 +39,32 @@ 7: [u"Image talk:", u"Image_talk:"], 8: [u"MediaWiki:"], 9: [u"MediaWiki talk:", u"MediaWiki_talk:"], - 10: [u"Template:"], - 11: [u"Template talk:", u"Template_talk:"], - 12: [u"Help:"], - 13: [u"Help talk:", u"Help_talk:"], - 14: [u"Category:"], - 15: [u"Category talk:", u"Category_talk:"], - 100: [u"Portal:"], - 101: [u"Portal talk:", u"Portal_talk:"], - } + 10: [u"Template:"], + 11: [u"Template talk:", u"Template_talk:"], + 12: [u"Help:"], + 13: [u"Help talk:", u"Help_talk:"], + 14: [u"Category:"], + 15: [u"Category talk:", u"Category_talk:"], + 100: [u"Portal:"], + 101: [u"Portal talk:", u"Portal_talk:"], + } titles = { # just a bunch of randomly selected titles # input format : expected output format - u"Cities in Burkina Faso" : u"Cities in Burkina Faso", - u"eastern Sayan" : u"Eastern Sayan", - u"The_Addams_Family_(pinball)" : u"The Addams Family (pinball)", - u"Hispanic (U.S. Census)" : u"Hispanic (U.S. Census)", - u"Stołpce" : u"Stołpce", - u"Nowy_Sącz" : u"Nowy Sącz", - u"battle of Węgierska Górka" : u"Battle of Węgierska Górka", + u"Cities in Burkina Faso": u"Cities in Burkina Faso", + u"eastern Sayan": u"Eastern Sayan", + u"The_Addams_Family_(pinball)": u"The Addams Family (pinball)", + u"Hispanic (U.S. Census)": u"Hispanic (U.S. Census)", + u"Stołpce": u"Stołpce", + u"Nowy_Sącz": u"Nowy Sącz", + u"battle of Węgierska Górka": u"Battle of Węgierska Górka", } # random bunch of possible section titles sections = [u"", u"#Phase_2", u"#History", u"#later life", - ] + ] def testNamespaces(self): """Test that Link() normalizes namespace names""" @@ -84,7 +85,7 @@ l = pywikibot.page.Link(self.namespaces[num][0]+title) self.assertEqual(l.title, self.titles[title]) # prefixing name with ":" shouldn't change result - m = pywikibot.page.Link(":"+self.namespaces[num][0]+title) + m = pywikibot.page.Link(":" + self.namespaces[num][0] + title) self.assertEqual(m.title, self.titles[title]) def testHashCmp(self): @@ -92,6 +93,7 @@ l1 = pywikibot.page.Link('Test', source=self.enwiki) l2 = pywikibot.page.Link('en:Test', source=self.frwiki) l3 = pywikibot.page.Link('wikipedia:en:Test', source=self.itwikt) + def assertHashCmp(link1, link2): self.assertEqual(link1, link2) self.assertEqual(hash(link1), hash(link2)) @@ -106,7 +108,12 @@ self.assertNotEqual(l1, other) self.assertNotEqual(hash(l1), hash(other)) + class TestPageObject(unittest.TestCase): + def assertType(self, obj, cls): + """Assert that obj is an instance of type cls""" + return self.assertTrue(isinstance(obj, cls)) + def testGeneral(self): self.assertEqual(str(mainpage), "[[%s:%s]]" % (site.lang, mainpage.title())) @@ -206,73 +213,74 @@ """Test various methods that rely on API.""" # since there is no way to predict what data the wiki will return, # we only check that the returned objects are of correct type. - self.assertTrue(isinstance(mainpage.get(), unicode)) - self.assertTrue(isinstance(maintalk.get(), unicode)) + self.assertType(mainpage.get(), unicode) + self.assertType(maintalk.get(), unicode) self.assertRaises(pywikibot.NoPage, badpage.get) - self.assertTrue(isinstance(mainpage.latestRevision(), int)) - self.assertTrue(isinstance(mainpage.userName(), unicode)) - self.assertTrue(isinstance(mainpage.isIpEdit(), bool)) - self.assertTrue(isinstance(mainpage.exists(), bool)) - self.assertTrue(isinstance(mainpage.isRedirectPage(), bool)) - self.assertTrue(isinstance(mainpage.isEmpty(), bool)) + self.assertType(mainpage.latestRevision(), int) + self.assertType(mainpage.userName(), unicode) + self.assertType(mainpage.isIpEdit(), bool) + self.assertType(mainpage.exists(), bool) + self.assertType(mainpage.isRedirectPage(), bool) + self.assertType(mainpage.isEmpty(), bool) self.assertEqual(mainpage.toggleTalkPage(), maintalk) self.assertEqual(maintalk.toggleTalkPage(), mainpage) - self.assertTrue(isinstance(mainpage.isDisambig(), bool)) - self.assertTrue(isinstance(mainpage.canBeEdited(), bool)) - self.assertTrue(isinstance(mainpage.botMayEdit(), bool)) - self.assertTrue(isinstance(mainpage.editTime(), unicode)) - self.assertTrue(isinstance(mainpage.previousRevision(), int)) - self.assertTrue(isinstance(mainpage.permalink(), basestring)) + self.assertType(mainpage.isDisambig(), bool) + self.assertType(mainpage.canBeEdited(), bool) + self.assertType(mainpage.botMayEdit(), bool) + self.assertType(mainpage.editTime(), unicode) + self.assertType(mainpage.previousRevision(), int) + self.assertType(mainpage.permalink(), basestring) def testReferences(self): count = 0 #Ignore redirects for time considerations for p in mainpage.getReferences(follow_redirects=False): count += 1 - self.assertTrue(isinstance(p, pywikibot.Page)) + self.assertType(p, pywikibot.Page) if count >= 10: break count = 0 for p in mainpage.backlinks(followRedirects=False): count += 1 - self.assertTrue(isinstance(p, pywikibot.Page)) + self.assertType(p, pywikibot.Page) if count >= 10: break count = 0 for p in mainpage.embeddedin(): count += 1 - self.assertTrue(isinstance(p, pywikibot.Page)) + self.assertType(p, pywikibot.Page) if count >= 10: break def testLinks(self): for p in mainpage.linkedPages(): - self.assertTrue(isinstance(p, pywikibot.Page)) + self.assertType(p, pywikibot.Page) iw = list(mainpage.interwiki(expand=True)) for p in iw: - self.assertTrue(isinstance(p, pywikibot.Link)) + self.assertType(p, pywikibot.Link) for p2 in mainpage.interwiki(expand=False): - self.assertTrue(isinstance(p2, pywikibot.Link)) + self.assertType(p2, pywikibot.Link) self.assertTrue(p2 in iw) for p in mainpage.langlinks(): - self.assertTrue(isinstance(p, pywikibot.Link)) + self.assertType(p, pywikibot.Link) for p in mainpage.imagelinks(): - self.assertTrue(isinstance(p, pywikibot.ImagePage)) + self.assertType(p, pywikibot.ImagePage) for p in mainpage.templates(): - self.assertTrue(isinstance(p, pywikibot.Page)) + self.assertType(p, pywikibot.Page) for t, params in mainpage.templatesWithParams(): - self.assertTrue(isinstance(t, pywikibot.Page)) - self.assertTrue(isinstance(params, list)) + self.assertType(t, pywikibot.Page) + self.assertType(params, list) for p in mainpage.categories(): - self.assertTrue(isinstance(p, pywikibot.Category)) + self.assertType(p, pywikibot.Category) for p in mainpage.extlinks(): - self.assertTrue(isinstance(p, unicode)) + self.assertType(p, unicode) def testWikibase(self): if not site.has_transcluded_data: return repo = site.data_repository() item = pywikibot.ItemPage.fromPage(mainpage) + self.assertType(item, pywikibot.ItemPage) self.assertTrue(item.getID(), 'q5296') self.assertTrue('en' in item.labels) self.assertEqual(item.labels['en'], 'Main Page')

1 0

SVN: [11265] branches/rewrite/tests
by legoktm＠svn.wikimedia.org 25 Mar '13

25 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11265 Revision: 11265 Author: legoktm Date: 2013-03-25 13:22:19 +0000 (Mon, 25 Mar 2013) Log Message: ----------- Start Wikibase unittests, minor PEP8 fix Modified Paths: -------------- branches/rewrite/tests/page_tests.py branches/rewrite/tests/site_tests.py Modified: branches/rewrite/tests/page_tests.py =================================================================== --- branches/rewrite/tests/page_tests.py 2013-03-25 12:29:15 UTC (rev 11264) +++ branches/rewrite/tests/page_tests.py 2013-03-25 13:22:19 UTC (rev 11265) @@ -14,7 +14,7 @@ import pywikibot import pywikibot.page -site = pywikibot.Site('en') +site = pywikibot.Site('en', 'wikipedia') mainpage = pywikibot.Page(pywikibot.page.Link("Main Page", site)) maintalk = pywikibot.Page(pywikibot.page.Link("Talk:Main Page", site)) badpage = pywikibot.Page(pywikibot.page.Link("There is no page with this title", @@ -268,6 +268,21 @@ for p in mainpage.extlinks(): self.assertTrue(isinstance(p, unicode)) + def testWikibase(self): + if not site.has_transcluded_data: + return + repo = site.data_repository() + item = pywikibot.ItemPage.fromPage(mainpage) + self.assertTrue(item.getID(), 'q5296') + self.assertTrue('en' in item.labels) + self.assertEqual(item.labels['en'], 'Main Page') + self.assertTrue('en' in item.aliases) + self.assertTrue('HomePage' in item.aliases['en']) + prop = pywikibot.PropertyPage(repo, 'Property:P21') + self.assertEqual(prop.getType(), 'wikibase-item') + + + # methods that still need tests implemented or expanded: ## def autoFormat(self): Modified: branches/rewrite/tests/site_tests.py =================================================================== --- branches/rewrite/tests/site_tests.py 2013-03-25 12:29:15 UTC (rev 11264) +++ branches/rewrite/tests/site_tests.py 2013-03-25 13:22:19 UTC (rev 11265) @@ -45,7 +45,7 @@ self.assertEqual(mysite.family.name, self.family) self.assertEqual(mysite.code, self.code) self.assertType(mysite.lang, basestring) - self.assertType(mysite == pywikibot.Site("en", "wikipedia"), bool) + self.assertEqual(mysite, pywikibot.Site("en", "wikipedia")) self.assertType(mysite.user(), (basestring, type(None))) self.assertEqual(mysite.sitename(), "%s:%s" % (self.family, @@ -74,7 +74,7 @@ self.assertTrue(mysite.code in langs) obs = mysite.family.obsolete ipf = mysite.interwiki_putfirst() - if ipf: #Not all languages use this + if ipf: # Not all languages use this self.assertType(ipf, list) for item in mysite.validLanguageLinks():

1 0

SVN: [11264] branches/rewrite/tests/site_tests.py
by legoktm＠svn.wikimedia.org 25 Mar '13

25 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11264 Revision: 11264 Author: legoktm Date: 2013-03-25 12:29:15 +0000 (Mon, 25 Mar 2013) Log Message: ----------- Fix interwiki_putfirst unittests, fix patrol tests after r11262. Modified Paths: -------------- branches/rewrite/tests/site_tests.py Modified: branches/rewrite/tests/site_tests.py =================================================================== --- branches/rewrite/tests/site_tests.py 2013-03-25 12:09:14 UTC (rev 11263) +++ branches/rewrite/tests/site_tests.py 2013-03-25 12:29:15 UTC (rev 11264) @@ -74,7 +74,8 @@ self.assertTrue(mysite.code in langs) obs = mysite.family.obsolete ipf = mysite.interwiki_putfirst() - self.assertType(ipf, list) + if ipf: #Not all languages use this + self.assertType(ipf, list) for item in mysite.validLanguageLinks(): self.assertTrue(item in langs, item) @@ -663,10 +664,12 @@ self.assertTrue("redirect" not in change) for change in mysite.recentchanges(showPatrolled=True, total=5): self.assertType(change, dict) - self.assertTrue("patrolled" in change) + if mysite.has_right('patrol'): + self.assertTrue("patrolled" in change) for change in mysite.recentchanges(showPatrolled=False, total=5): self.assertType(change, dict) - self.assertTrue("patrolled" not in change) + if mysite.has_right('patrol'): + self.assertTrue("patrolled" not in change) def testSearch(self): """Test the site.search() method"""

1 0

SVN: [11263] branches/rewrite/tests
by legoktm＠svn.wikimedia.org 25 Mar '13

25 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11263 Revision: 11263 Author: legoktm Date: 2013-03-25 12:09:14 +0000 (Mon, 25 Mar 2013) Log Message: ----------- Update unit tests, remove deprecated test Modified Paths: -------------- branches/rewrite/tests/page_tests.py branches/rewrite/tests/site_tests.py Modified: branches/rewrite/tests/page_tests.py =================================================================== --- branches/rewrite/tests/page_tests.py 2013-03-25 12:07:37 UTC (rev 11262) +++ branches/rewrite/tests/page_tests.py 2013-03-25 12:09:14 UTC (rev 11263) @@ -115,7 +115,6 @@ def testSite(self): """Test site() method""" self.assertEqual(mainpage.site, site) - self.assertEqual(mainpage.encoding(), site.encoding()) def testNamespace(self): """Test namespace() method""" @@ -227,13 +226,14 @@ def testReferences(self): count = 0 - for p in mainpage.getReferences(): + #Ignore redirects for time considerations + for p in mainpage.getReferences(follow_redirects=False): count += 1 self.assertTrue(isinstance(p, pywikibot.Page)) if count >= 10: break count = 0 - for p in mainpage.backlinks(): + for p in mainpage.backlinks(followRedirects=False): count += 1 self.assertTrue(isinstance(p, pywikibot.Page)) if count >= 10: Modified: branches/rewrite/tests/site_tests.py =================================================================== --- branches/rewrite/tests/site_tests.py 2013-03-25 12:07:37 UTC (rev 11262) +++ branches/rewrite/tests/site_tests.py 2013-03-25 12:09:14 UTC (rev 11263) @@ -530,7 +530,7 @@ for using in mysite.imageusage(imagepage, filterredir=True, total=5): self.assertType(using, pywikibot.Page) self.assertTrue(using.isRedirectPage()) - for using in mysite.imageusage(imagepage, filterredir=True, total=5): + for using in mysite.imageusage(imagepage, filterredir=False, total=5): self.assertType(using, pywikibot.Page) self.assertFalse(using.isRedirectPage()) @@ -539,35 +539,33 @@ le = list(mysite.logevents(total=10)) self.assertTrue(len(le) <= 10) - self.assertTrue(all(isinstance(entry, dict) and "type" in entry + self.assertTrue(all(isinstance(entry, pywikibot.data.logentries.LogEntry) for entry in le)) for typ in ("block", "protect", "rights", "delete", "upload", "move", "import", "patrol", "merge"): for entry in mysite.logevents(logtype=typ, total=3): - self.assertEqual(entry["type"], typ) + self.assertEqual(entry.type(), typ) for entry in mysite.logevents(page=mainpage, total=3): - self.assertTrue("title" in entry - and entry["title"] == mainpage.title()) + self.assertTrue(entry.title().title() == mainpage.title()) for entry in mysite.logevents(user=mysite.user(), total=3): - self.assertTrue("user" in entry - and entry["user"] == mysite.user()) + self.assertTrue(entry.user() == mysite.user()) for entry in mysite.logevents(start="2008-09-01T00:00:01Z", total=5): - self.assertType(entry, dict) - self.assertTrue(entry['timestamp'] <= "2008-09-01T00:00:01Z") + self.assertType(entry, pywikibot.data.logentries.LogEntry) + self.assertTrue(str(entry.timestamp()) <= "2008-09-01T00:00:01Z") for entry in mysite.logevents(end="2008-09-02T23:59:59Z", total=5): - self.assertType(entry, dict) - self.assertTrue(entry['timestamp'] >= "2008-09-02T23:59:59Z") + self.assertType(entry, pywikibot.data.logentries.LogEntry) + self.assertTrue(str(entry.timestamp()) >= "2008-09-02T23:59:59Z") for entry in mysite.logevents(start="2008-02-02T00:00:01Z", end="2008-02-02T23:59:59Z", reverse=True, total=5): - self.assertType(entry, dict) - self.assertTrue("2008-02-02T00:00:01Z" <= entry['timestamp'] + self.assertType(entry, pywikibot.data.logentries.LogEntry) + self.assertTrue("2008-02-02T00:00:01Z" <= str(entry.timestamp()) <= "2008-02-02T23:59:59Z") for entry in mysite.logevents(start="2008-02-03T23:59:59Z", end="2008-02-03T00:00:01Z", total=5): - self.assertType(entry, dict) - self.assertTrue("2008-02-03T00:00:01Z" <= entry['timestamp'] + self.assertType(entry, pywikibot.data.logentries.LogEntry) + self.assertTrue("2008-02-03T00:00:01Z" <= str(entry.timestamp()) <= "2008-02-03T23:59:59Z") # starttime earlier than endtime self.assertRaises(pywikibot.Error, mysite.logevents, @@ -629,12 +627,13 @@ prefix = title[ : title.index(":")] self.assertTrue(mysite.ns_index(prefix) in [6,7]) self.assertTrue(change["ns"] in [6,7]) - for change in mysite.recentchanges(pagelist=[mainpage, imagepage], - total=5): - self.assertType(change, dict) - self.assertTrue("title" in change) - self.assertTrue(change["title"] in (mainpage.title(), - imagepage.title())) + if mysite.versionnumber() <= 14: + for change in mysite.recentchanges(pagelist=[mainpage, imagepage], + total=5): + self.assertType(change, dict) + self.assertTrue("title" in change) + self.assertTrue(change["title"] in (mainpage.title(), + imagepage.title())) for typ in ("edit", "new", "log"): for change in mysite.recentchanges(changetype=typ, total=5): self.assertType(change, dict)

1 0

SVN: [11262] branches/rewrite/pywikibot/site.py
by legoktm＠svn.wikimedia.org 25 Mar '13

25 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11262 Revision: 11262 Author: legoktm Date: 2013-03-25 12:07:37 +0000 (Mon, 25 Mar 2013) Log Message: ----------- Re-implement showPatrolled option for site.recentchanges. Also reorganized imports and PEP8 fixes Modified Paths: -------------- branches/rewrite/pywikibot/site.py Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2013-03-25 12:04:03 UTC (rev 11261) +++ branches/rewrite/pywikibot/site.py 2013-03-25 12:07:37 UTC (rev 11262) @@ -10,19 +10,11 @@ # __version__ = '$Id$' -import pywikibot -from pywikibot import deprecate_arg -from pywikibot import config -from pywikibot import deprecated -from pywikibot import pagegenerators -from pywikibot.throttle import Throttle -from pywikibot.data import api -from pywikibot.exceptions import * - try: from hashlib import md5 except ImportError: from md5 import md5 +import itertools import os import re import sys @@ -31,11 +23,22 @@ import urllib import json +import pywikibot +from pywikibot import deprecate_arg +from pywikibot import config +from pywikibot import deprecated +from pywikibot import pagegenerators +from pywikibot.throttle import Throttle +from pywikibot.data import api +from pywikibot.exceptions import * + _logger = "wiki.site" + class PageInUse(pywikibot.Error): """Page cannot be reserved for writing due to existing lock.""" + class LoginStatus(object): """ Enum for Login statuses. @@ -1417,7 +1420,6 @@ filterRedirects=filterRedirects, namespaces=namespaces, content=content) - import itertools return itertools.chain(*genlist.values()) return blgen @@ -1459,7 +1461,6 @@ filterRedirects=filterRedirects, namespaces=namespaces, step=step, total=total, content=content) - import itertools return itertools.islice( itertools.chain( self.pagebacklinks( @@ -2199,9 +2200,7 @@ "recentchanges: start must be later than end with reverse=False") rcgen = self._generator(api.ListGenerator, type_arg="recentchanges", rcprop="user|comment|timestamp|title|ids" - "|sizes|redirect|loginfo" - #"|sizes|redirect|patrolled|loginfo" - patrol rights needed - "|flags", + "|sizes|redirect|loginfo|flags", namespaces=namespaces, step=step, total=total) if start is not None: @@ -2224,8 +2223,11 @@ filters = {'minor': showMinor, 'bot': showBot, 'anon': showAnon, - 'redirect': showRedirects,} - #'patrolled': showPatrolled} + 'redirect': showRedirects, + } + if self.has_right('patrol'): + rcgen.request['rcprop'] += '|patrolled' + filters['patrolled'] = showPatrolled rcshow = [] for item in filters: if filters[item] is not None:

1 0

← Newer
1
2
3
4
5
6
7
8
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn March 2013