Pywikibot-commits August 2015

pywikibot-commits@lists.wikimedia.org

2 participants
240 discussions

[Gerrit] WIP: Replacing old Bugzilla tickets with Phab. - change (pywikibot/core)
by MarcoAurelio (Code Review) 10 Jan '16

10 Jan '16

Hello PywikibotCommitWatcher, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/234734 to review the following change. Change subject: WIP: Replacing old Bugzilla tickets with Phab. ...................................................................... WIP: Replacing old Bugzilla tickets with Phab. A request was made to modify pywiki files with old references to bugzilla tickets to phabricator ones. In the cases where the ticket was linked via URL, I've not performed any change as those links still work as a redirect. In those cases where the ticket was simply a number reference, I updated it adding 2,000 to the ticket number and adding a 'T' before the number, so it's clear it's a Phabricator task. I tag this as work in progress because the files have changed since the ticket was opened and I don't know whether further files will need amendment. Bug: T94683 Change-Id: Ib775bfdbc96311ccb09ad9a1ee77b9970c09fd43 --- M pywikibot/data/api.py M pywikibot/exceptions.py M pywikibot/login.py M pywikibot/page.py M pywikibot/pagegenerators.py M pywikibot/site.py M pywikibot/textlib.py M scripts/blockpageschecker.py M scripts/reflinks.py M scripts/unusedfiles.py M tests/archivebot_tests.py M tests/script_tests.py M tests/site_tests.py 13 files changed, 27 insertions(+), 27 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/34/234734/1 diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index c85f851..dd7f555 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -1782,7 +1782,7 @@ def _is_wikibase_error_retryable(self, error): ERR_MSG = u'edit-already-exists' messages = error.pop("messages", None) - # bug 66619, after gerrit 124323 breaking change we have a + # bug 66619 (T68619), after gerrit 124323 breaking change we have a # list of messages if isinstance(messages, list): for item in messages: @@ -1861,7 +1861,7 @@ if '*' in warning: text = warning['*'] elif 'html' in warning: - # Bugzilla 49978 + # Phabricator T51978 text = warning['html']['*'] else: pywikibot.warning( @@ -2051,9 +2051,9 @@ del error['code'] # is added via class_name e = APIMWException(class_name, **error) - retry = class_name in ['DBConnectionError', # bug 62974 - 'DBQueryError', # bug 58158 - 'ReadOnlyError' # bug 59227 + retry = class_name in ['DBConnectionError', # T64974 + 'DBQueryError', # T60158 + 'ReadOnlyError' # T61227 ] pywikibot.error("Detected MediaWiki API exception %s%s" @@ -2078,8 +2078,8 @@ raise e - # bugs 46535, 62126, 64494, 66619 - # maybe removed when it 46535 is solved + # Phab. tickets T48535, T64126, T68494, T68619 + # maybe removed when T48535 is solved if code == "failed-save" and \ self.action == 'wbeditentity' and \ self._is_wikibase_error_retryable(result["error"]): @@ -2651,7 +2651,7 @@ # self.resultkey in data in last request.submit() new_limit = min(self.query_limit, self.limit - count) else: - # only "(query-)continue" returned. See Bug 72209. + # only "(query-)continue" returned. See Bug T74209. # increase new_limit to advance faster until new # useful data are found again. new_limit = min(new_limit * 2, self.query_limit) diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index a8a8beb..1e79596 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -290,7 +290,7 @@ """ Page is a redirect to another site. - This is considered invalid in Pywikibot. See Bug 73184. + This is considered invalid in Pywikibot. See Bug T75184. """ diff --git a/pywikibot/login.py b/pywikibot/login.py index ac37803..26a07db 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -283,7 +283,7 @@ elif e.code == 'Illegal': raise NoUsername(u"Username '%s' is invalid on %s" % (self.username, self.site)) - # TODO: investigate other unhandled API codes (bug 73539) + # TODO: investigate other unhandled API codes (bug 75539) if retry: self.password = None return self.login(retry=True) diff --git a/pywikibot/page.py b/pywikibot/page.py index 890796a..eb8eb9d 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -540,7 +540,7 @@ @return: dict """ if not hasattr(self, '_pageprops') or force: - self._pageprops = {} # page may not have pageprops (see bug 54868) + self._pageprops = {} # page may not have pageprops (see bug T56868) self.site.loadpageprops(self) return self._pageprops @@ -1402,7 +1402,7 @@ @return: a generator that yields Category objects. """ - # FIXME: bug 73561: withSortKey is ignored by Site.pagecategories + # FIXME: bug T75561: withSortKey is ignored by Site.pagecategories if withSortKey: raise NotImplementedError('withSortKey is not implemented') @@ -3314,7 +3314,7 @@ self.labels = {} if 'labels' in self._content: for lang in self._content['labels']: - if 'removed' not in self._content['labels'][lang]: # Bug 54767 + if 'removed' not in self._content['labels'][lang]: # Bug T56767 self.labels[lang] = self._content['labels'][lang]['value'] # descriptions diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 3afe643..3ed516f 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -684,7 +684,7 @@ u'How many images do you want to load?') gen = NewimagesPageGenerator(total=int(limit), site=self.site) elif arg.startswith('-newpages'): - # partial workaround for bug 67249 + # partial workaround for bug T69249 # to use -namespace/ns with -newpages, -ns must be given # before -newpages # otherwise default namespace is 0 diff --git a/pywikibot/site.py b/pywikibot/site.py index 3f3fe9f..098ec65 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2727,7 +2727,7 @@ def page_isredirect(self, page): """Return True if and only if page is a redirect.""" if not hasattr(page, "_isredir"): - page._isredir = False # bug 54684 + page._isredir = False # bug T56684 self.loadpageinfo(page) return page._isredir @@ -5297,7 +5297,7 @@ comment=comment, text=text, filekey=_file_key) elif source_filename: - # TODO: Dummy value to allow also Unicode names, see bug 73661 + # TODO: Dummy value to allow also Unicode names, see bug T75661 mime_filename = 'FAKE-NAME' # upload local file # make sure file actually exists diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index bd7adbd..4bd66b6 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -300,7 +300,7 @@ # We cannot just insert the new string, as it may contain regex # group references such as \2 or \g<name>. # On the other hand, this approach does not work because it - # can't handle lookahead or lookbehind (see bug #1731008): + # can't handle lookahead or lookbehind (see bug #1731008)(bug not found): # # replacement = old.sub(new, text[match.start():match.end()]) # text = text[:match.start()] + replacement + text[match.end():] @@ -1726,7 +1726,7 @@ if m: marker = self.findmarker(txt) - # month and day format might be identical (e.g. see bug 69315), + # month and day format might be identical (e.g. see bug T71315), # avoid to wipe out day, after month is matched. # replace all matches but the last two # (i.e. allow to search for dd. mm.) diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py index c4ca412..f00a2ea 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -297,7 +297,7 @@ continue # FIXME: This check does not work : # PreloadingGenerator cannot set correctly page.editRestriction - # (see bug 55322) + # (see bug T57322) # if not page.canBeEdited(): # pywikibot.output("%s is sysop-protected : this account can't edit " # "it! Skipping..." % pagename) diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 6b3978f..a0c4ed0 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -710,7 +710,7 @@ if 'utf-8' not in enc: enc.append('utf-8') try: - u = linkedpagetext.decode(enc[0]) # Bug 67410 + u = linkedpagetext.decode(enc[0]) # Bug T69410 except (UnicodeDecodeError, LookupError) as e: pywikibot.output(u'%s : Decoding error - %s' % (ref.link, e)) continue diff --git a/scripts/unusedfiles.py b/scripts/unusedfiles.py index 30140aa..26f62dd 100755 --- a/scripts/unusedfiles.py +++ b/scripts/unusedfiles.py @@ -68,7 +68,7 @@ generator = pagegenerators.PreloadingGenerator(generator) for image in generator: if not image.exists(): - pywikibot.output(u"File '%s' does not exist (see bug 69133)." + pywikibot.output(u"File '%s' does not exist (see bug T71133)." % image.title()) continue # Use fileUrl() and fileIsShared() to confirm it is local media diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py index 819faf1..1e99b1e 100644 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -43,7 +43,7 @@ def test_archivebot(self, code=None): """Test archivebot for one site.""" site = self.get_site(code) - if code != 'de': # bug 67663 + if code != 'de': # bug T69663 page = pywikibot.Page(site, 'user talk:xqt') else: page = pywikibot.Page(site, 'user talk:ladsgroup') diff --git a/tests/script_tests.py b/tests/script_tests.py index 3fd9596..0b4f43d 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -126,7 +126,7 @@ # and not backtraces starting deep in the pywikibot package. no_args_expected_results = { # TODO: until done here, remember to set editor = None in user_config.py - 'editarticle': 'Nothing changed', # This masks related bug 68645 but that + 'editarticle': 'Nothing changed', # This masks related bug T70645 but that # bug is more broadly about config # rather than editarticle. 'freebasemappingupload': 'Cannot find ', @@ -139,7 +139,7 @@ 'replace': 'Press Enter to use this automatic message', 'script_wui': 'Pre-loading all relevant page contents', 'shell': ('>>> ', 'Welcome to the'), - 'transferbot': 'Target site not different from source site', # Bug 68662 + 'transferbot': 'Target site not different from source site', # Bug T70662 'unusedfiles': ('Working on', None), 'watchlist': 'Retrieving watchlist', diff --git a/tests/site_tests.py b/tests/site_tests.py index 5b23525..12c9a17 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -605,7 +605,7 @@ for cat in mysite.allcategories(total=5, prefix="Def"): self.assertIsInstance(cat, pywikibot.Category) self.assertTrue(cat.title(withNamespace=False).startswith("Def")) - # Bug # 15985 - reverse and start combined; fixed in v 1.14 + # Bug # T17985 - reverse and start combined; fixed in v 1.14 for cat in mysite.allcategories(total=5, start="Hij", reverse=True): self.assertIsInstance(cat, pywikibot.Category) self.assertLessEqual(cat.title(withNamespace=False), "Hij") @@ -664,7 +664,7 @@ self.assertIsInstance(impage, pywikibot.FilePage) self.assertTrue(mysite.page_exists(impage)) self.assertGreaterEqual(impage.title(withNamespace=False), "Ba") - # Bug # 15985 - reverse and start combined; fixed in v 1.14 + # Bug # T17985 - reverse and start combined; fixed in v 1.14 for impage in mysite.allimages(start="Da", reverse=True, total=5): self.assertIsInstance(impage, pywikibot.FilePage) self.assertTrue(mysite.page_exists(impage)) @@ -922,7 +922,7 @@ self.assertIsInstance(using, pywikibot.Page) if using.isRedirectPage(): print('{0} is a redirect, although just non-redirects were ' - 'searched. See also bug 73120'.format(using)) + 'searched. See also bug T75120'.format(using)) self.assertFalse(using.isRedirectPage()) -- To view, visit https://gerrit.wikimedia.org/r/234734 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib775bfdbc96311ccb09ad9a1ee77b9970c09fd43 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: MarcoAurelio <strigiwm(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: PywikibotCommitWatcher <pywikibot-commits(a)lists.wikimedia.org> Gerrit-Reviewer: jenkins-bot <>

