Pywikibot-commits September 2015

pywikibot-commits@lists.wikimedia.org

2 participants
243 discussions

[Gerrit] Convert weblinkchecker to SingleSiteBot - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Convert weblinkchecker to SingleSiteBot ...................................................................... Convert weblinkchecker to SingleSiteBot History object loads data for only a single site. Change-Id: I01d26ba0c8e8b6ad8b3beac0ec9744d749185bc9 --- M scripts/weblinkchecker.py 1 file changed, 20 insertions(+), 18 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/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index 6d00cce..5452fdc 100755 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -116,7 +116,9 @@ memento_client = e import pywikibot + from pywikibot import i18n, config, pagegenerators, textlib, xmlreader, weblib +from pywikibot.bot import ExistingPageBot, SingleSiteBot # TODO: Convert to httlib2 if sys.version_info[0] > 2: @@ -244,7 +246,7 @@ yield m.group('urlb') -class XmlDumpPageGenerator: +class XmlDumpPageGenerator(object): """Xml generator that yiels pages containing a web link.""" @@ -597,7 +599,7 @@ self.history.setLinkDead(self.url, message, self.page, self.day) -class History: +class History(object): """ Store previously found dead links. @@ -621,9 +623,12 @@ """ - def __init__(self, reportThread): + def __init__(self, reportThread, site=None): self.reportThread = reportThread - self.site = pywikibot.Site() + if not site: + self.site = pywikibot.Site() + else: + self.site = site self.semaphore = threading.Semaphore() self.datfilename = pywikibot.config.datafilepath( 'deadlinks', 'deadlinks-%s-%s.dat' % (self.site.family.name, self.site.code)) @@ -820,7 +825,7 @@ self.semaphore.release() -class WeblinkCheckerRobot: +class WeblinkCheckerRobot(SingleSiteBot, ExistingPageBot): """ Bot which will search for dead weblinks. @@ -828,8 +833,11 @@ It uses several LinkCheckThreads at once to process pages from generator. """ - def __init__(self, generator, HTTPignore=None, day=7): - self.generator = generator + def __init__(self, generator, HTTPignore=None, day=7, site=True): + """Constructor.""" + super(WeblinkCheckerRobot, self).__init__( + generator=generator, site=site) + if config.report_dead_links_on_talk: pywikibot.log("Starting talk page thread") reportThread = DeadLinkReportThread() @@ -838,23 +846,17 @@ reportThread.start() else: reportThread = None - self.history = History(reportThread) + self.history = History(reportThread, site=self.site) if HTTPignore is None: self.HTTPignore = [] else: self.HTTPignore = HTTPignore self.day = day - def run(self): - for page in self.generator: - self.checkLinksIn(page) - - def checkLinksIn(self, page): - try: - text = page.get() - except pywikibot.NoPage: - pywikibot.output(u'%s does not exist.' % page.title()) - return + def treat_page(self): + """Process one page.""" + page = self.current_page + text = page.get() for url in weblinksIn(text): ignoreUrl = False for ignoreR in ignorelist: -- To view, visit https://gerrit.wikimedia.org/r/239555 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01d26ba0c8e8b6ad8b3beac0ec9744d749185bc9 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 <>

8 years, 7 months

