Pywikibot-commits August 2014

pywikibot-commits@lists.wikimedia.org

1 participants
196 discussions

[Gerrit] Class hierarchy, marking tests not using Site - change (pywikibot/core)
by jenkins-bot (Code Review) 05 Aug '14

05 Aug '14

jenkins-bot has submitted this change and it was merged. Change subject: Class hierarchy, marking tests not using Site ...................................................................... Class hierarchy, marking tests not using Site Move alls tests under BaseTestCase, which has subclasses NoSiteTestCase and SiteTestCase to split the test suite into tests that require a valid site and those that do not. Tests the subclass NoSiteTestCase are prevented from invoking pywikibot.Site, and may be run as a subset of the test suite using: $ nosetests -a '!site' Change-Id: I6ee69f5b4e594a111d91bc0bafb59716900b478c --- M tests/api_tests.py M tests/date_tests.py M tests/dry_api_tests.py M tests/dry_site_tests.py M tests/http_tests.py M tests/i18n_tests.py M tests/ipregex_tests.py M tests/pwb_tests.py M tests/utils.py M tests/weblib_tests.py M tests/xmlreader_tests.py M tox.ini 12 files changed, 122 insertions(+), 42 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/api_tests.py b/tests/api_tests.py index ec3a454..8bf9e1a 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -9,12 +9,13 @@ import datetime import pywikibot import pywikibot.data.api as api -from tests.utils import PywikibotTestCase, unittest +from tests.utils import unittest +from tests.utils import SiteTestCase, NoSiteTestCase, CachedTestCase mysite = pywikibot.Site('en', 'wikipedia') -class TestApiFunctions(PywikibotTestCase): +class TestApiFunctions(CachedTestCase): def testObjectCreation(self): """Test that api.Request() creates an object with desired attributes""" @@ -34,7 +35,7 @@ self.assertEqual(len(item), 2, item) -class TestPageGenerator(PywikibotTestCase): +class TestPageGenerator(CachedTestCase): def setUp(self): super(TestPageGenerator, self).setUp() self.gen = api.PageGenerator(site=mysite, @@ -108,7 +109,7 @@ self.assertEqual(len(results), 4) # total=-1 but 4 expected -class TestCachedRequest(unittest.TestCase): +class TestCachedRequest(SiteTestCase): def testResults(self): # Run the cached query twice to ensure the # data returned is equal diff --git a/tests/date_tests.py b/tests/date_tests.py index 44b89d9..7d9a81f 100644 --- a/tests/date_tests.py +++ b/tests/date_tests.py @@ -6,7 +6,7 @@ # __version__ = '$Id$' -from tests.utils import unittest, PywikibotTestCase +from tests.utils import unittest, NoSiteTestCase from pywikibot import date @@ -49,7 +49,7 @@ return type.__new__(cls, name, bases, dct) -class TestDate(PywikibotTestCase): +class TestDate(NoSiteTestCase): """Test cases for date library processed by unittest""" __metaclass__ = TestDateMeta diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index 1714b59..56b24c1 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -11,10 +11,10 @@ import hashlib import pywikibot from pywikibot.data.api import CachedRequest, QueryGenerator -from utils import unittest +from utils import unittest, NoSiteTestCase, SiteTestCase -class DryCachedRequestTests(unittest.TestCase): +class DryCachedRequestTests(SiteTestCase): def setUp(self): self.basesite = pywikibot.Site('en', 'wikipedia') @@ -26,6 +26,8 @@ self.expreq = CachedRequest(expiry=0, **self.parms) self.diffreq = CachedRequest(expiry=1, site=self.basesite, action='query', meta='siteinfo') self.diffsite = CachedRequest(expiry=1, site=self.altsite, action='query', meta='userinfo') + + super(DryCachedRequestTests, self).setUp() def test_expiry_formats(self): self.assertEqual(self.req.expiry, CachedRequest(datetime.timedelta(days=1), **self.parms).expiry) @@ -50,7 +52,7 @@ self.assertNotEqual(self.req._cachefile_path(), self.diffsite._cachefile_path()) -class MockCachedRequestKeyTests(unittest.TestCase): +class MockCachedRequestKeyTests(NoSiteTestCase): def setUp(self): class MockFamily(pywikibot.family.Family): @@ -90,24 +92,25 @@ def __getattr__(self, attr): raise Exception("Attribute %r not defined" % attr) - self.site = MockSite() + self.mocksite = MockSite() + super(MockCachedRequestKeyTests, self).setUp() def test_cachefile_path_different_users(self): - req = CachedRequest(expiry=1, site=self.site, + req = CachedRequest(expiry=1, site=self.mocksite, action='query', meta='siteinfo') anonpath = req._cachefile_path() - self.site._userinfo = {'name': u'MyUser'} - self.site._loginstatus = 0 - req = CachedRequest(expiry=1, site=self.site, + self.mocksite._userinfo = {'name': u'MyUser'} + self.mocksite._loginstatus = 0 + req = CachedRequest(expiry=1, site=self.mocksite, action='query', meta='siteinfo') userpath = req._cachefile_path() self.assertNotEqual(anonpath, userpath) - self.site._userinfo = {'name': u'MySysop'} - self.site._loginstatus = 1 - req = CachedRequest(expiry=1, site=self.site, + self.mocksite._userinfo = {'name': u'MySysop'} + self.mocksite._loginstatus = 1 + req = CachedRequest(expiry=1, site=self.mocksite, action='query', meta='siteinfo') sysoppath = req._cachefile_path() @@ -115,16 +118,16 @@ self.assertNotEqual(userpath, sysoppath) def test_unicode(self): - self.site._userinfo = {'name': u'محمد الفلسطيني'} - self.site._loginstatus = 0 + self.mocksite._userinfo = {'name': u'محمد الفلسطيني'} + self.mocksite._loginstatus = 0 - req = CachedRequest(expiry=1, site=self.site, + req = CachedRequest(expiry=1, site=self.mocksite, action='query', meta='siteinfo') en_user_path = req._cachefile_path() - self.site._namespaces = {2: [u'مستخدم']} + self.mocksite._namespaces = {2: [u'مستخدم']} - req = CachedRequest(expiry=1, site=self.site, + req = CachedRequest(expiry=1, site=self.mocksite, action='query', meta='siteinfo') expect = u'MockSite()User(User:محمد الفلسطيني)' + \ @@ -140,9 +143,14 @@ self.assertEqual(en_user_path, ar_user_path) -class DryQueryGenTests(unittest.TestCase): +class DryQueryGenTests(SiteTestCase): def test_query_constructor(self): + """Test QueryGenerator constructor. + + QueryGenerator constructor will call pywikibot.Site() + if a site paramter is not provided. + """ qGen1 = QueryGenerator(action="query", meta="siteinfo") qGen2 = QueryGenerator(meta="siteinfo") self.assertEqual(str(qGen1.request), str(qGen2.request)) diff --git a/tests/dry_site_tests.py b/tests/dry_site_tests.py index 573c89e..16f247e 100644 --- a/tests/dry_site_tests.py +++ b/tests/dry_site_tests.py @@ -10,7 +10,7 @@ import pywikibot from pywikibot.site import must_be -from tests.utils import PywikibotTestCase, unittest +from tests.utils import unittest, NoSiteTestCase class DrySite(pywikibot.site.APISite): @@ -21,7 +21,7 @@ return self._userinfo -class TestDrySite(PywikibotTestCase): +class TestDrySite(NoSiteTestCase): def test_logged_in(self): x = DrySite('en', 'wikipedia') @@ -41,7 +41,7 @@ self.assertFalse(x.logged_in(False)) -class TestMustBe(PywikibotTestCase): +class TestMustBe(NoSiteTestCase): """Test cases for the must_be decorator.""" # Implemented without setUpClass(cls) and global variables as objects diff --git a/tests/http_tests.py b/tests/http_tests.py index 0063774..646c999 100644 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -11,10 +11,10 @@ from pywikibot.comms import http, threadedhttp -from tests.utils import unittest +from tests.utils import unittest, NoSiteTestCase -class HttpTestCase(unittest.TestCase): +class HttpTestCase(NoSiteTestCase): def test_get(self): r = http.request(site=None, uri='http://www.wikipedia.org/') diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 78ddc89..b349bc7 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -8,10 +8,10 @@ from pywikibot import i18n -from tests.utils import unittest, PywikibotTestCase +from tests.utils import unittest, NoSiteTestCase -class TestTranslate(PywikibotTestCase): +class TestTranslate(NoSiteTestCase): def setUp(self): self.msg_localized = {'en': u'test-localized EN', 'nl': u'test-localized NL', @@ -70,7 +70,7 @@ u'test-no-english JA') -class TestTWN(PywikibotTestCase): +class TestTWN(NoSiteTestCase): def setUp(self): self.orig_messages_package_name = i18n.messages_package_name i18n.messages_package_name = 'tests.i18n' diff --git a/tests/ipregex_tests.py b/tests/ipregex_tests.py index 4cc9ea9..01fa79b 100644 --- a/tests/ipregex_tests.py +++ b/tests/ipregex_tests.py @@ -6,11 +6,11 @@ # Distributed under the terms of the MIT license. __version__ = '$Id$' -from tests.utils import unittest, PywikibotTestCase +from tests.utils import unittest, NoSiteTestCase from pywikibot.page import ip_regexp -class PyWikiIpRegexCase(PywikibotTestCase): +class PyWikiIpRegexCase(NoSiteTestCase): """Unit test class for ip_regexp""" def setUp(self): diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index 6a31c7b..9f36a0c 100644 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -11,7 +11,7 @@ import subprocess import pywikibot -from tests.utils import unittest +from tests.utils import unittest, SiteTestCase pypath = sys.executable basepath = os.path.split(os.path.split(__file__)[0])[0] @@ -23,7 +23,14 @@ return subprocess.Popen(command, stdout=subprocess.PIPE).communicate()[0] -class TestPwb(unittest.TestCase): +class TestPwb(SiteTestCase): + + """Test pwb.py functionality. + + This is registered as a Site test because it will not run + without a user-config.py + """ + def setUp(self): self.oldenviron = os.environ.copy() os.environ['PYWIKIBOT2_DIR'] = pywikibot.config.base_dir diff --git a/tests/utils.py b/tests/utils.py index 9d02bba..f767538 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -21,6 +21,8 @@ except ImportError: import unittest +import pywikibot + # Number of seconds each test may consume before a note is added after the test. test_duration_warning_interval = 10 @@ -35,14 +37,18 @@ from tests import patch_request, unpatch_request -class PywikibotTestCase(unittest.TestCase): +class BaseTestCase(unittest.TestCase): + + """Base class for all test cases. + + Adds timing info to stdout. + """ + def assertType(self, obj, cls): """Assert that obj is an instance of type cls""" return self.assertTrue(isinstance(obj, cls)) def setUp(self): - patch_request() - self.test_start = time.time() def tearDown(self): @@ -53,4 +59,57 @@ print(' %0.3fs' % duration, end=' ') sys.stdout.flush() + +class NoSiteTestCase(BaseTestCase): + + """Test cases not connected to a Site object. + + Do not use this for mock Site objects. + + Never set a class or instance variable called 'site' + As it will prevent tests from executing when invoked as: + $ nosetests -a '!site' -v + """ + + def setUp(self): + self.old_Site_lookup_method = pywikibot.Site + pywikibot.Site = lambda *args: self.fail('%s: Site() not permitted' + % self.__class__.__name__) + + super(NoSiteTestCase, self).setUp() + + def tearDown(self): + super(NoSiteTestCase, self).tearDown() + + pywikibot.Site = self.old_Site_lookup_method + + +class SiteTestCase(BaseTestCase): + + """Test cases connected to a Site object. + + Do not use this for mock Site objects. + """ + + site = True + + +class CachedTestCase(SiteTestCase): + + """Aggressively cached API test cases. + + Patches pywikibot.data.api to aggressively cache + API responses. + """ + + def setUp(self): + patch_request() + + super(CachedTestCase, self).setUp() + + def tearDown(self): + super(CachedTestCase, self).tearDown() + unpatch_request() + +PywikibotTestCase = CachedTestCase diff --git a/tests/weblib_tests.py b/tests/weblib_tests.py index b5183fc..df43e8e 100644 --- a/tests/weblib_tests.py +++ b/tests/weblib_tests.py @@ -13,10 +13,10 @@ from urllib.parse import urlparse import pywikibot.weblib as weblib -from tests.utils import unittest, PywikibotTestCase +from tests.utils import unittest, NoSiteTestCase -class TestArchiveSites(PywikibotTestCase): +class TestArchiveSites(NoSiteTestCase): def testInternetArchiveNewest(self): archivedversion = weblib.getInternetArchiveURL('https://google.com') parsed = urlparse(archivedversion) diff --git a/tests/xmlreader_tests.py b/tests/xmlreader_tests.py index e3ac959..a353fad 100644 --- a/tests/xmlreader_tests.py +++ b/tests/xmlreader_tests.py @@ -12,10 +12,10 @@ import os.path from pywikibot import xmlreader -from tests.utils import unittest, PywikibotTestCase +from tests.utils import unittest, NoSiteTestCase -class XmlReaderTestCase(PywikibotTestCase): +class XmlReaderTestCase(NoSiteTestCase): @classmethod def setUpClass(cls): diff --git a/tox.ini b/tox.ini index 5e8d79a..f067bf2 100644 --- a/tox.ini +++ b/tox.ini @@ -17,6 +17,10 @@ commands = flake8 --select=D {posargs} deps = flake8-docstrings +[testenv:nose] +commands = nosetests -a "!site" +deps = nose + [testenv:venv] commands = {posargs} @@ -29,3 +33,4 @@ ignore = E122,E127,E241,E502 exclude = .tox,.git,./*.egg,ez_setup.py,externals,user-config.py,./scripts/i18n/*,./pywikibot/date.py max_line_length = 256 + -- To view, visit https://gerrit.wikimedia.org/r/151604 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ee69f5b4e594a111d91bc0bafb59716900b478c Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Hashar <hashar(a)free.fr> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Delay import of win32clipboard - change (pywikibot/core)
by jenkins-bot (Code Review) 05 Aug '14

05 Aug '14

jenkins-bot has submitted this change and it was merged. Change subject: Delay import of win32clipboard ...................................................................... Delay import of win32clipboard Under python 2.7.8 on Windows, the default test loader for 'tests' tries to instantiate a module for each file called '*_tests.py', which fails for the module 'ui_tests' when pywin32 is not installed. This causes a backtrace in setup.py before testing commences. ui_tests is not part of the normal test suite; instead of testing, it prints a message saying it must be run outside of the test suite. pywin32 does not appear easy to set as a test dependency, as setup fails to find a suitable egg to build, and pywin32 doesnt provide a pypi package, wheel binary packages, etc. Moving the import to the code which uses win32clipboard allows the module to be instantiated, so it can report a test skip message during testing. This change allows the tests to be run on MS Windows without pywin32 or pywinauto installed. Bug: 68847 Change-Id: I507acbde9f682b9a92a902e9ce22a8d6a64ca583 --- M tests/ui_tests.py 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/ui_tests.py b/tests/ui_tests.py index c072d32..991460f 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -44,7 +44,6 @@ if os.name == "nt": from multiprocessing.managers import BaseManager import threading - import win32clipboard class pywikibotWrapper(object): def init(self): @@ -395,11 +394,15 @@ time.sleep(0.01) def setclip(self, text): + import win32clipboard + win32clipboard.OpenClipboard() win32clipboard.SetClipboardData(win32clipboard.CF_UNICODETEXT, unicode(text)) win32clipboard.CloseClipboard() def getclip(self): + import win32clipboard + win32clipboard.OpenClipboard() data = win32clipboard.GetClipboardData(win32clipboard.CF_UNICODETEXT) win32clipboard.CloseClipboard() -- To view, visit https://gerrit.wikimedia.org/r/150508 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I507acbde9f682b9a92a902e9ce22a8d6a64ca583 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] remove redundant backslashes between brackets - change (pywikibot/core)
by jenkins-bot (Code Review) 05 Aug '14

05 Aug '14

jenkins-bot has submitted this change and it was merged. Change subject: remove redundant backslashes between brackets ...................................................................... remove redundant backslashes between brackets to fix pep8 errors: 7 E502 the backslash is redundant between brackets also changed tox.ini to stop ignoring such errors Change-Id: I3abe3da95441c984a173ad2da5b4c5e3bc6e0222 --- M pywikibot/textlib.py M pywikibot/userinterfaces/win32_unicode.py M scripts/image.py M scripts/template.py M setup.py M tox.ini 6 files changed, 9 insertions(+), 9 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 92d62d5..d0ac855 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -235,7 +235,7 @@ int(groupMatch.group('number'))) try: replacement = (replacement[:groupMatch.start()] + - ('' if match.group(groupID) is None else match.group(groupID)) + \ + (match.group(groupID) or '') + replacement[groupMatch.end():]) except IndexError: pywikibot.output('\nInvalid group reference: %s' % groupID) diff --git a/pywikibot/userinterfaces/win32_unicode.py b/pywikibot/userinterfaces/win32_unicode.py index 42714e2..a7bcfc4 100755 --- a/pywikibot/userinterfaces/win32_unicode.py +++ b/pywikibot/userinterfaces/win32_unicode.py @@ -113,7 +113,7 @@ real_stderr = False if real_stdin: - ReadConsoleW = WINFUNCTYPE(BOOL, HANDLE, LPVOID, DWORD, POINTER(DWORD), \ + ReadConsoleW = WINFUNCTYPE(BOOL, HANDLE, LPVOID, DWORD, POINTER(DWORD), LPVOID)(("ReadConsoleW", windll.kernel32)) class UnicodeInput: @@ -136,7 +136,7 @@ # BOOL WINAPI WriteConsoleW(HANDLE hOutput, LPWSTR lpBuffer, DWORD nChars, # LPDWORD lpCharsWritten, LPVOID lpReserved); - WriteConsoleW = WINFUNCTYPE(BOOL, HANDLE, LPWSTR, DWORD, POINTER(DWORD), \ + WriteConsoleW = WINFUNCTYPE(BOOL, HANDLE, LPWSTR, DWORD, POINTER(DWORD), LPVOID)(("WriteConsoleW", windll.kernel32)) class UnicodeOutput: diff --git a/scripts/image.py b/scripts/image.py index 32dbd2d..3189d71 100644 --- a/scripts/image.py +++ b/scripts/image.py @@ -142,7 +142,7 @@ replacements = [] if not self.site.nocapitalize: - case = re.escape(self.old_image[0].upper() + \ + case = re.escape(self.old_image[0].upper() + self.old_image[0].lower()) escaped = '[' + case + ']' + re.escape(self.old_image[1:]) else: diff --git a/scripts/template.py b/scripts/template.py index 5299610..c605d29 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -254,8 +254,8 @@ else: pattern = re.escape(old) pattern = re.sub(r'_|\\ ', r'[_ ]', pattern) - templateRegex = re.compile(r'\{\{ *(' + ':|'.join(namespaces) + \ - r':|[mM][sS][gG]:)?' + pattern + \ + templateRegex = re.compile(r'\{\{ *(' + ':|'.join(namespaces) + + r':|[mM][sS][gG]:)?' + pattern + r'(?P<parameters>\s*\|.+?|) *}}', re.DOTALL) diff --git a/setup.py b/setup.py index 4dfcbce..e97d637 100644 --- a/setup.py +++ b/setup.py @@ -89,7 +89,7 @@ maintainer='The pywikibot team', maintainer_email='pywikipedia-l(a)lists.wikimedia.org', license='MIT License', - packages=['pywikibot'] + \ + packages=['pywikibot'] + [package for package in find_packages() if package.startswith('pywikibot.')], diff --git a/tox.ini b/tox.ini index 5e8d79a..0353c35 100644 --- a/tox.ini +++ b/tox.ini @@ -21,11 +21,11 @@ commands = {posargs} [flake8] -ignore = E122,E127,E241,E265,E502 +ignore = E122,E127,E241,E265 exclude = .tox,.git,./*.egg,ez_setup.py,externals,user-config.py,./scripts/i18n/*,./pywikibot/date.py max_line_length = 256 [pep8] -ignore = E122,E127,E241,E502 +ignore = E122,E127,E241 exclude = .tox,.git,./*.egg,ez_setup.py,externals,user-config.py,./scripts/i18n/*,./pywikibot/date.py max_line_length = 256 -- To view, visit https://gerrit.wikimedia.org/r/151906 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3abe3da95441c984a173ad2da5b4c5e3bc6e0222 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] expand wikicode in 'Cite_error_refs_without_references_categ... - change (pywikibot/core)
by jenkins-bot (Code Review) 05 Aug '14

05 Aug '14

jenkins-bot has submitted this change and it was merged. Change subject: expand wikicode in 'Cite_error_refs_without_references_category' ...................................................................... expand wikicode in 'Cite_error_refs_without_references_category' The English Wikipedia version of the message invokes a Scribunto module, thus making noreferences.py fail with pywikibot.InvalidTitle (because of the curly brackets in it) when called with no arguments: https://travis-ci.org/wikimedia/pywikibot-core/jobs/31712965 Ideally, the 'amenableparser' argument should be passed to the allmessages API, but APISite.mediawiki_messages() doesn't have this feature yet. Change-Id: I88b4beeec0bc64e2586a6165bf6ae9d70522db5d --- M scripts/noreferences.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/noreferences.py b/scripts/noreferences.py index e92ac82..718a47d 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -678,7 +678,8 @@ if not gen: site = pywikibot.Site() try: - cat = site.mediawiki_message(maintenance_category) + cat = site.expand_text( + site.mediawiki_message(maintenance_category)) except: pass else: -- To view, visit https://gerrit.wikimedia.org/r/151859 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I88b4beeec0bc64e2586a6165bf6ae9d70522db5d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] use mediawiki_message to get localized cat name - change (pywikibot/core)
by jenkins-bot (Code Review) 05 Aug '14

05 Aug '14

jenkins-bot has submitted this change and it was merged. Change subject: use mediawiki_message to get localized cat name ...................................................................... use mediawiki_message to get localized cat name Change-Id: Ia16ce743879f96785b84f61348f254d35f5d78d9 --- M scripts/noreferences.py 1 file changed, 2 insertions(+), 13 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/noreferences.py b/scripts/noreferences.py index 47835e5..e92ac82 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -419,18 +419,7 @@ # <references /> noTitleRequired = [u'pl', u'be', u'szl'] -maintenance_category = { - 'wikipedia': { - 'be-x-old': u'Вікіпэдыя:Старонкі з адсутным сьпісам зносак', - 'cs': u'Údržba:Články s chybějící značkou REFERENCES', - 'de': u'Wikipedia:Seite mit fehlendem References-Tag', - 'en': u'Pages with missing references list', - 'fa': u'صفحه‌های با یادکرد خراب (فقدان پانویس)', - 'ja': u'Refタグがあるのにreferencesタグがないページ', - 'simple': u'Wikipedia pages with broken references', - 'zh': u'参考资料格式错误的页面', - }, -} +maintenance_category = 'cite_error_refs_without_references_category' class XmlDumpNoReferencesPageGenerator: @@ -689,7 +678,7 @@ if not gen: site = pywikibot.Site() try: - cat = i18n.translate(site, maintenance_category) + cat = site.mediawiki_message(maintenance_category) except: pass else: -- To view, visit https://gerrit.wikimedia.org/r/148334 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia16ce743879f96785b84f61348f254d35f5d78d9 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] move string properties normalization into WikibasePage#__nor... - change (pywikibot/core)
by jenkins-bot (Code Review) 05 Aug '14

05 Aug '14

jenkins-bot has submitted this change and it was merged. Change subject: move string properties normalization into WikibasePage#__normalizeData() ...................................................................... move string properties normalization into WikibasePage#__normalizeData() away from editLabels, editDescriptions and editAliases, thus allowing to call it from other functions == use cases == currently, to edit some labels, the only valid syntaxes are: * editLabels({'lang': 'val'}) * editEntity({'labels': {'lang': {'language': 'lang', 'value': 'val'}}}) this change adds the following possibilities: * editLabels({'lang': {'language': 'lang', 'value': 'val'}}) * editEntity({'labels': {'lang': 'val'}}) Change-Id: Iba1fdce1cc199cda0b7f83febdf48ce6a11100e0 --- M pywikibot/page.py 1 file changed, 17 insertions(+), 9 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 2232a49..cf6f367 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2740,6 +2740,20 @@ del data[key] return data + def __normalizeData(self, data): + for prop in ('labels', 'descriptions', 'aliases'): + if prop in data: + data[prop] = self.__normalizeLanguages(data[prop]) + if prop == 'aliases': + for key, values in data[prop].iteritems(): + for index, value in enumerate(values): + data[prop][key][index] = {'language': key, + 'value': value} + else: + for key, value in data[prop].iteritems(): + data[prop][key] = {'language': key, 'value': value} + return data + def getdbName(self, site): """ Helper function to obtain a dbName for a Site. @@ -2768,6 +2782,9 @@ baserevid = self.lastrevid else: baserevid = None + + data = self.__normalizeData(data) + updates = self.repo.editEntity(self._defined_by(singular=True), data, baserevid=baserevid, **kwargs) self.lastrevid = updates['entity']['lastrevid'] @@ -2781,9 +2798,6 @@ value should be the string to set it to. You can set it to '' to remove the label. """ - labels = self.__normalizeLanguages(labels) - for key in labels: - labels[key] = {'language': key, 'value': labels[key]} data = {'labels': labels} self.editEntity(data, **kwargs) @@ -2796,9 +2810,6 @@ value should be the string to set it to. You can set it to '' to remove the description. """ - descriptions = self.__normalizeLanguages(descriptions) - for key in descriptions: - descriptions[key] = {'language': key, 'value': descriptions[key]} data = {'descriptions': descriptions} self.editEntity(data, **kwargs) @@ -2810,9 +2821,6 @@ as a language or a site object. The value should be a list of strings. """ - aliases = self.__normalizeLanguages(aliases) - for (key, strings) in list(aliases.items()): - aliases[key] = [{'language': key, 'value': i} for i in strings] data = {'aliases': aliases} self.editEntity(data, **kwargs) -- To view, visit https://gerrit.wikimedia.org/r/135139 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba1fdce1cc199cda0b7f83febdf48ce6a11100e0 Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] standardize template.py - change (pywikibot/core)
by jenkins-bot (Code Review) 05 Aug '14

05 Aug '14

jenkins-bot has submitted this change and it was merged. Change subject: standardize template.py ...................................................................... standardize template.py - TemplateRobot extends pywikibot.Bot (with built-in 'always' option) - fix bug 68661 Change-Id: I4553cd0c0a92d3bafc4e76d6a63ed122abb4c622 --- M scripts/template.py M tests/script_tests.py 2 files changed, 52 insertions(+), 56 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/template.py b/scripts/template.py index 3730b17..5299610 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -100,7 +100,7 @@ # (C) Daniel Herding, 2004 # (C) Rob W.W. Hooft, 2003-2005 # (C) xqt, 2009-2014 -# (C) Pywikibot team, 2004-2013 +# (C) Pywikibot team, 2004-2014 # # Distributed under the terms of the MIT license. # @@ -109,9 +109,7 @@ import re import pywikibot -from pywikibot import i18n -from pywikibot import pagegenerators -from pywikibot import xmlreader +from pywikibot import i18n, pagegenerators, xmlreader, Bot from scripts import replace @@ -187,53 +185,53 @@ yield page -class TemplateRobot: +class TemplateRobot(Bot): """ This bot will load all pages yielded by a page generator and replace or remove all occurences of the old template, or substitute them with the template's text. """ - def __init__(self, generator, templates, subst=False, remove=False, - editSummary='', acceptAll=False, addedCat=None): + def __init__(self, generator, templates, **kwargs): """ - Arguments: - * generator - A page generator. - * replacements - A dictionary which maps old template names to - their replacements. If remove or subst is True, - it maps the names of the templates that should be - removed/resolved to None. - * remove - True if the template should be removed. - * subst - True if the template should be resolved. + Constructor. + @param generator: the pages to work on + @type generator: iterable + @param replacements: a dictionary which maps old template names to + their replacements. If remove or subst is True, it maps the + names of the templates that should be removed/resolved to None. + @type replacements: dict """ + self.availableOptions.update({ + 'subst': False, + 'remove': False, + 'summary': None, + 'addedCat': None, + }) + super(TemplateRobot, self).__init__(**kwargs) + self.generator = generator self.templates = templates - self.subst = subst - self.remove = remove - self.editSummary = editSummary - self.acceptAll = acceptAll - self.addedCat = addedCat site = pywikibot.Site() - if self.addedCat: - self.addedCat = pywikibot.Category( - site, u'%s:%s' % (site.namespace(14), self.addedCat)) + if self.getOption('addedCat'): + self.options['addedCat'] = pywikibot.Category(site, self.getOption('addedCat')) comma = site.mediawiki_message('comma-separator') # get edit summary message if it's empty - if not self.editSummary: - Param = {'list': comma.join(self.templates.keys()), - 'num': len(self.templates)} - if self.remove: - self.editSummary = i18n.twntranslate( - site, 'template-removing', Param) - elif self.subst: - self.editSummary = i18n.twntranslate( - site, 'template-substituting', Param) + if not self.getOption('summary'): + params = {'list': comma.join(self.templates.keys()), + 'num': len(self.templates)} + if self.getOption('remove'): + self.options['summary'] = i18n.twntranslate( + site, 'template-removing', params) + elif self.getOption('subst'): + self.options['summary'] = i18n.twntranslate( + site, 'template-substituting', params) else: - self.editSummary = i18n.twntranslate( - site, 'template-changing', Param) + self.options['summary'] = i18n.twntranslate( + site, 'template-changing', params) def run(self): """Start the robot's action.""" @@ -261,15 +259,15 @@ r'(?P<parameters>\s*\|.+?|) *}}', re.DOTALL) - if self.subst and self.remove: + if self.getOption('subst') and self.getOption('remove'): replacements.append((templateRegex, '{{subst:%s\g<parameters>}}' % new)) exceptions['inside-tags'] = ['ref', 'gallery'] - elif self.subst: + elif self.getOption('subst'): replacements.append((templateRegex, '{{subst:%s\g<parameters>}}' % old)) exceptions['inside-tags'] = ['ref', 'gallery'] - elif self.remove: + elif self.getOption('remove'): replacements.append((templateRegex, '')) else: template = pywikibot.Page(site, new, ns=10) @@ -284,20 +282,16 @@ '{{%s\g<parameters>}}' % new)) replaceBot = replace.ReplaceRobot(self.generator, replacements, - exceptions, acceptall=self.acceptAll, - addedCat=self.addedCat, - summary=self.editSummary) + exceptions, acceptall=self.getOption('always'), + addedCat=self.getOption('addedCat'), + summary=self.getOption('summary')) replaceBot.run() def main(*args): templateNames = [] templates = {} - subst = False - remove = False - editSummary = '' - addedCat = '' - acceptAll = False + options = {} # If xmlfilename is None, references will be loaded from the live wiki. xmlfilename = None user = None @@ -309,13 +303,13 @@ genFactory = pagegenerators.GeneratorFactory() for arg in local_args: if arg == '-remove': - remove = True + options['remove'] = True elif arg == '-subst': - subst = True + options['subst'] = True elif arg == '-assubst': - subst = remove = True - elif arg == ('-always'): - acceptAll = True + options['subst'] = options['remove'] = True + elif arg == '-always': + options['always'] = True elif arg.startswith('-xml'): if len(arg) == 4: xmlfilename = pywikibot.input( @@ -323,9 +317,9 @@ else: xmlfilename = arg[5:] elif arg.startswith('-category:'): - addedCat = arg[len('-category:'):] + options['addedCat'] = arg[len('-category:'):] elif arg.startswith('-summary:'): - editSummary = arg[len('-summary:'):] + options['summary'] = arg[len('-summary:'):] elif arg.startswith('-user:'): user = arg[len('-user:'):] elif arg.startswith('-skipuser:'): @@ -340,7 +334,11 @@ ns=10 ).title(withNamespace=False)) - if subst ^ remove: + if not templateNames: + pywikibot.showHelp() + return + + if options.get('subst', False) ^ options.get('remove', False): for templateName in templateNames: templates[templateName] = None else: @@ -378,8 +376,7 @@ preloadingGen = pagegenerators.PreloadingGenerator(gen) - bot = TemplateRobot(preloadingGen, templates, subst, remove, editSummary, - acceptAll, addedCat) + bot = TemplateRobot(preloadingGen, templates, **options) bot.run() if __name__ == "__main__": diff --git a/tests/script_tests.py b/tests/script_tests.py index 0651c63..9b7ae9f 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -227,7 +227,6 @@ 'imagerecat', # bug 68658 'imagetransfer', # bug 68659 'pagefromfile', # bug 68660 - 'template', # bug 68661 - zero output 'transferbot', # raises custom Exception 'upload', # raises custom ValueError ] or \ -- To view, visit https://gerrit.wikimedia.org/r/148944 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4553cd0c0a92d3bafc4e76d6a63ed122abb4c622 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] standardize noreferences.py - change (pywikibot/core)
by jenkins-bot (Code Review) 05 Aug '14

05 Aug '14

jenkins-bot has submitted this change and it was merged. Change subject: standardize noreferences.py ...................................................................... standardize noreferences.py - NoReferencesBot extends pywikibot.Bot with options as a dict, and standard 'always' switch - use the inherited self.userPut(), removed the save() method - let the standard GeneratorFactory parse the '-namespace:' argument - fix some pep8 errors E265 block comment should start with '# ' Change-Id: Iae38e6ba582e5e65f38290d34d3048cf1442c383 --- M scripts/noreferences.py 1 file changed, 40 insertions(+), 78 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/noreferences.py b/scripts/noreferences.py index af9fbce..47835e5 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -42,8 +42,7 @@ import re import pywikibot -from pywikibot import i18n -from pywikibot import pagegenerators +from pywikibot import i18n, pagegenerators, Bot # This is required for the text that is shown when you run this script # with the parameter -help. @@ -460,12 +459,15 @@ yield pywikibot.Page(pywikibot.Site(), entry.title) -class NoReferencesBot(object): +class NoReferencesBot(Bot): - def __init__(self, generator, always=False, verbose=True): - self.generator = generator - self.always = always - self.verbose = verbose + def __init__(self, generator, **kwargs): + self.availableOptions.update({ + 'verbose': True, + }) + super(NoReferencesBot, self).__init__(**kwargs) + + self.generator = pagegenerators.PreloadingGenerator(generator) self.site = pywikibot.Site() self.comment = i18n.twtranslate(self.site, 'noreferences-add-tag') @@ -491,22 +493,22 @@ oldTextCleaned = pywikibot.removeDisabledParts(text) if self.referencesR.search(oldTextCleaned) or \ self.referencesTagR.search(oldTextCleaned): - if self.verbose: + if self.getOption('verbose'): pywikibot.output(u'No changes necessary: references tag found.') return False elif self.referencesTemplates: templateR = u'{{(' + u'|'.join(self.referencesTemplates) + ')' if re.search(templateR, oldTextCleaned, re.IGNORECASE | re.UNICODE): - if self.verbose: + if self.getOption('verbose'): pywikibot.output( u'No changes necessary: references template found.') return False if not self.refR.search(oldTextCleaned): - if self.verbose: + if self.getOption('verbose'): pywikibot.output(u'No changes necessary: no ref tags found.') return False else: - if self.verbose: + if self.getOption('verbose'): pywikibot.output(u'Found ref without references.') return True @@ -554,7 +556,7 @@ if match: if pywikibot.isDisabled(oldText, match.start()): pywikibot.output( - 'Existing %s section is commented out, won\'t add ' + 'Existing %s section is commented out, won\'t add ' 'the references in front of it.' % section) index = match.end() else: @@ -582,10 +584,10 @@ # won't work with nested templates # the negative lookahead assures that we'll match the last template # occurence in the temp text. - ### fix me: - ### {{commons}} or {{commonscat}} are part of Weblinks section - ### * {{template}} is mostly part of a section - ### so templatePattern must be fixed + # FIXME: + # {{commons}} or {{commonscat}} are part of Weblinks section + # * {{template}} is mostly part of a section + # so templatePattern must be fixed templatePattern = r'\r?\n{{((?!}}).)+?}}\s*' commentPattern = r').)*?-->\s*' metadataR = re.compile(r'(\r?\n)?(%s|%s|%s|%s)$' @@ -615,37 +617,6 @@ referencesSections)[0], ident, self.referencesText) return oldText[:index] + newSection + oldText[index:] - - def save(self, page, newText): - """ - Saves the page to the wiki, if the user accepts the changes made. - """ - pywikibot.showDiff(page.get(), newText) - if not self.always: - choice = pywikibot.inputChoice( - u'Do you want to accept these changes?', - ['Yes', 'No', 'Always yes'], 'yNa', 'Y') - if choice == 'n': - return - elif choice == 'a': - self.always = True - - page.text = newText - if self.always: - try: - page.save(self.comment) - except pywikibot.EditConflict: - pywikibot.output(u'Skipping %s because of edit conflict' - % (page.title(),)) - except pywikibot.SpamfilterError as e: - pywikibot.output( - u'Cannot change %s because of blacklist entry %s' - % (page.title(), e.url)) - except pywikibot.LockedPage: - pywikibot.output(u'Skipping %s (locked page)' % (page.title(),)) - else: - # Save the page in the background. No need to catch exceptions. - page.save(self.comment, async=True) def run(self): @@ -680,19 +651,21 @@ continue if self.lacksReferences(text): newText = self.addReferences(text) - self.save(page, newText) + try: + self.userPut(page, page.text, newText, comment=self.comment) + except pywikibot.EditConflict: + pywikibot.output(u'Skipping %s because of edit conflict' + % page.title()) + except pywikibot.SpamfilterError as e: + pywikibot.output( + u'Cannot change %s because of blacklist entry %s' + % (page.title(), e.url)) + except pywikibot.LockedPage: + pywikibot.output(u'Skipping %s (locked page)' % page.title()) def main(): - # page generator - gen = None - # Which namespaces should be processed? - # default to [] which means all namespaces will be processed - namespaces = [] - # Never ask before changing a page - always = False - # No verbose output - verbose = True + options = {} # Process global args and prepare generator args parser local_args = pywikibot.handleArgs() @@ -704,41 +677,30 @@ xmlFilename = i18n.input('pywikibot-enter-xml-filename') else: xmlFilename = arg[5:] - gen = XmlDumpNoReferencesPageGenerator(xmlFilename) - elif arg.startswith('-namespace:'): - try: - namespaces.append(int(arg[11:])) - except ValueError: - namespaces.append(arg[11:]) + genFactory.gens.append(XmlDumpNoReferencesPageGenerator(xmlFilename)) elif arg == '-always': - always = True + options['always'] = True elif arg == '-quiet': - verbose = False + options['verbose'] = False else: genFactory.handleArg(arg) - if not gen: - gen = genFactory.getCombinedGenerator() + gen = genFactory.getCombinedGenerator() if not gen: site = pywikibot.Site() try: - cat = maintenance_category[site.family.name][site.lang] + cat = i18n.translate(site, maintenance_category) except: pass else: - if not namespaces: - namespaces = [0] cat = pywikibot.Category(site, "%s:%s" % ( site.category_namespace(), cat)) - gen = pagegenerators.CategorizedPageGenerator(cat) - if not gen: - pywikibot.showHelp('noreferences') - else: - if namespaces: - gen = pagegenerators.NamespaceFilterPageGenerator(gen, namespaces) - preloadingGen = pagegenerators.PreloadingGenerator(gen) - bot = NoReferencesBot(preloadingGen, always, verbose) + gen = cat.articles(namespaces=genFactory.namespaces or [0]) + if gen: + bot = NoReferencesBot(gen, **options) bot.run() + else: + pywikibot.showHelp() if __name__ == "__main__": main() -- To view, visit https://gerrit.wikimedia.org/r/137354 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae38e6ba582e5e65f38290d34d3048cf1442c383 Gerrit-PatchSet: 9 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] standardize image.py - change (pywikibot/core)
by jenkins-bot (Code Review) 05 Aug '14

05 Aug '14

jenkins-bot has submitted this change and it was merged. Change subject: standardize image.py ...................................................................... standardize image.py - ImageRobot extends pywikibot.Bot (with built-in 'always' option) - remove obsolete script name from showHelp Change-Id: Ib4225d3899522d542250420cd067b0f156326ef5 --- M scripts/image.py 1 file changed, 68 insertions(+), 70 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/image.py b/scripts/image.py index 1e900a2..32dbd2d 100644 --- a/scripts/image.py +++ b/scripts/image.py @@ -29,7 +29,7 @@ python image.py FlagrantCopyvio.jpg -The image "Flag.svg" has been uploaded, making the old "Flag.jpg" obselete: +The image "Flag.svg" has been uploaded, making the old "Flag.jpg" obsolete: python image.py Flag.jpg Flag.svg @@ -43,11 +43,11 @@ # import pywikibot import replace -from pywikibot import i18n, pagegenerators +from pywikibot import i18n, pagegenerators, Bot import re -class ImageRobot: +class ImageRobot(Bot): """ This bot will load all pages yielded by a file links image page generator and replace or remove all occurences of the old image. @@ -96,39 +96,42 @@ 'zh': u'機器人：移除圖像 %s', } - def __init__(self, generator, oldImage, newImage=None, summary='', - always=False, loose=False): + def __init__(self, generator, old_image, new_image=None, **kwargs): """ - Arguments: - * generator - A page generator. - * oldImage - The title of the old image (without namespace) - * newImage - The title of the new image (without namespace), or - None if you want to remove the image. - """ - self.generator = generator - self.oldImage = oldImage - self.newImage = newImage - self.editSummary = summary - self.summary = summary - self.always = always - self.loose = loose + Constructor. - # get edit summary message - mysite = pywikibot.Site() - if summary: - self.editSummary = summary - elif self.newImage: - self.editSummary = i18n.translate(mysite, self.msg_replace, - fallback=True) \ - % (self.oldImage, self.newImage) - else: - self.editSummary = i18n.translate(mysite, self.msg_remove, - fallback=True) \ - % self.oldImage + @param generator: the pages to work on + @type generator: iterable + @param old_image: the title of the old image (without namespace) + @type old_image: unicode + @param new_image: the title of the new image (without namespace), or + None if you want to remove the image + @type new_image: unicode or None + """ + self.availableOptions.update({ + 'summary': None, + 'loose': False, + }) + super(ImageRobot, self).__init__(**kwargs) + + self.generator = generator + self.site = pywikibot.Site() + self.old_image = old_image + self.new_image = new_image + + if not self.getOption('summary'): + if self.new_image: + self.options['summary'] = i18n.translate(self.site, self.msg_replace, + fallback=True) \ + % (self.old_image, self.new_image) + else: + self.options['summary'] = i18n.translate(self.site, self.msg_remove, + fallback=True) \ + % self.old_image def run(self): """ - Starts the bot's action. + Start the bot's action. """ # regular expression to find the original template. # {{vfd}} does the same thing as {{Vfd}}, so both will be found. @@ -137,69 +140,64 @@ # empty string if there are none. replacements = [] - site = pywikibot.Site() - if not site.nocapitalize: - case = re.escape(self.oldImage[0].upper() + \ - self.oldImage[0].lower()) - escaped = '[' + case + ']' + re.escape(self.oldImage[1:]) + if not self.site.nocapitalize: + case = re.escape(self.old_image[0].upper() + \ + self.old_image[0].lower()) + escaped = '[' + case + ']' + re.escape(self.old_image[1:]) else: - escaped = re.escape(self.oldImage) + escaped = re.escape(self.old_image) # Be careful, spaces and _ have been converted to '\ ' and '\_' escaped = re.sub('\\\\[_ ]', '[_ ]', escaped) - if not self.loose or not self.newImage: - ImageRegex = re.compile(r'\[\[ *(?:' + '|'.join(site.namespace(6, all=True)) + ')\s*:\s*' + escaped + ' *(?P<parameters>\|[^\n]+|) *\]\]') + if not self.getOption('loose') or not self.new_image: + image_regex = re.compile(r'\[\[ *(?:' + '|'.join(self.site.namespace(6, all=True)) + ')\s*:\s*' + escaped + ' *(?P<parameters>\|[^\n]+|) *\]\]') else: - ImageRegex = re.compile(r'' + escaped) + image_regex = re.compile(r'' + escaped) - if self.newImage: - if not self.loose: - replacements.append((ImageRegex, '[[' + site.image_namespace() + ':' + self.newImage + '\g<parameters>]]')) + if self.new_image: + if not self.getOption('loose'): + replacements.append((image_regex, '[[' + self.site.image_namespace() + ':' + self.new_image + '\g<parameters>]]')) else: - replacements.append((ImageRegex, self.newImage)) + replacements.append((image_regex, self.new_image)) else: - replacements.append((ImageRegex, '')) + replacements.append((image_regex, '')) replaceBot = replace.ReplaceRobot(self.generator, replacements, - acceptall=self.always, - summary=self.editSummary) + acceptall=self.getOption('always'), + summary=self.getOption('summary')) replaceBot.run() def main(): - oldImage = None - newImage = None - summary = '' - always = False - loose = False - # read command line parameters + old_image = None + new_image = None + options = {} + for arg in pywikibot.handleArgs(): if arg == '-always': - always = True + options['always'] = True elif arg == '-loose': - loose = True + options['loose'] = True elif arg.startswith('-summary'): if len(arg) == len('-summary'): - summary = pywikibot.input(u'Choose an edit summary: ') + options['summary'] = pywikibot.input(u'Choose an edit summary: ') else: - summary = arg[len('-summary:'):] + options['summary'] = arg[len('-summary:'):] + elif old_image: + new_image = arg else: - if oldImage: - newImage = arg - else: - oldImage = arg - if not oldImage: - pywikibot.showHelp('image') - else: - mysite = pywikibot.Site() - ns = mysite.image_namespace() - oldImagePage = pywikibot.ImagePage(mysite, ns + ':' + oldImage) - gen = pagegenerators.FileLinksGenerator(oldImagePage) + old_image = arg + + if old_image: + site = pywikibot.Site() + old_imagepage = pywikibot.ImagePage(site, old_image) + gen = pagegenerators.FileLinksGenerator(old_imagepage) preloadingGen = pagegenerators.PreloadingGenerator(gen) - bot = ImageRobot(preloadingGen, oldImage, newImage, summary, always, - loose) + bot = ImageRobot(preloadingGen, old_image, new_image, **options) bot.run() + else: + pywikibot.showHelp() if __name__ == "__main__": main() -- To view, visit https://gerrit.wikimedia.org/r/148942 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib4225d3899522d542250420cd067b0f156326ef5 Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] unusedfiles raises NoPage for deleted file - change (pywikibot/core)
by jenkins-bot (Code Review) 05 Aug '14

05 Aug '14

jenkins-bot has submitted this change and it was merged. Change subject: unusedfiles raises NoPage for deleted file ...................................................................... unusedfiles raises NoPage for deleted file Bug: 69133 Change-Id: I76db1f45be98c881547b61f098ef49f715613f30 --- M scripts/unusedfiles.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Ricordisamoa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/unusedfiles.py b/scripts/unusedfiles.py index 55730f3..75ae002 100644 --- a/scripts/unusedfiles.py +++ b/scripts/unusedfiles.py @@ -96,6 +96,10 @@ generator = pagegenerators.UnusedFilesGenerator() generator = pagegenerators.PreloadingGenerator(generator) for image in generator: + if not image.exists(): + pywikibot.output(u"File '%s' does not exist (see bug 69133)." + % image.title()) + continue if (except_text_translated.encode('utf-8') not in image.getImagePageHtml() and u'http://' not in image.text): -- To view, visit https://gerrit.wikimedia.org/r/151812 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I76db1f45be98c881547b61f098ef49f715613f30 Gerrit-PatchSet: 2 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: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Whym <whym(a)whym.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

← Newer
1
...
12
13
14
15
16
17
18
19
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2014