5 21

Errored: wikimedia/pywikibot-core#2753 (master - 5c4601a)
by Travis CI 31 Aug '15

31 Aug '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2753 Status: Errored Duration: 38 minutes and 5 seconds Commit: 5c4601a (master) Author: jenkins-bot Message: Merge "Deprecate BaseSite.*_namespace()" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/5f4eabe94c65...5c4601a1… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/78087106 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Deprecate BaseSite.*_namespace() - change (pywikibot/core)
by jenkins-bot (Code Review) 31 Aug '15

31 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: Deprecate BaseSite.*_namespace() ...................................................................... Deprecate BaseSite.*_namespace() Add NamespacesDict.builtin_namespaces() and key lookup by string. Change-Id: I2fde4d6e755f227ef20f345ee74be8fc0eff5b16 --- M pywikibot/page.py M pywikibot/site.py M pywikibot/textlib.py M scripts/catall.py M scripts/image.py M scripts/imagetransfer.py M scripts/makecat.py M scripts/noreferences.py M scripts/templatecount.py M tests/namespace_tests.py 10 files changed, 139 insertions(+), 16 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 890796a..45110ef 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2528,7 +2528,7 @@ # move to category.py? (Although it doesn't seem to be used there, # either) if not isinstance(cat, Category): - cat = self.site.category_namespace() + ':' + cat + cat = self.site.namespaces.CATEGORY + ':' + cat targetCat = Category(self.site, cat) else: targetCat = cat @@ -2569,7 +2569,7 @@ """ # I don't see why we need this as part of the framework either # move to scripts/category.py? - catname = self.site.category_namespace() + ':' + catname + catname = self.site.namespaces.CATEGORY + ':' + catname targetCat = Category(self.site, catname) if targetCat.exists(): pywikibot.warning(u'Target page %s already exists!' diff --git a/pywikibot/site.py b/pywikibot/site.py index 3f3fe9f..c4b28eb 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -152,6 +152,25 @@ properties will have the same value. """ + MEDIA = -2 + SPECIAL = -1 + MAIN = 0 + TALK = 1 + USER = 2 + USER_TALK = 3 + PROJECT = 4 + PROJECT_TALK = 5 + FILE = 6 + FILE_TALK = 7 + MEDIAWIKI = 8 + MEDIAWIKI_TALK = 9 + TEMPLATE = 10 + TEMPLATE_TALK = 11 + HELP = 12 + HELP_TALK = 13 + CATEGORY = 14 + CATEGORY_TALK = 15 + # These are the MediaWiki built-in names for MW 1.14+. # Namespace prefixes are always case-insensitive, but the # canonical forms are capitalized. @@ -478,9 +497,41 @@ """Iterate over all namespaces.""" return iter(self._namespaces) - def __getitem__(self, number): - """Get the namespace with the given number.""" - return self._namespaces[number] + def __getitem__(self, key): + """ + Get the namespace with the given key. + + @param key: namespace key + @type key: Namespace, int or str + @rtype: Namespace + """ + if isinstance(key, (Namespace, int)): + return self._namespaces[key] + else: + namespace = self.lookup_name(key) + if namespace: + return namespace + + return super(NamespacesDict, self).__getitem__(key) + + def __getattr__(self, attr): + """ + Get the namespace with the given key. + + @param key: namespace key + @type key: Namespace, int or str + @rtype: Namespace + """ + # lookup_name access _namespaces + if attr.isupper(): + if attr == 'MAIN': + return self[0] + + namespace = self.lookup_name(attr) + if namespace: + return namespace + + return self.__getattribute__(attr) def __len__(self): """Get the number of namespaces.""" @@ -1035,26 +1086,32 @@ # namespace shortcuts for backwards-compatibility + @deprecated('namespaces.SPECIAL') def special_namespace(self): """Return local name for the Special: namespace.""" return self.namespace(-1) + @deprecated('namespaces.FILE') def image_namespace(self): """Return local name for the File namespace.""" return self.namespace(6) + @deprecated('namespaces.MEDIAWIKI') def mediawiki_namespace(self): """Return local name for the MediaWiki namespace.""" return self.namespace(8) + @deprecated('namespaces.TEMPLATE') def template_namespace(self): """Return local name for the Template namespace.""" return self.namespace(10) + @deprecated('namespaces.CATEGORY') def category_namespace(self): """Return local name for the Category namespace.""" return self.namespace(14) + @deprecated('list(namespaces.CATEGORY)') def category_namespaces(self): """Return names for the Category namespace.""" return self.namespace(14, all=True) diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index bd7adbd..7cefc3d 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -993,7 +993,7 @@ # Ignore category links within nowiki tags, pre tags, includeonly tags, # and HTML comments text = removeDisabledParts(text, include=include) - catNamespace = '|'.join(site.category_namespaces()) + catNamespace = '|'.join(site.namespaces.CATEGORY) R = re.compile(r'\[\[\s*(?P<namespace>%s)\s*:\s*(?P<rest>.+?)\]\]' % catNamespace, re.I) for match in R.finditer(text): @@ -1025,7 +1025,7 @@ # ASCII letters and hyphens. if site is None: site = pywikibot.Site() - catNamespace = '|'.join(site.category_namespaces()) + catNamespace = '|'.join(site.namespaces.CATEGORY) categoryR = re.compile(r'\[\[\s*(%s)\s*:.*?\]\]\s*' % catNamespace, re.I) text = replaceExcept(text, categoryR, '', ['nowiki', 'comment', 'math', 'pre', 'source', 'includeonly'], @@ -1070,7 +1070,7 @@ if site is None: site = pywikibot.Site() - catNamespace = '|'.join(site.category_namespaces()) + catNamespace = '|'.join(site.namespaces.CATEGORY) title = oldcat.title(withNamespace=False) if not title: return diff --git a/scripts/catall.py b/scripts/catall.py index f2042ef..0e525f9 100755 --- a/scripts/catall.py +++ b/scripts/catall.py @@ -75,7 +75,7 @@ site = pywikibot.Site() pllist = [] for p in list: - cattitle = "%s:%s" % (site.category_namespace(), p) + cattitle = "%s:%s" % (site.namespaces.CATEGORY, p) pllist.append(pywikibot.Page(site, cattitle)) page.put_async(textlib.replaceCategoryLinks(page.get(), pllist, site=page.site), diff --git a/scripts/image.py b/scripts/image.py index de8cd3b..f780856 100755 --- a/scripts/image.py +++ b/scripts/image.py @@ -160,7 +160,7 @@ if not self.getOption('loose'): replacements.append((image_regex, u'[[%s:%s\\g<parameters>]]' - % (self.site.image_namespace(), + % (self.site.namespaces.FILE, self.new_image))) else: replacements.append((image_regex, self.new_image)) diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py index 700de25..670c809 100755 --- a/scripts/imagetransfer.py +++ b/scripts/imagetransfer.py @@ -246,7 +246,7 @@ # to upload anyway, using another name. try: # Maybe the image is on the target site already - targetTitle = '%s:%s' % (self.targetSite.image_namespace(), + targetTitle = '%s:%s' % (self.targetSite.namespaces.FILE, image.title().split(':', 1)[1]) targetImage = pywikibot.Page(self.targetSite, targetTitle) targetImage.get() diff --git a/scripts/makecat.py b/scripts/makecat.py index 88d8ce0..bf158ff 100755 --- a/scripts/makecat.py +++ b/scripts/makecat.py @@ -211,7 +211,7 @@ pywikibot.setAction(i18n.twtranslate(mysite, 'makecat-create', {'cat': workingcatname})) workingcat = pywikibot.Category(mysite, u'%s:%s' - % (mysite.category_namespace(), + % (mysite.namespaces.CATEGORY, workingcatname)) filename = pywikibot.config.datafilepath( 'category', workingcatname.encode('ascii', 'xmlcharrefreplace') + '_exclude.txt') diff --git a/scripts/noreferences.py b/scripts/noreferences.py index df65e8c..cc603e6 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -608,7 +608,7 @@ # keep removing interwiki links, templates etc. from the bottom. # At the end, look at the length of the temp text. That's the position # where we'll insert the references section. - catNamespaces = '|'.join(self.site.category_namespaces()) + catNamespaces = '|'.join(self.site.namespaces.CATEGORY) categoryPattern = r'\[\[\s*(%s)\s*:[^\n]*\]\]\s*' % catNamespaces interwikiPattern = r'\[\[([a-zA-Z\-]+)\s?:([^\[\]\n]*)\]\]\s*' # won't work with nested templates @@ -730,7 +730,7 @@ pass else: cat = pywikibot.Category(site, "%s:%s" % ( - site.category_namespace(), cat)) + site.namespaces.CATEGORY, cat)) gen = cat.articles(namespaces=genFactory.namespaces or [0]) if gen: bot = NoReferencesBot(gen, **options) diff --git a/scripts/templatecount.py b/scripts/templatecount.py index a4f9585..5e9bc34 100755 --- a/scripts/templatecount.py +++ b/scripts/templatecount.py @@ -98,7 +98,7 @@ mysite = pywikibot.Site() # The names of the templates are the keys, and lists of pages # transcluding templates are the values. - mytpl = mysite.namespaces.lookup_name(mysite.template_namespace()) + mytpl = mysite.namespaces.TEMPLATE for template in templates: transcludingArray = [] gen = pywikibot.Page(mysite, template, ns=mytpl).getReferences( diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py index 024ba7f..9d9c6a6 100644 --- a/tests/namespace_tests.py +++ b/tests/namespace_tests.py @@ -10,7 +10,7 @@ __version__ = '$Id$' from collections import Iterable -from pywikibot.site import Namespace +from pywikibot.site import Namespace, NamespacesDict from tests.aspects import unittest, TestCase, AutoDeprecationTestCase import sys @@ -44,6 +44,11 @@ file_builtin_ns['File'] = 6 file_builtin_ns['File talk'] = 7 builtin_ns = dict(list(image_builtin_ns.items()) + list(file_builtin_ns.items())) + + +def builtin_NamespacesDict(): + """Return a NamespacesDict of the builtin namespaces.""" + return NamespacesDict(Namespace.builtin_namespaces()) class TestNamespaceObject(TestCase): @@ -331,6 +336,67 @@ len(positive_namespaces) + len(excluded_namespaces)) +class TestNamespacesDictGetItem(TestCase): + + """Test NamespacesDict.__getitem__.""" + + net = False + + def test_ids(self): + """Test lookup by canonical namespace id.""" + namespaces = builtin_NamespacesDict() + for namespace in namespaces.values(): + self.assertEqual(namespace, namespaces[namespace.id]) + + def test_namespace(self): + """Test lookup by Namespace object.""" + namespaces = builtin_NamespacesDict() + for namespace in namespaces.values(): + self.assertEqual(namespace, namespaces[namespace]) + + def test_invalid_id(self): + """Test lookup by invalid id.""" + namespaces = builtin_NamespacesDict() + lower = min(namespaces.keys()) - 1 + higher = max(namespaces.keys()) + 1 + self.assertRaises(KeyError, namespaces.__getitem__, lower) + self.assertRaises(KeyError, namespaces.__getitem__, higher) + + def test_canonical_name(self): + """Test lookup by canonical namespace name.""" + namespaces = builtin_NamespacesDict() + for namespace in namespaces.values(): + self.assertEqual(namespace, namespaces[namespace.canonical_name]) + self.assertEqual(namespace, + namespaces[namespace.canonical_name.upper()]) + + def test_canonical_attr(self): + """Test attribute lookup by canonical namespace name.""" + namespaces = builtin_NamespacesDict() + self.assertEqual(namespaces[0], namespaces.MAIN) + self.assertEqual(namespaces[1], namespaces.TALK) + + for namespace in namespaces.values(): + if namespace.id == 0: + continue + attr = namespace.canonical_name.upper() + self.assertEqual(namespace, getattr(namespaces, attr)) + + def test_all(self): + """Test lookup by any namespace name.""" + namespaces = builtin_NamespacesDict() + for namespace in namespaces.values(): + for name in namespace: + self.assertEqual(namespace, namespaces[name.upper()]) + + def test_invalid_name(self): + """Test lookup by invalid name.""" + namespaces = builtin_NamespacesDict() + self.assertRaises(KeyError, namespaces.__getitem__, 'FOO') + # '|' is not permitted in namespace names + self.assertRaises(KeyError, namespaces.__getitem__, '|') + + if __name__ == '__main__': try: unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/234728 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2fde4d6e755f227ef20f345ee74be8fc0eff5b16 Gerrit-PatchSet: 8 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#2752 (2.0 - c7a1a5f)
by Travis CI 31 Aug '15