[Gerrit] Remove pywikibot modules if import failed - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Remove pywikibot modules if import failed ...................................................................... Remove pywikibot modules if import failed 7634a05 introduced an `import tools` in config, which loaded pywikibot.tools into sys.modules even if importing pywikibot fails. This caused errors when pwb attempted to import generate_family_file after importing pywikibot failed due to user-config.py not existing. Bug: T113161 Change-Id: Ia9521def534ecb9e5626d092162b2fe326a6022e --- M pwb.py 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 7d8ee4f..3cd3abe 100755 --- a/pwb.py +++ b/pwb.py @@ -56,6 +56,13 @@ pwb = None +def remove_modules(): + """Remove pywikibot modules.""" + for name in list(sys.modules): + if name.startswith('pywikibot'): + del sys.modules[name] + + def tryimport_pwb(): """Try to import pywikibot. @@ -68,6 +75,8 @@ import pywikibot # noqa pwb = pywikibot except RuntimeError: + remove_modules() + pwb = lambda: None pwb.argvu = [] -- To view, visit https://gerrit.wikimedia.org/r/239645 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia9521def534ecb9e5626d092162b2fe326a6022e 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] Update revId upon claim change - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Update revId upon claim change ...................................................................... Update revId upon claim change changeTarget, removeSources: Prevents edit conflicts addSources: No need to set every time through the loop Change-Id: I2d8b69a3894aaf6d58a62ecba48f5dc584617e82 --- M pywikibot/page.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 2c697c0..68c8dff 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -4259,6 +4259,7 @@ **kwargs) # TODO: Re-create the entire item from JSON, not just id self.snak = data['claim']['id'] + self.on_item.latest_revision_id = data['pageinfo']['lastrevid'] def getTarget(self): """ @@ -4338,10 +4339,10 @@ @type claims: list of pywikibot.Claim """ data = self.repo.editSource(self, claims, new=True, **kwargs) + self.on_item.latest_revision_id = data['pageinfo']['lastrevid'] source = defaultdict(list) for claim in claims: claim.hash = data['reference']['hash'] - self.on_item.latest_revision_id = data['pageinfo']['lastrevid'] source[claim.getID()].append(claim) self.sources.append(source) @@ -4361,7 +4362,8 @@ @param sources: the sources to remove @type sources: list of pywikibot.Claim """ - self.repo.removeSources(self, sources, **kwargs) + data = self.repo.removeSources(self, sources, **kwargs) + self.on_item.latest_revision_id = data['pageinfo']['lastrevid'] for source in sources: source_dict = defaultdict(list) source_dict[source.getID()].append(source) -- To view, visit https://gerrit.wikimedia.org/r/239572 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d8b69a3894aaf6d58a62ecba48f5dc584617e82 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] tests: replace sys with tools - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: tests: replace sys with tools ...................................................................... tests: replace sys with tools Use existing tools PY2 and PYTHON_VERSION. While performance is not a consideration, these variables are shorter and more descriptive. Use new tools StringTypes and UnicodeType, are equivalent to the types.StringTypes and types.UnicodeType that were dropped in Python 3. These reduce the need for importing sys and doing version specific logic at the beginning of each module. Change-Id: Ie72f8df1dabe988d62bbc6337512df6b5daf47b7 --- M pywikibot/tools/__init__.py M tests/__init__.py M tests/api_tests.py M tests/archivebot_tests.py M tests/aspects.py M tests/bot_tests.py M tests/family_tests.py M tests/file_tests.py M tests/flow_edit_tests.py M tests/flow_tests.py M tests/http_tests.py M tests/i18n_tests.py M tests/logentry_tests.py M tests/namespace_tests.py M tests/page_tests.py M tests/script_tests.py M tests/site_detect_tests.py M tests/site_tests.py M tests/tk_tests.py M tests/tools_tests.py M tests/ui_tests.py M tests/utils.py M tests/weblib_tests.py 23 files changed, 124 insertions(+), 124 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 8f2c918..f0b7084 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -27,11 +27,15 @@ if not PY2: import queue as Queue - basestring = (str,) - unicode = str + + StringTypes = basestring = (str,) + UnicodeType = unicode = str else: import Queue + StringTypes = types.StringTypes + UnicodeType = types.UnicodeType + from pywikibot.logging import debug _logger = 'tools' diff --git a/tests/__init__.py b/tests/__init__.py index 5fa1e4b..290914d 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -10,7 +10,6 @@ __version__ = '$Id$' import os -import sys import warnings __all__ = ('requests', '_cache_dir', 'TestRequest', @@ -20,23 +19,23 @@ # - requests is mandatory # - future is needed as a fallback for python 2.6, # however if unavailable this will fail on use; see pywikibot/tools.py +# - unittest2; see below # - mwparserfromhell is optional, so is only imported in textlib_tests -try: - import requests # noqa -except ImportError as e: - print("ImportError: %s" % e) - sys.exit(1) +import requests # noqa -if sys.version_info < (2, 7, 3): - # Unittest2 is a backport of python 2.7s unittest module to python 2.6 +from pywikibot.tools import PYTHON_VERSION + +if PYTHON_VERSION < (2, 7, 3): + # unittest2 is a backport of python 2.7s unittest module to python 2.6 # Also use unittest2 for python 2.7.2 (T106512) import unittest2 as unittest else: import unittest +import pywikibot.data.api + from pywikibot import config from pywikibot import i18n -import pywikibot.data.api from pywikibot.data.api import Request as _original_Request from pywikibot.data.api import CachedRequest diff --git a/tests/api_tests.py b/tests/api_tests.py index 21f526b..c707617 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -15,10 +15,14 @@ import pywikibot.data.api as api import pywikibot.family import pywikibot.login -import pywikibot.site import pywikibot.page +import pywikibot.site -from pywikibot.tools import MediaWikiVersion, PY2 +from pywikibot.tools import ( + MediaWikiVersion, + PY2, + UnicodeType, +) from tests.aspects import ( unittest, @@ -30,7 +34,6 @@ if not PY2: from urllib.parse import unquote_to_bytes - unicode = str else: from urllib import unquote_plus as unquote_to_bytes @@ -73,7 +76,7 @@ for param, value in self.assert_parameters.items(): self.assertIn(param, parameters) if value is not None: - if isinstance(value, unicode): + if isinstance(value, UnicodeType): value = value.split('|') self.assertLessEqual(set(value), parameters[param]) return self.data diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py index c77c07c..910cf9f 100644 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -10,15 +10,16 @@ __version__ = '$Id$' from datetime import datetime -import sys + import pywikibot import pywikibot.page -from pywikibot.textlib import TimeStripper -from scripts import archivebot -from tests.aspects import unittest, TestCase -if sys.version_info[0] > 2: - basestring = (str,) +from pywikibot.textlib import TimeStripper +from pywikibot.tools import StringTypes as basestring + +from scripts import archivebot + +from tests.aspects import unittest, TestCase THREADS = { 'als': 4, 'ar': 1, 'bar': 0, 'bg': 0, 'bjn': 1, 'bs': 0, 'ca': 5, 'ckb': 2, diff --git a/tests/aspects.py b/tests/aspects.py index e2b65a7..fa0e486 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -44,11 +44,12 @@ import pywikibot.config2 as config from pywikibot import Site -from pywikibot.exceptions import ServerError, NoUsername -from pywikibot.site import BaseSite -from pywikibot.family import WikimediaFamily from pywikibot.comms import http from pywikibot.data.api import Request as _original_Request +from pywikibot.exceptions import ServerError, NoUsername +from pywikibot.family import WikimediaFamily +from pywikibot.site import BaseSite +from pywikibot.tools import PY2 import tests @@ -57,6 +58,8 @@ add_metaclass, execute_pwb, DrySite, DryRequest, WarningSourceSkipContextManager, ) + +OSWIN32 = (sys.platform == 'win32') class TestCaseBase(unittest.TestCase): @@ -1309,7 +1312,7 @@ if 'PYWIKIBOT2_DIR' in os.environ: self.orig_pywikibot_dir = os.environ['PYWIKIBOT2_DIR'] base_dir = pywikibot.config.base_dir - if sys.platform == 'win32' and sys.version_info[0] < 3: + if OSWIN32 and PY2: base_dir = str(base_dir) os.environ[str('PYWIKIBOT2_DIR')] = base_dir diff --git a/tests/bot_tests.py b/tests/bot_tests.py index 4577029..c95b9d5 100644 --- a/tests/bot_tests.py +++ b/tests/bot_tests.py @@ -15,6 +15,7 @@ import pywikibot.bot from pywikibot import i18n +from pywikibot.tools import PY2 from tests.aspects import ( unittest, DefaultSiteTestCase, SiteAttributeTestCase, TestCase, @@ -229,7 +230,7 @@ self.bot.site = self.de with self.assertRaises(ValueError): self.bot.site - if sys.version_info[0] == 2: + if PY2: # The exc_info still contains the AttributeError :/ sys.exc_clear() self.bot.treat = self._treat(self._generator()) @@ -237,7 +238,7 @@ self.bot.run() with self.assertRaises(ValueError): self.bot.site - if sys.version_info[0] == 2: + if PY2: # The exc_info still contains the AttributeError :/ sys.exc_clear() @@ -290,7 +291,7 @@ post_treat) # TODO: sys.exc_info is empty in Python 3 - if sys.version_info[0] > 2: + if not PY2: exc = None else: exc = KeyboardInterrupt diff --git a/tests/family_tests.py b/tests/family_tests.py index a676af9..d98570d 100644 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -9,11 +9,11 @@ __version__ = '$Id$' -from pywikibot.family import Family, SingleSiteFamily -from pywikibot.exceptions import UnknownFamily -from pywikibot.tools import PY2 - import pywikibot.site + +from pywikibot.exceptions import UnknownFamily +from pywikibot.family import Family, SingleSiteFamily +from pywikibot.tools import StringTypes as basestring from tests.aspects import ( unittest, @@ -22,9 +22,6 @@ PatchingTestCase, ) from tests.utils import DrySite - -if not PY2: - basestring = (str, ) class TestFamily(TestCase): diff --git a/tests/file_tests.py b/tests/file_tests.py index 6dae36c..de459bc 100644 --- a/tests/file_tests.py +++ b/tests/file_tests.py @@ -11,12 +11,9 @@ import pywikibot -from pywikibot.tools import PY2 +from pywikibot.tools import UnicodeType as unicode from tests.aspects import unittest, TestCase, DeprecationTestCase - -if not PY2: - unicode = str class TestShareFiles(TestCase): diff --git a/tests/flow_edit_tests.py b/tests/flow_edit_tests.py index e8d2b33..899274c 100644 --- a/tests/flow_edit_tests.py +++ b/tests/flow_edit_tests.py @@ -11,12 +11,9 @@ from pywikibot.exceptions import LockedPage from pywikibot.flow import Board, Topic, Post -from pywikibot.tools import PY2 +from pywikibot.tools import UnicodeType as unicode from tests.aspects import TestCase - -if not PY2: - unicode = str class TestFlowCreateTopic(TestCase): diff --git a/tests/flow_tests.py b/tests/flow_tests.py index ddb04c1..cf76536 100644 --- a/tests/flow_tests.py +++ b/tests/flow_tests.py @@ -11,19 +11,15 @@ from pywikibot.exceptions import NoPage from pywikibot.flow import Board, Topic, Post -from pywikibot.tools import PY2 +from pywikibot.tools import UnicodeType as unicode from tests.aspects import ( TestCase, ) - from tests.basepage_tests import ( BasePageMethodsTestBase, BasePageLoadRevisionsCachingTestBase, ) - -if not PY2: - unicode = str class TestBoardBasePageMethods(BasePageMethodsTestBase): diff --git a/tests/http_tests.py b/tests/http_tests.py index 8fcbe9b..41c3c29 100644 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -11,7 +11,6 @@ import os import re -import sys import warnings import requests @@ -20,12 +19,13 @@ from pywikibot import config2 as config from pywikibot.comms import http, threadedhttp +from pywikibot.tools import ( + PYTHON_VERSION, + UnicodeType as unicode, +) from tests import _images_dir from tests.aspects import unittest, TestCase, DeprecationTestCase - -if sys.version_info[0] > 2: - unicode = str class HttpTestCase(TestCase): @@ -281,7 +281,7 @@ self.assertNotIn('(;', http.user_agent()) self.assertNotIn(';)', http.user_agent()) self.assertIn('requests/', http.user_agent()) - self.assertIn('Python/' + str(sys.version_info[0]), http.user_agent()) + self.assertIn('Python/' + str(PYTHON_VERSION[0]), http.user_agent()) class CharsetTestCase(TestCase): diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 9ff5913..3b5340d 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -9,16 +9,12 @@ __version__ = '$Id$' -import sys - import pywikibot from pywikibot import i18n, bot, plural +from pywikibot.tools import StringTypes from tests.aspects import unittest, TestCase, DefaultSiteTestCase, PwbTestCase - -if sys.version_info[0] == 3: - basestring = (str, ) class TestTranslate(TestCase): @@ -130,7 +126,7 @@ @classmethod def setUpClass(cls): """Verify that the test translations are not empty.""" - if not isinstance(cls.message_package, basestring): + if not isinstance(cls.message_package, StringTypes): raise TypeError('%s.message_package must be a package name' % cls.__name__) # The call to set_messages_package below exists only to confirm diff --git a/tests/logentry_tests.py b/tests/logentry_tests.py index 7bd126e..b43c770 100644 --- a/tests/logentry_tests.py +++ b/tests/logentry_tests.py @@ -10,19 +10,19 @@ __version__ = '$Id$' import datetime -import sys import pywikibot + from pywikibot.logentries import LogEntryFactory -from pywikibot.tools import MediaWikiVersion +from pywikibot.tools import ( + MediaWikiVersion, + UnicodeType as unicode, +) from tests.aspects import ( unittest, MetaTestCaseClass, TestCase, DeprecationTestCase ) from tests.utils import add_metaclass - -if sys.version_info[0] > 2: - unicode = str class TestLogentriesBase(TestCase): diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py index 7cce7c5..2ed8bf9 100644 --- a/tests/namespace_tests.py +++ b/tests/namespace_tests.py @@ -10,13 +10,15 @@ __version__ = '$Id$' from collections import Iterable -from pywikibot.site import Namespace, NamespacesDict -from tests.aspects import unittest, TestCase, AutoDeprecationTestCase -import sys -if sys.version_info[0] > 2: - basestring = (str, ) - unicode = str +from pywikibot.site import Namespace, NamespacesDict +from pywikibot.tools import ( + PY2, + StringTypes as basestring, + UnicodeType as unicode, +) + +from tests.aspects import unittest, TestCase, AutoDeprecationTestCase # Default namespaces which should work in any MW wiki _base_builtin_ns = { @@ -126,7 +128,7 @@ aliases=[u'Image', u'Immagine'], **kwargs) self.assertEqual(str(y), ':File:') - if sys.version_info[0] <= 2: + if PY2: self.assertEqual(unicode(y), u':ملف:') self.assertEqual(y.canonical_prefix(), ':File:') self.assertEqual(y.custom_prefix(), u':ملف:') diff --git a/tests/page_tests.py b/tests/page_tests.py index a8359a8..079fb3e 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -9,22 +9,22 @@ __version__ = '$Id$' -import sys import pywikibot -from pywikibot import config -from pywikibot import InvalidTitle import pywikibot.page -from pywikibot.tools import PY2 +from pywikibot import config +from pywikibot import InvalidTitle + +from pywikibot.tools import ( + PY2, + StringTypes as basestring, + UnicodeType as unicode, +) from tests.aspects import ( unittest, TestCase, DefaultSiteTestCase, SiteAttributeTestCase, DefaultDrySiteTestCase, DeprecationTestCase, ) - -if sys.version_info[0] > 2: - basestring = (str, ) - unicode = str class TestLinkObject(SiteAttributeTestCase): @@ -568,14 +568,14 @@ page = pywikibot.Page(self.get_site(), u'Ō') self.assertEqual(repr(page), b'Page(\xc5\x8c)') - @unittest.skipIf(sys.version_info[0] > 2, 'Python 2 specific test') + @unittest.skipIf(not PY2, 'Python 2 specific test') def test_unicode_percent_r_failure(self): """Test u'{x!r}'.format(Page(u'<non-ascii>')) raises exception on Python 2.""" # This raises an exception on Python 2, but passes on Python 3 page = pywikibot.Page(self.get_site(), u'Ō') self.assertRaisesRegex(UnicodeDecodeError, '', unicode.format, u'{0!r}', page) - @unittest.skipIf(sys.version_info[0] < 3, 'Python 3+ specific test') + @unittest.skipIf(PY2, 'Python 3+ specific test') def test_unicode_value_py3(self): """Test to capture actual Python 3 result pre unicode_literals.""" self.assertEqual(repr(self.page), "Page('Ō')") diff --git a/tests/script_tests.py b/tests/script_tests.py index 8bbe085..fa07b17 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -11,12 +11,15 @@ import os import sys +from pywikibot.tools import ( + PY2, + PYTHON_VERSION, + StringTypes, +) + from tests import _root_dir from tests.aspects import unittest, DefaultSiteTestCase, MetaTestCaseClass, PwbTestCase from tests.utils import allowed_failure, execute_pwb, add_metaclass - -if sys.version_info[0] > 2: - basestring = (str, ) scripts_path = os.path.join(_root_dir, 'scripts') @@ -36,11 +39,11 @@ 'weblinkchecker.py': ['memento_client'], } -if sys.version_info < (2, 7): +if PYTHON_VERSION < (2, 7): script_deps['replicate_wiki'] = ['argparse'] script_deps['editarticle'] = ['argparse'] -if sys.version_info < (3, 0): +if PY2: script_deps['data_ingestion'] = ['unicodecsv'] @@ -150,7 +153,7 @@ 'upload': 'ERROR: Upload error', } -if sys.version_info[0] > 2: +if not PY2: no_args_expected_results['replicate_wiki'] = ( 'error: the following arguments are required: destination') else: @@ -238,7 +241,7 @@ if self._results and script_name in self._results: error = self._results[script_name] - if isinstance(error, basestring): + if isinstance(error, StringTypes): stdout = None else: stdout, error = error diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index cfde088..2da5730 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -13,12 +13,9 @@ from pywikibot.exceptions import ServerError from pywikibot.site_detect import MWSite -from pywikibot.tools import MediaWikiVersion, PY2 +from pywikibot.tools import MediaWikiVersion from tests.aspects import unittest, TestCase - -if not PY2: - basestring = (str,) class TestWikiSiteDetection(TestCase): diff --git a/tests/site_tests.py b/tests/site_tests.py index 26227d0..85bdefd 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -9,23 +9,26 @@ __version__ = '$Id$' - import json -import sys import os +import re +import sys + from collections import Iterable, Mapping from datetime import datetime, timedelta -import re import pywikibot from pywikibot import config -from pywikibot import async_request, page_put_queue from pywikibot.comms import http from pywikibot.data import api + +from pywikibot import async_request, page_put_queue from pywikibot.tools import ( MediaWikiVersion, PY2, + StringTypes as basestring, + UnicodeType as unicode, ) from tests.aspects import ( @@ -38,12 +41,8 @@ DefaultWikidataClientTestCase, AlteredDefaultSiteTestCase, ) -from tests.utils import allowed_failure, allowed_failure_if, entered_loop from tests.basepage_tests import BasePageLoadRevisionsCachingTestBase - -if sys.version_info[0] > 2: - basestring = (str, ) - unicode = str +from tests.utils import allowed_failure, allowed_failure_if, entered_loop class TokenTestBase(TestCaseBase): @@ -2015,7 +2014,7 @@ self.assertNotIn(not_exists, mysite.siteinfo) self.assertEqual(len(mysite.siteinfo.get(not_exists)), 0) self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists))) - if sys.version_info[0] == 2: + if PY2: self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists).iteritems())) self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists).itervalues())) self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists).iterkeys())) diff --git a/tests/tk_tests.py b/tests/tk_tests.py index cc430fa..42fb2c4 100644 --- a/tests/tk_tests.py +++ b/tests/tk_tests.py @@ -9,12 +9,12 @@ __version__ = '$Id$' - import os -import sys + +from pywikibot.tools import PY2 if os.environ.get('PYWIKIBOT2_TEST_GUI', '0') == '1': - if sys.version_info[0] > 2: + if not PY2: import tkinter as Tkinter else: import Tkinter diff --git a/tests/tools_tests.py b/tests/tools_tests.py index 2c63736..acbb7ac 100644 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -13,7 +13,6 @@ import decimal import os.path import subprocess -import sys import tempfile from pywikibot import tools @@ -430,7 +429,7 @@ deduper = tools.filter_unique(self.strs, container=deduped, key=hash) self._test_dedup_str(deduped, deduper, hash) - @expected_failure_if(sys.version_info[0] >= 3) + @expected_failure_if(not tools.PY2) def test_str_id(self): """Test str using id as key fails on Python 3.""" # str in Python 3 behave like objects. diff --git a/tests/ui_tests.py b/tests/ui_tests.py index fb8ef3c..e47fdbe 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -60,16 +60,16 @@ from pywikibot.bot import ( ui, DEBUG, VERBOSE, INFO, STDOUT, INPUT, WARNING, ERROR, CRITICAL ) -from pywikibot.tools import PY2 +from pywikibot.tools import ( + PY2, + UnicodeType as unicode, +) from pywikibot.userinterfaces import ( terminal_interface_win32, terminal_interface_base, terminal_interface_unix, ) from tests.aspects import TestCase from tests.utils import unittest, FakeModule - -if sys.version_info[0] > 2: - unicode = str class Stream(object): @@ -86,7 +86,7 @@ the patched stream. @type patched_streams: dict """ - self._stream = io.StringIO() if sys.version_info[0] > 2 else io.BytesIO() + self._stream = io.StringIO() if not PY2 else io.BytesIO() self._name = 'std{0}'.format(name) self._original = getattr(sys, self._name) patched_streams[self._original] = self._stream @@ -172,7 +172,7 @@ newstderr = strerr._stream newstdin = strin._stream -if sys.version_info[0] == 2: +if PY2: # In Python 2 the sys.std* streams use bytes instead of unicode # But this module is using unicode_literals so '…' will generate unicode # So it'll convert those back into bytes @@ -229,7 +229,7 @@ unpatch() def _encode(self, string, encoding='utf-8'): - if sys.version_info[0] > 2: + if not PY2: return string else: return string.encode(encoding) diff --git a/tests/utils.py b/tests/utils.py index 6d29604..e5ba6be 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -22,10 +22,10 @@ from types import ModuleType from warnings import warn -if sys.version_info[0] > 2: - import six +from pywikibot.tools import PY2 - unicode = str +if not PY2: + import six import pywikibot @@ -34,10 +34,15 @@ from pywikibot.site import Namespace from pywikibot.data.api import CachedRequest from pywikibot.data.api import Request as _original_Request -from pywikibot.tools import PYTHON_VERSION +from pywikibot.tools import ( + PYTHON_VERSION, + UnicodeType as unicode, +) from tests import _pwb_py from tests import unittest # noqa + +OSWIN32 = (sys.platform == 'win32') class DrySiteNote(RuntimeWarning): @@ -104,7 +109,7 @@ def add_metaclass(cls): """Call six's add_metaclass with the site's __metaclass__ in Python 3.""" - if sys.version_info[0] > 2: + if not PY2: return six.add_metaclass(cls.__metaclass__)(cls) else: assert cls.__metaclass__ @@ -564,7 +569,7 @@ # sys.path may have been modified by the test runner to load dependencies. pythonpath = os.pathsep.join(sys.path) - if sys.platform == 'win32' and sys.version_info[0] < 3: + if OSWIN32 and PY2: pythonpath = str(pythonpath) env[str('PYTHONPATH')] = pythonpath env[str('PYTHONIOENCODING')] = str(config.console_encoding) @@ -574,7 +579,7 @@ env[str('LC_ALL')] = str(pywikibot.config.userinterface_lang) # Set EDITOR to an executable that ignores all arguments and does nothing. - env[str('EDITOR')] = str('call' if sys.platform == 'win32' else 'true') + env[str('EDITOR')] = str('call' if OSWIN32 else 'true') options = { 'stdout': subprocess.PIPE, @@ -587,7 +592,7 @@ p = subprocess.Popen(command, env=env, **options) except TypeError as e: # Generate a more informative error - if sys.platform == 'win32' and sys.version_info[0] < 3: + if OSWIN32 and PY2: unicode_env = [(k, v) for k, v in os.environ.items() if not isinstance(k, str) or not isinstance(v, str)] diff --git a/tests/weblib_tests.py b/tests/weblib_tests.py index d1e93aa..769080c 100644 --- a/tests/weblib_tests.py +++ b/tests/weblib_tests.py @@ -9,8 +9,9 @@ __version__ = '$Id$' -import sys -if sys.version_info[0] > 2: +from pywikibot.tools import PY2 + +if not PY2: from urllib.parse import urlparse else: from urlparse import urlparse -- To view, visit https://gerrit.wikimedia.org/r/239559 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie72f8df1dabe988d62bbc6337512df6b5daf47b7 Gerrit-PatchSet: 5 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: Mattflaschen <mflaschen(a)wikimedia.org> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] Use IOBase for win32 Unicode classes - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Use IOBase for win32 Unicode classes ...................................................................... Use IOBase for win32 Unicode classes UnicodeInput and UnicodeOutput are old-style types without any superclass. As they are IO streams, IOBase is the natural choice for these classes to become new-style classes. Change-Id: I952266b6fc938f8efecb318550987e778dcbbaf6 --- M pywikibot/userinterfaces/win32_unicode.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/userinterfaces/win32_unicode.py b/pywikibot/userinterfaces/win32_unicode.py index db26ddd..f86185b 100755 --- a/pywikibot/userinterfaces/win32_unicode.py +++ b/pywikibot/userinterfaces/win32_unicode.py @@ -31,7 +31,7 @@ from ctypes import byref, c_int, create_unicode_buffer from ctypes import c_void_p as LPVOID -from io import UnsupportedOperation +from io import IOBase, UnsupportedOperation OSWIN32 = (sys.platform == "win32") @@ -61,7 +61,7 @@ ReadConsoleW = WriteConsoleW = None -class UnicodeInput: +class UnicodeInput(IOBase): """Unicode terminal input class.""" @@ -87,7 +87,7 @@ return data -class UnicodeOutput: +class UnicodeOutput(IOBase): """Unicode terminal output class.""" -- To view, visit https://gerrit.wikimedia.org/r/239534 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I952266b6fc938f8efecb318550987e778dcbbaf6 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] Reorganise win32_unicode module - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Reorganise win32_unicode module ...................................................................... Reorganise win32_unicode module Move all imports and classes to the top of the module, with all code enclosed in functions, and clean up the way the unicode objects are obtained by the UI class. ctypes.wintypes.LPVOID is ctypes.c_void_p on all supported versions of Python. Change-Id: I3ebb29b91e99e2652fbd6e02af0e7c491793fe78 --- M pywikibot/userinterfaces/terminal_interface_win32.py M pywikibot/userinterfaces/win32_unicode.py 2 files changed, 179 insertions(+), 146 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/userinterfaces/terminal_interface_win32.py b/pywikibot/userinterfaces/terminal_interface_win32.py index 2c3107b..43db049 100755 --- a/pywikibot/userinterfaces/terminal_interface_win32.py +++ b/pywikibot/userinterfaces/terminal_interface_win32.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """User interface for Win32 terminals.""" # -# (C) Pywikibot team, 2003-2013 +# (C) Pywikibot team, 2003-2015 # # Distributed under the terms of the MIT license. # @@ -11,7 +11,10 @@ import re -from pywikibot.userinterfaces import terminal_interface_base +from pywikibot.userinterfaces import ( + terminal_interface_base, + win32_unicode, +) try: import ctypes @@ -60,7 +63,7 @@ def __init__(self): """Constructor.""" Win32BaseUI.__init__(self) - from .win32_unicode import stdin, stdout, stderr, argv + (stdin, stdout, stderr, argv) = win32_unicode.get_unicode_console() self.stdin = stdin self.stdout = stdout self.stderr = stderr diff --git a/pywikibot/userinterfaces/win32_unicode.py b/pywikibot/userinterfaces/win32_unicode.py index 63af993..db26ddd 100755 --- a/pywikibot/userinterfaces/win32_unicode.py +++ b/pywikibot/userinterfaces/win32_unicode.py @@ -1,5 +1,9 @@ # -*- coding: utf-8 -*- """Stdout, stderr and argv support for unicode.""" +# +# (C) David-Sarah Hopwood, 2010 +# (C) Pywikibot team, 2012-2015 +# ############################################## # Support for unicode in windows cmd.exe # Posted on Stack Overflow [1], available under CC-BY-SA 3.0 [2] @@ -21,12 +25,15 @@ # ################################################ from __future__ import absolute_import, print_function, unicode_literals -from io import UnsupportedOperation + +import codecs import sys -stdin = sys.stdin -stdout = sys.stdout -stderr = sys.stderr -argv = sys.argv + +from ctypes import byref, c_int, create_unicode_buffer +from ctypes import c_void_p as LPVOID +from io import UnsupportedOperation + +OSWIN32 = (sys.platform == "win32") if sys.version_info[0] > 2: unicode = str @@ -34,33 +41,175 @@ else: PY3 = False -if sys.platform == "win32": - import codecs +stdin = sys.stdin +stdout = sys.stdout +stderr = sys.stderr +argv = sys.argv + +original_stderr = sys.stderr + +if OSWIN32: from ctypes import WINFUNCTYPE, windll, POINTER - from ctypes import byref, c_int, create_unicode_buffer from ctypes.wintypes import BOOL, HANDLE, DWORD, LPWSTR, LPCWSTR - try: - from ctypes.wintypes import LPVOID - except ImportError: - from ctypes import c_void_p as LPVOID - original_stderr = sys.stderr +try: + ReadConsoleW = WINFUNCTYPE(BOOL, HANDLE, LPVOID, DWORD, POINTER(DWORD), + LPVOID)(("ReadConsoleW", windll.kernel32)) + WriteConsoleW = WINFUNCTYPE(BOOL, HANDLE, LPWSTR, DWORD, POINTER(DWORD), + LPVOID)(("WriteConsoleW", windll.kernel32)) +except NameError: + ReadConsoleW = WriteConsoleW = None - # If any exception occurs in this code, we'll probably try to print it on stderr, - # which makes for frustrating debugging if stderr is directed to our wrapper. - # So be paranoid about catching errors and reporting them to original_stderr, - # so that we can at least see them. - def _complain(message): - print(isinstance(message, str) and message or repr(message), file=original_stderr) +class UnicodeInput: + + """Unicode terminal input class.""" + + def __init__(self, hConsole, name, bufsize=1024): + """Initialize the input stream.""" + self._hConsole = hConsole + self.bufsize = bufsize + self.buffer = create_unicode_buffer(bufsize) + self.name = name + self.encoding = 'utf-8' + + def readline(self): + """Read one line from the input.""" + maxnum = DWORD(self.bufsize - 1) + numrecv = DWORD(0) + result = ReadConsoleW(self._hConsole, self.buffer, maxnum, byref(numrecv), None) + if not result: + raise Exception("stdin failure") + data = self.buffer.value[:numrecv.value] + if not PY3: + return data.encode(self.encoding) + else: + return data + + +class UnicodeOutput: + + """Unicode terminal output class.""" + + def __init__(self, hConsole, stream, fileno, name): + """Initialize the output stream.""" + self._hConsole = hConsole + self._stream = stream + self._fileno = fileno + self.closed = False + self.softspace = False + self.mode = 'w' + self.encoding = 'utf-8' + self.name = name + self.flush() + + def isatty(self): + """Return whether it's a tty.""" + return False + + def close(self): + """Set the stream to be closed.""" + # don't really close the handle, that would only cause problems + self.closed = True + + def fileno(self): + """Return the fileno.""" + return self._fileno + + def flush(self): + """Flush the stream.""" + if self._hConsole is None: + try: + self._stream.flush() + except Exception as e: + _complain("%s.flush: %r from %r" + % (self.name, e, self._stream)) + raise + + def write(self, text): + """Write the text to the output.""" + try: + if self._hConsole is None: + if isinstance(text, unicode): + text = text.encode('utf-8') + self._stream.write(text) + else: + if not isinstance(text, unicode): + text = bytes(text).decode('utf-8') + remaining = len(text) + while remaining > 0: + n = DWORD(0) + # There is a shorter-than-documented limitation on the + # length of the string passed to WriteConsoleW (see + # <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1232>. + retval = WriteConsoleW(self._hConsole, text, + min(remaining, 10000), + byref(n), None) + if retval == 0 or n.value == 0: + raise IOError("WriteConsoleW returned %r, n.value = %r" + % (retval, n.value)) + remaining -= n.value + if remaining == 0: + break + text = text[n.value:] + except Exception as e: + _complain("%s.write: %r" % (self.name, e)) + raise + + def writelines(self, lines): + """Write a list of lines by using write.""" + try: + for line in lines: + self.write(line) + except Exception as e: + _complain("%s.writelines: %r" % (self.name, e)) + raise + + +def old_fileno(std_name): + """Return the fileno or None if that doesn't work.""" + # some environments like IDLE don't support the fileno operation + # handle those like std streams which don't have fileno at all + std = getattr(sys, 'std{0}'.format(std_name)) + if hasattr(std, 'fileno'): + try: + return std.fileno() + except UnsupportedOperation: + pass + + +# If any exception occurs in this code, we'll probably try to print it on stderr, +# which makes for frustrating debugging if stderr is directed to our wrapper. +# So be paranoid about catching errors and reporting them to original_stderr, +# so that we can at least see them. +def _complain(message): + print(isinstance(message, str) and message or repr(message), file=original_stderr) + + +def register_cp65001(): + """Register codecs cp65001 as utf-8.""" # Work around <http://bugs.python.org/issue6058>. codecs.register(lambda name: name == 'cp65001' and codecs.lookup('utf-8') or None) + +def get_unicode_console(): + """ + Get Unicode console objects. + + @return: stdin, stdout, stderr, argv + @rtype: tuple + """ # Make Unicode console output work independently of the current code page. # This also fixes <http://bugs.python.org/issue1602>. # Credit to Michael Kaplan <http://blogs.msdn.com/b/michkap/archive/2010/04/07/9989346.aspx> # and TZOmegaTZIOY # <https://stackoverflow.com/questions/878972/windows-cmd-encoding-change-caus…>. + + global stdin, stdout, stderr, argv + + if not OSWIN32: + return stdin, stdout, stderr, argv + try: # <https://msdn.microsoft.com/en-us/library/ms683231(VS.85).aspx> # HANDLE WINAPI GetStdHandle(DWORD nStdHandle); @@ -90,17 +239,6 @@ return ((GetFileType(handle) & ~FILE_TYPE_REMOTE) != FILE_TYPE_CHAR or GetConsoleMode(handle, byref(DWORD())) == 0) - def old_fileno(std_name): - """Return the fileno or None if that doesn't work.""" - # some environments like IDLE don't support the fileno operation - # handle those like std streams which don't have fileno at all - std = getattr(sys, 'std{0}'.format(std_name)) - if hasattr(std, 'fileno'): - try: - return std.fileno() - except UnsupportedOperation: - pass - old_stdin_fileno = old_fileno('in') old_stdout_fileno = old_fileno('out') old_stderr_fileno = old_fileno('err') @@ -127,120 +265,7 @@ if not_a_console(hStderr): real_stderr = False - if real_stdin: - ReadConsoleW = WINFUNCTYPE(BOOL, HANDLE, LPVOID, DWORD, POINTER(DWORD), - LPVOID)(("ReadConsoleW", windll.kernel32)) - - class UnicodeInput: - - """Unicode terminal input class.""" - - def __init__(self, hConsole, name, bufsize=1024): - """Initialize the input stream.""" - self._hConsole = hConsole - self.bufsize = bufsize - self.buffer = create_unicode_buffer(bufsize) - self.name = name - self.encoding = 'utf-8' - - def readline(self): - """Read one line from the input.""" - maxnum = DWORD(self.bufsize - 1) - numrecv = DWORD(0) - result = ReadConsoleW(self._hConsole, self.buffer, maxnum, byref(numrecv), None) - if not result: - raise Exception("stdin failure") - data = self.buffer.value[:numrecv.value] - if not PY3: - return data.encode(self.encoding) - else: - return data - if real_stdout or real_stderr: - # BOOL WINAPI WriteConsoleW(HANDLE hOutput, LPWSTR lpBuffer, DWORD nChars, - # LPDWORD lpCharsWritten, LPVOID lpReserved); - - WriteConsoleW = WINFUNCTYPE(BOOL, HANDLE, LPWSTR, DWORD, POINTER(DWORD), - LPVOID)(("WriteConsoleW", windll.kernel32)) - - class UnicodeOutput: - - """Unicode terminal output class.""" - - def __init__(self, hConsole, stream, fileno, name): - """Initialize the output stream.""" - self._hConsole = hConsole - self._stream = stream - self._fileno = fileno - self.closed = False - self.softspace = False - self.mode = 'w' - self.encoding = 'utf-8' - self.name = name - self.flush() - - def isatty(self): - """Return whether it's a tty.""" - return False - - def close(self): - """Set the stream to be closed.""" - # don't really close the handle, that would only cause problems - self.closed = True - - def fileno(self): - """Return the fileno.""" - return self._fileno - - def flush(self): - """Flush the stream.""" - if self._hConsole is None: - try: - self._stream.flush() - except Exception as e: - _complain("%s.flush: %r from %r" - % (self.name, e, self._stream)) - raise - - def write(self, text): - """Write the text to the output.""" - try: - if self._hConsole is None: - if isinstance(text, unicode): - text = text.encode('utf-8') - self._stream.write(text) - else: - if not isinstance(text, unicode): - text = bytes(text).decode('utf-8') - remaining = len(text) - while remaining > 0: - n = DWORD(0) - # There is a shorter-than-documented limitation on the - # length of the string passed to WriteConsoleW (see - # <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1232>. - retval = WriteConsoleW(self._hConsole, text, - min(remaining, 10000), - byref(n), None) - if retval == 0 or n.value == 0: - raise IOError("WriteConsoleW returned %r, n.value = %r" - % (retval, n.value)) - remaining -= n.value - if remaining == 0: - break - text = text[n.value:] - except Exception as e: - _complain("%s.write: %r" % (self.name, e)) - raise - - def writelines(self, lines): - """Write a list of lines by using write.""" - try: - for line in lines: - self.write(line) - except Exception as e: - _complain("%s.writelines: %r" % (self.name, e)) - raise - if real_stdin: stdin = UnicodeInput(hStdin, name='<Unicode console stdin>') @@ -294,3 +319,8 @@ if argv == []: argv = [u''] + + return stdin, stdout, stderr, argv + +if OSWIN32: + register_cp65001() -- To view, visit https://gerrit.wikimedia.org/r/239540 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ebb29b91e99e2652fbd6e02af0e7c491793fe78 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] [FIX] Remove deprecation of returndict - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] Remove deprecation of returndict ...................................................................... [FIX] Remove deprecation of returndict In bb29dafe the parameter `returndict` of `APISite.newpages` has been deprecated and is replaced by nothing. But the function still supports that parameter. Change-Id: Iaadce9c3f8eca22c4fb9d7277b83b43eea66e655 --- M pywikibot/site.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 9aaceed..8aa221a 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -5767,7 +5767,6 @@ @deprecated_args(number='total', repeat=None, namespace="namespaces", - returndict=None, rcshow=None, rc_show=None, get_redirect=None) -- To view, visit https://gerrit.wikimedia.org/r/239558 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaadce9c3f8eca22c4fb9d7277b83b43eea66e655 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] [FIX] site_tests: Expect long if necessary - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] site_tests: Expect long if necessary ...................................................................... [FIX] site_tests: Expect long if necessary On the appveyor Windows builds, the maximum int number is to low to represent the timestamp in an int and it uses a long. But the test explicitly requires an int which is technically not possible. Bug: T113146 Change-Id: I7c054c55cbb3334eed14faabdb09a69cbb18b48c --- M tests/site_tests.py 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index 2b41257..26227d0 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -22,8 +22,11 @@ from pywikibot import config from pywikibot import async_request, page_put_queue from pywikibot.comms import http -from pywikibot.tools import MediaWikiVersion from pywikibot.data import api +from pywikibot.tools import ( + MediaWikiVersion, + PY2, +) from tests.aspects import ( unittest, TestCase, DeprecationTestCase, @@ -1062,7 +1065,8 @@ self.assertIsInstance(entry, tuple) self.assertIsInstance(entry[0], pywikibot.Page) self.assertIsInstance(entry[1], basestring) - self.assertIsInstance(entry[2], int) + self.assertIsInstance( + entry[2], long if PY2 and entry[2] > sys.maxint else int) # noqa self.assertIsInstance(entry[3], basestring) def test_logpages_dump(self): -- To view, visit https://gerrit.wikimedia.org/r/239566 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c054c55cbb3334eed14faabdb09a69cbb18b48c 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

Failed: wikimedia/pywikibot-core#2871 (master - 1abc3fb)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2871 Status: Failed Duration: 30 minutes and 3 seconds Commit: 1abc3fb (master) Author: Fabian Neundorf Message: [FIX] editor: Close temporary file handle When using `mkstemp` the file handle must be closed before removing the file. This was first fixed with 3a4d1844 but the `editor` module also uses `mkstemp` and is not closing the handle. Change-Id: I773aff3000fa26b04dcc9b5151fe11a726c0247c View the changeset: https://github.com/wikimedia/pywikibot-core/compare/506deae2118c...1abc3fb9… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/81161362 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 7 months

Failed: wikimedia/pywikibot-core#2870 (master - 506deae)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2870 Status: Failed Duration: 33 minutes and 0 seconds Commit: 506deae (master) Author: jenkins-bot Message: Merge "Move setting of prop=proofread in Request._add_defaults()" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/3a4d1844efc4...506deae2… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/81159875 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2015