jenkins-bot has submitted this change and it was merged. Change subject: Replacing references from Bugzilla to Phabricator ...................................................................... Replacing references from Bugzilla to Phabricator Also replace an old sf.net bug ID with a new Phabricator ID. Remove mention of two closed bugs in script_tests. Bug: T94683 Change-Id: Ib775bfdbc96311ccb09ad9a1ee77b9970c09fd43 --- M pwb.py M pywikibot/cosmetic_changes.py M pywikibot/data/api.py M pywikibot/exceptions.py M pywikibot/logentries.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 16 files changed, 31 insertions(+), 36 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 81ecb85..fdd6fd4 100755 --- a/pwb.py +++ b/pwb.py @@ -178,7 +178,7 @@ try: # If successful, user-config.py already exists in one of the candidate # directories. See config2.py for details on search order. - # Use env var to communicate to config2.py pwb.py location (bug 72918). + # Use env var to communicate to config2.py pwb.py location (bug T74918). _pwb_dir = os.path.split(__file__)[0] if sys.platform == 'win32' and sys.version_info[0] < 3: _pwb_dir = str(_pwb_dir) diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index f466b89..7fa1f07 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -430,7 +430,7 @@ assert u'Kép' in namespaces namespaces.remove(u'Kép') elif self.site.code == 'pt': - # bug 55242 should be implemented + # TODO: bug T57242 continue # lowerspaced and underscored namespaces for i in range(len(namespaces)): @@ -615,7 +615,7 @@ def resolveHtmlEntities(self, text): ignore = [ 38, # Ampersand (&amp;) - 39, # Single quotation mark (&quot;) - Bugzilla 24093 + 39, # Single quotation mark (&quot;) - bug T26093 60, # Less than (&lt;) 62, # Great than (&gt;) 91, # Opening square bracket ([) diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 8723021..c6f2f0c 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -1789,7 +1789,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 T68619; after Wikibase breaking change 1ca9cee change we have a # list of messages if isinstance(messages, list): for item in messages: @@ -1868,7 +1868,7 @@ if '*' in warning: text = warning['*'] elif 'html' in warning: - # Bugzilla 49978 + # bug T51978 text = warning['html']['*'] else: pywikibot.warning( @@ -2089,9 +2089,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" @@ -2116,8 +2116,7 @@ raise e - # bugs 46535, 62126, 64494, 66619 - # maybe removed when it 46535 is solved + # Phab. tickets T48535, T64126, T68494, T68619 if code == "failed-save" and \ self.action == 'wbeditentity' and \ self._is_wikibase_error_retryable(result["error"]): @@ -2692,7 +2691,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 f3624de..8c50c21 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -301,7 +301,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/logentries.py b/pywikibot/logentries.py index 5d013e5..a12715d 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -144,7 +144,7 @@ """Constructor.""" super(BlockEntry, self).__init__(apidata, site) # When an autoblock is removed, the "title" field is not a page title - # ( https://bugzilla.wikimedia.org/show_bug.cgi?id=17781 ) + # See bug T19781 pos = self.data['title'].find('#') self.isAutoblockRemoval = pos > 0 if self.isAutoblockRemoval: diff --git a/pywikibot/login.py b/pywikibot/login.py index b82512a..36e29e8 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 T75539) if retry: self.password = None return self.login(retry=True) diff --git a/pywikibot/page.py b/pywikibot/page.py index ac4c426..a532664 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -572,7 +572,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 @@ -1448,7 +1448,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') @@ -3364,7 +3364,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 860ea58..7ccf929 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -771,7 +771,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 810ab10..f35174a 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2984,7 +2984,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 @@ -3368,10 +3368,10 @@ namespaces=namespaces, step=step, total=total, g_content=content, **blargs) if followRedirects: - # bug: see https://bugzilla.wikimedia.org/show_bug.cgi?id=7304 # links identified by MediaWiki as redirects may not really be, # so we have to check each "redirect" page and see if it # really redirects to this page + # see fixed MediaWiki bug T9304 redirgen = self._generator(api.PageGenerator, type_arg="backlinks", gbltitle=bltitle, @@ -5753,7 +5753,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 throttle = True @@ -6904,9 +6904,7 @@ data = req.submit() # the IDs returned from the API can be upper or lowercase, depending - # on the version. See for more information: - # https://bugzilla.wikimedia.org/show_bug.cgi?id=53894 - # https://lists.wikimedia.org/pipermail/wikidata-tech/2013-September/000296.h… + # on the version. See bug T55894 for more information. try: dtype = data['entities'][prop.getID()]['datatype'] except KeyError: diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 8e73b56..d00fc37 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -308,7 +308,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 T123185): # # replacement = old.sub(new, text[match.start():match.end()]) # text = text[:match.start()] + replacement + text[match.end():] @@ -1777,7 +1777,7 @@ if m: marker = 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 73262ba..8c4f51a 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -300,7 +300,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 df99205..27a3702 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -682,7 +682,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 47c13da..3024a2a 100755 --- a/scripts/unusedfiles.py +++ b/scripts/unusedfiles.py @@ -58,7 +58,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("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 910cf9f..7f30fbd 100644 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -44,7 +44,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 090ebc1..68d394d 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -139,9 +139,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 - # bug is more broadly about config - # rather than editarticle. + 'editarticle': 'Nothing changed', 'freebasemappingupload': 'Cannot find ', 'harvest_template': 'ERROR: Please specify', 'imageuncat': 'WARNING: This script is primarily written for Wikimedia Commons', @@ -154,7 +152,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', 'unusedfiles': ('Working on', None), 'watchlist': 'Retrieving watchlist', diff --git a/tests/site_tests.py b/tests/site_tests.py index c3acec3..848b260 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -652,7 +652,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") @@ -711,7 +711,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)) -- To view, visit https://gerrit.wikimedia.org/r/234734 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib775bfdbc96311ccb09ad9a1ee77b9970c09fd43 Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: MarcoAurelio &lt;strigiwm(a)gmail.com&gt; Gerrit-Reviewer: 8ohit.dua &lt;8ohit.dua(a)gmail.com&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Ladsgroup &lt;ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: PywikibotCommitWatcher &lt;pywikibot-commits(a)lists.wikimedia.org&gt; Gerrit-Reviewer: XZise &lt;CommodoreFabianus(a)gmx.de&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: jenkins-bot <>