31 Aug '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2752 Status: Errored Duration: 23 minutes and 7 seconds Commit: c7a1a5f (2.0) Author: John Vandenberg Message: Remove testing against nightly Branch 2.0 doesn't need regular testing against Python nightly. Change-Id: If38e2184bcd16bb3c3f8500015fb90398b4a6926 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/4276ad39f8f7...c7a1a5f0… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/78050532 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Remove testing against nightly - change (pywikibot/core)
by jenkins-bot (Code Review) 31 Aug '15

31 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: Remove testing against nightly ...................................................................... Remove testing against nightly Branch 2.0 doesn't need regular testing against Python nightly. Change-Id: If38e2184bcd16bb3c3f8500015fb90398b4a6926 --- M .travis.yml 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 40289f8..3d29a88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,8 +91,6 @@ env: LANGUAGE=zh FAMILY=wikisource SITE_ONLY=1 EXTERNALS_HTTPLIB2=1 - python: '3.4' env: LANGUAGE=test FAMILY=wikidata SITE_ONLY=1 - - python: 'nightly' - env: LANGUAGE=ar FAMILY=wiktionary PYWIKIBOT2_TEST_NO_RC=1 - python: '2.6' env: LANGUAGE=wikidata FAMILY=wikidata SITE_ONLY=1 -- To view, visit https://gerrit.wikimedia.org/r/234950 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If38e2184bcd16bb3c3f8500015fb90398b4a6926 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: 2.0 Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Passed: wikimedia/pywikibot-core#2751 (master - 5f4eabe)
by Travis CI 31 Aug '15

