jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/610553 )

Change subject: Update URLs for new toolforge.org domain ......................................................................

Update URLs for new toolforge.org domain

All tools hosted on tools.wmflabs.org/$TOOL are now located at $TOOL.toolforge.org.

Change-Id: Ic91d51043d64b77ebe4e7f5ca847d3311b645e68 --- M pywikibot/__metadata__.py M pywikibot/config2.py M pywikibot/proofreadpage.py M scripts/imagecopy.py M scripts/wikisourcetext.py M tests/imagecopy_tests.py 6 files changed, 16 insertions(+), 16 deletions(-)

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified

diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 468a3fb..8eaf1f2 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -14,7 +14,7 @@ __maintainer_email__ = 'pywikibot@lists.wikimedia.org' __license__ = 'MIT License' __url__ = 'https://www.mediawiki.org/wiki/Manual:Pywikibot' -__download_url__ = 'https://tools.wmflabs.org/pywikibot/' +__download_url__ = 'https://pywikibot.toolforge.org/' __copyright__ = '(C) Pywikibot team, 2003-2020' __keywords__ = 'API bot client framework mediawiki pwb python pywiki ' \ 'pywikibase pywikibot pywikipedia pywikipediabot wiki ' \ diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 01dee15..c193e8f 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -706,7 +706,7 @@ db_connect_file = user_home_path('.my.cnf') # local port for mysql server # ssh -L 4711:enwiki.analytics.db.svc.eqiad.wmflabs:3306 \ -# user@login.tools.wmflabs.org +# user@login.toolforge.org db_port = 3306

# ############# SEARCH ENGINE SETTINGS ############## diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index ffbced8..3e27874 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -12,11 +12,11 @@

OCR support of page scans via: -- https://tools.wmflabs.org/phetools/hocr_cgi.py -- https://tools.wmflabs.org/phetools/ocr.php +- https://phetools.toolforge.org/hocr_cgi.py +- https://phetools.toolforge.org/ocr.php - inspired by https://en.wikisource.org/wiki/MediaWiki:Gadget-ocr.js

-- https://tools.wmflabs.org/ws-google-ocr/ +- https://ws-google-ocr.toolforge.org/ - inspired by https://wikisource.org/wiki/MediaWiki:GoogleOCR.js - see also: https://wikisource.org/wiki/Wikisource:Google_OCR

@@ -129,14 +129,14 @@ p_close_no_div = re.compile('</noinclude>') # V2 page format.

# phetools ocr utility - _HOCR_CMD = ('https://tools.wmflabs.org/phetools/hocr_cgi.py?' + _HOCR_CMD = ('https://phetools.toolforge.org/hocr_cgi.py?' 'cmd=hocr&book={book}&lang={lang}&user={user}')

- _OCR_CMD = ('https://tools.wmflabs.org/phetools/ocr.php?' + _OCR_CMD = ('https://phetools.toolforge.org/ocr.php?' 'cmd=ocr&url={url_image}&lang={lang}&user={user}')

# googleOCR ocr utility - _GOCR_CMD = ('https://tools.wmflabs.org/ws-google-ocr/api.php?' + _GOCR_CMD = ('https://ws-google-ocr.toolforge.org/api.php?' 'image={url_image}&lang={lang}')

_MULTI_PAGE_EXT = ['djvu', 'pdf'] @@ -643,7 +643,7 @@ return (error, parser_func(_text))

def _do_hocr(self): - """Do hocr using //tools.wmflabs.org/phetools/hocr_cgi.py?cmd=hocr. + """Do hocr using https://phetools.toolforge.org/hocr_cgi.py?cmd=hocr.

This is the main method for 'phetools'. Fallback method is ocr. diff --git a/scripts/imagecopy.py b/scripts/imagecopy.py index 9f1a728..e82a8e1 100644 --- a/scripts/imagecopy.py +++ b/scripts/imagecopy.py @@ -219,7 +219,7 @@ while not gotInfo: try: commonsHelperPage = fetch( - 'https://tools.wmflabs.org/commonshelper/', + 'https://commonshelper.toolforge.org/', method='POST', data=parameters) data = commonsHelperPage.data.content.decode('utf-8') @@ -257,7 +257,7 @@ }

pywikibot.output(tosend) - CH = pageTextPost('http://tools.wmflabs.org/commonshelper/index.php', + CH = pageTextPost('https://commonshelper.toolforge.org/index.php', tosend) pywikibot.output('Got CH desc.')

diff --git a/scripts/wikisourcetext.py b/scripts/wikisourcetext.py index 6d16ee6..e496d9f 100644 --- a/scripts/wikisourcetext.py +++ b/scripts/wikisourcetext.py @@ -10,7 +10,7 @@ of the file, as long as it is supported by the MW ProofreadPage extension.

As alternative, if '-ocr' option is selected, -https://tools.wmflabs.org/phetools OCR tool will be used to get text. +https://phetools.toolforge.org/ OCR tool will be used to get text. In this case, also already existing pages with quality value 'Not Proofread' can be treated. '-force' will override existing page in this case.

@@ -33,14 +33,14 @@ -showdiff: show difference between current text and new text when saving the page.

- -ocr: use OCR tools hosted on https://tools.wmflabs.org. + -ocr: use OCR tools hosted on https://toolforge.org. By default no OCR is done, i.e. only not-(yet)-existing pages in Page ns will be treated and text will be fetched via preload. If -ocr is provided, default OCR method is: - - https://tools.wmflabs.org/phetools + - https://phetools.toolforge.org/ If ocr:googleOCR is given, OCR method is: - - https://tools.wmflabs.org/ws-google-ocr + - https://ws-google-ocr.toolforge.org/

-threads:n number of threads used to fetch OCR from OCR tools. default is 5; valid only if '-ocr' is selected. diff --git a/tests/imagecopy_tests.py b/tests/imagecopy_tests.py index 90b865f..09a2def 100644 --- a/tests/imagecopy_tests.py +++ b/tests/imagecopy_tests.py @@ -18,7 +18,7 @@ class CommonsHelperMethodTest(TestCase): """Test CommonsHelper methods in imagecopy."""

- hostname = 'https://tools.wmflabs.org/commonshelper/' + hostname = 'https://commonshelper.toolforge.org/'

@unittest.expectedFailure # T207579 def test_pageTextPost(self):