31 Aug '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2751 Status: Passed Duration: 34 minutes and 54 seconds Commit: 5f4eabe (master) Author: Fabian Neundorf Message: [FIX] rollback: Use Revision instance properly The previous implementation assumed that the revisions are ordered by the id while they are in fact ordered by the timestamp. It also did iterate over the revision ids and not over the `Revision` instance which caused the loop to fail. Now `APISite.rollbackpage` also requires the user to be logged in. Change-Id: I280a4781f0f293e09dd94e14007f49cee30f60e3 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/88bf47a9c3d7...5f4eabe9… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/78041830 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] [FIX] rollback: Use Revision instance properly - change (pywikibot/core)
by jenkins-bot (Code Review) 31 Aug '15

31 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] rollback: Use Revision instance properly ...................................................................... [FIX] rollback: Use Revision instance properly The previous implementation assumed that the revisions are ordered by the id while they are in fact ordered by the timestamp. It also did iterate over the revision ids and not over the `Revision` instance which caused the loop to fail. Now `APISite.rollbackpage` also requires the user to be logged in. Change-Id: I280a4781f0f293e09dd94e14007f49cee30f60e3 --- M pywikibot/site.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 1da4bc5..68bb399 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -4702,6 +4702,7 @@ "alreadyrolled": "Page [[%(title)s]] already rolled back; action aborted.", } # other errors shouldn't arise because we check for those errors + @must_be('user') def rollbackpage(self, page, **kwargs): """Roll back page to version before last user's edits. @@ -4720,7 +4721,8 @@ % page.title(asLink=True)) last_rev = page.latest_revision last_user = last_rev.user - for rev in sorted(list(page._revisions.keys()), reverse=True): + for rev in sorted(page._revisions.values(), reverse=True, + key=lambda r: r.timestamp): # start with most recent revision first if rev.user != last_user: break -- To view, visit https://gerrit.wikimedia.org/r/234988 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I280a4781f0f293e09dd94e14007f49cee30f60e3 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

Passed: wikimedia/pywikibot-core#2750 (master - 88bf47a)
by Travis CI 31 Aug '15

31 Aug '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2750 Status: Passed Duration: 36 minutes and 15 seconds Commit: 88bf47a (master) Author: jenkins-bot Message: Merge "Allow fromDBName from site" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/6344827d8d86...88bf47a9… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/78023213 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Allow fromDBName from site - change (pywikibot/core)
by jenkins-bot (Code Review) 31 Aug '15

31 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: Allow fromDBName from site ...................................................................... Allow fromDBName from site When meta.wikimedia.org has large lag times, testConstructors halts. Change-Id: I01a9864e5dc29f399b35ba21e7a90326d02acf61 --- M pywikibot/site.py M tests/site_tests.py 2 files changed, 24 insertions(+), 9 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index e50e8ae..1da4bc5 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -1654,9 +1654,20 @@ self.tokens = TokenWallet(self) @classmethod - def fromDBName(cls, dbname): + def fromDBName(cls, dbname, site=None): + """ + Create a site from a database name using the sitematrix. + + @param dbname: database name + @type dbname: str + @param site: Site to load sitematrix from. (Default meta.wikimedia.org) + @type site: APISite + @return: site object for the database name + @rtype: APISite + """ # TODO this only works for some WMF sites - site = pywikibot.Site('meta', 'meta') + if not site: + site = pywikibot.Site('meta', 'meta') req = site._request(expiry=datetime.timedelta(days=10), parameters={'action': 'sitematrix'}) data = req.submit() diff --git a/tests/site_tests.py b/tests/site_tests.py index 82d9e00..438e004 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -257,19 +257,23 @@ def testConstructors(self): """Test cases for site constructors.""" - self.assertEqual(pywikibot.site.APISite.fromDBName('enwiki'), + if isinstance(self.site.family, pywikibot.family.WikimediaFamily): + site = self.site + else: + site = None + self.assertEqual(pywikibot.site.APISite.fromDBName('enwiki', site), pywikibot.Site('en', 'wikipedia')) - self.assertEqual(pywikibot.site.APISite.fromDBName('eswikisource'), + self.assertEqual(pywikibot.site.APISite.fromDBName('eswikisource', site), pywikibot.Site('es', 'wikisource')) - self.assertEqual(pywikibot.site.APISite.fromDBName('dewikinews'), + self.assertEqual(pywikibot.site.APISite.fromDBName('dewikinews', site), pywikibot.Site('de', 'wikinews')) - self.assertEqual(pywikibot.site.APISite.fromDBName('ukwikivoyage'), + self.assertEqual(pywikibot.site.APISite.fromDBName('ukwikivoyage', site), pywikibot.Site('uk', 'wikivoyage')) - self.assertEqual(pywikibot.site.APISite.fromDBName('metawiki'), + self.assertEqual(pywikibot.site.APISite.fromDBName('metawiki', site), pywikibot.Site('meta', 'meta')) - self.assertEqual(pywikibot.site.APISite.fromDBName('commonswiki'), + self.assertEqual(pywikibot.site.APISite.fromDBName('commonswiki', site), pywikibot.Site('commons', 'commons')) - self.assertEqual(pywikibot.site.APISite.fromDBName('wikidatawiki'), + self.assertEqual(pywikibot.site.APISite.fromDBName('wikidatawiki', site), pywikibot.Site('wikidata', 'wikidata')) def testLanguageMethods(self): -- To view, visit https://gerrit.wikimedia.org/r/234722 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01a9864e5dc29f399b35ba21e7a90326d02acf61 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Fixed: wikimedia/pywikibot-core#2749 (master - 6344827)
by Travis CI 31 Aug '15

31 Aug '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2749 Status: Fixed Duration: 33 minutes and 39 seconds Commit: 6344827 (master) Author: John Vandenberg Message: Skip sites that timeout Change-Id: I2e7cc972f262b281e65f56cf48c4ecd8148d1f4f View the changeset: https://github.com/wikimedia/pywikibot-core/compare/b6a6c0fd3a8c...6344827d… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/78015014 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2015