Pywikibot-commits July 2015

pywikibot-commits@lists.wikimedia.org

2 participants
224 discussions

Fixed: wikimedia/pywikibot-core#2581 (master - 576cad9)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2581 Status: Fixed Duration: 28 minutes and 5 seconds Commit: 576cad9 (master) Author: jenkins-bot Message: Merge "Report nose version" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/7be4d0855506...576cad97… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/72577661 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 9 months

Fixed: wikimedia/pywikibot-core#2580 (master - 7be4d08)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2580 Status: Fixed Duration: 28 minutes and 42 seconds Commit: 7be4d08 (master) Author: jenkins-bot Message: Merge "New Wikipedia site: azb" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/81798911b0d1...7be4d085… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/72577544 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 9 months

[Gerrit] [IMPROV] docs: rewrite docstring fixups - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] docs: rewrite docstring fixups ...................................................................... [IMPROV] docs: rewrite docstring fixups Instead of using one long list comprehension it's now modifying the list in-place and using a normal for-loop and an if-elif block. Change-Id: I9d5c09c6ac9b3c06b320d607165aac6bc20ff21c --- M docs/conf.py 1 file changed, 19 insertions(+), 14 deletions(-) Approvals: XZise: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index 2e59f19..223e4ad 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -252,20 +252,25 @@ def pywikibot_script_docstring_fixups( app, what, name, obj, options, lines): """Pywikibot specific conversions.""" - result = ['This script supports use of :py:mod:`pywikibot.pagegenerators` arguments.' - if l in ('&params;', '&pagegenerators_help;') - else ' The available fixes are listed in :py:mod:`pywikibot.fixes`.' - if l == '&fixes-help;' - else l + ':' - if l.endswith(':') and not l.strip().startswith(':') and 'Traceback (most recent call last)' not in l - else ' ' + l if l.startswith('-') - else l.replace(' ', ' ') - if l.startswith(' ') - else ' ' + l.strip() - if l.strip().startswith('python') - else l - for l in lines] - lines[:] = result[:] + for index, line in enumerate(lines): + if line in ('&params;', '&pagegenerators_help;'): + lines[index] = ('This script supports use of ' + ':py:mod:`pywikibot.pagegenerators` arguments.') + elif line == '&fixes-help;': + lines[index] = (' The available fixes are listed ' + 'in :py:mod:`pywikibot.fixes`.') + elif (line.endswith(':') and not line.strip().startswith(':') and + 'Traceback (most recent call last)' not in line): + lines[index] = line + ':' + elif line.startswith('-'): + # Indent options + lines[index] = ' ' + line + elif line.startswith(' '): + # Indent description of options (as options are indented) + lines[index] = line.replace(' ', ' ') + elif line.strip().startswith('python'): + # Indent commands + lines[index] = ' ' + line.strip() def setup(app): -- To view, visit https://gerrit.wikimedia.org/r/225857 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d5c09c6ac9b3c06b320d607165aac6bc20ff21c 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: 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, 9 months

[Gerrit] Report nose version - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Report nose version ...................................................................... Report nose version Change-Id: I088b49b1e747512359ac7ef84b13c35182cbaf9d --- M .travis.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index c8fb5c7..a67021e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,6 +68,7 @@ - python -c "import setuptools; print(setuptools.__version__)" - if [[ "$USE_NOSE" == "1" ]]; then + nosetests --version ; if [[ "$SITE_ONLY" == "1" ]]; then echo "Running site tests only code ${LANGUAGE} on family ${FAMILY}" ; python setup.py nosetests --tests tests --verbosity=2 -a "family=$FAMILY,code=$LANGUAGE" ; -- To view, visit https://gerrit.wikimedia.org/r/226763 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I088b49b1e747512359ac7ef84b13c35182cbaf9d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 9 months

[Gerrit] New Wikipedia site: azb - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: New Wikipedia site: azb ...................................................................... New Wikipedia site: azb Change-Id: I754d7a4407688918349c5baaec331bd6694f6740 --- M pywikibot/families/wikipedia_family.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index fb7893d..1caf63c 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -80,6 +80,7 @@ 'mai', 'pih', 'got', 'xh', 'bi', 'sm', 'ss', 'rn', 'ki', 'pnt', 'bm', 'iu', 'ee', 'lg', 'ts', 'fj', 'ak', 'ik', 'st', 'sg', 'ff', 'dz', 'ny', 'ch', 'ti', 've', 'ks', 'tum', 'cr', 'gom', 'lrc', + 'azb', ] # Sites we want to edit but not count as real languages -- To view, visit https://gerrit.wikimedia.org/r/226759 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I754d7a4407688918349c5baaec331bd6694f6740 Gerrit-PatchSet: 1 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 9 months

[Gerrit] Add many test modules to mandatory list - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Add many test modules to mandatory list ...................................................................... Add many test modules to mandatory list Fix a few docstrings where necessary to pass mandatory rules. Change-Id: I45e48a744accff8f1be94cb809f557b982984ffe --- M tests/aspects.py M tests/data_ingestion_tests.py M tests/deletionbot_tests.py M tests/flow_tests.py M tests/http_tests.py M tests/namespace_tests.py M tests/thread_tests.py M tests/tk_tests.py M tests/weblib_tests.py M tests/wikistats_tests.py M tox.ini 11 files changed, 88 insertions(+), 6 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index df0a07c..4c9b8c6 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -380,6 +380,7 @@ """Site interface to prevent sites being loaded.""" def __init__(self, code, fam=None, user=None, sysop=None): + """Constructor.""" raise pywikibot.SiteDefinitionError( 'Loading site %s:%s during dry test not permitted' % (fam, code)) @@ -1021,6 +1022,12 @@ @classmethod def override_default_site(cls, site): + """ + Override the default site. + + @param site: site tests should use + @type site: BaseSite + """ print('%s using %s instead of %s:%s.' % (cls.__name__, site, cls.family, cls.code)) cls.site = site @@ -1278,6 +1285,7 @@ @classmethod def setUpClass(cls): + """Set up test class.""" if os.environ.get('PYWIKIBOT2_TEST_NO_RC', '0') == '1': raise unittest.SkipTest('RecentChanges tests disabled.') @@ -1293,6 +1301,7 @@ @classmethod def setUpClass(cls): + """Set up test class.""" if not __debug__: raise unittest.SkipTest( '%s is disabled when __debug__ is disabled.' % cls.__name__) @@ -1306,6 +1315,7 @@ _generic_match = re.compile(r'.* is deprecated(, use .* instead)?\.') def __init__(self, *args, **kwargs): + """Constructor.""" super(DeprecationTestCase, self).__init__(*args, **kwargs) self.warning_log = [] @@ -1318,15 +1328,18 @@ self.context_manager = warnings.catch_warnings(record=True) def _reset_messages(self): + """Reset captured deprecation warnings.""" self._do_test_warning_filename = True del self.warning_log[:] @property def deprecation_messages(self): + """Return captured deprecation warnings.""" messages = [str(item.message) for item in self.warning_log] return messages def assertDeprecation(self, msg=None): + """Assert that a deprecation warning happened.""" if msg is None: self.assertGreater(sum(1 for msg in self.deprecation_messages if self._generic_match.match(msg)), 0) @@ -1343,20 +1356,24 @@ self._reset_messages() def assertNoDeprecation(self, msg=None): + """Assert that no deprecation warning happened.""" if msg: self.assertNotIn(msg, self.deprecation_messages) else: self.assertEqual([], self.deprecation_messages) def assertDeprecationClass(self, cls): + """Assert that all deprecation warning are of one class.""" self.assertTrue(all(isinstance(item.message, cls) for item in self.warning_log)) def assertDeprecationFile(self, filename): + """Assert that all deprecation warning are of one filename.""" for item in self.warning_log: self.assertEqual(item.filename, filename) def setUp(self): + """Set up unit test.""" super(DeprecationTestCase, self).setUp() self.warning_log = self.context_manager.__enter__() @@ -1365,6 +1382,7 @@ self._reset_messages() def tearDown(self): + """Tear down unit test.""" self.context_manager.__exit__() super(DeprecationTestCase, self).tearDown() diff --git a/tests/data_ingestion_tests.py b/tests/data_ingestion_tests.py index 17e96ac..a5c2ff8 100644 --- a/tests/data_ingestion_tests.py +++ b/tests/data_ingestion_tests.py @@ -32,6 +32,7 @@ } def setUp(self): + """Set up unit test.""" super(TestPhoto, self).setUp() self.obj = data_ingestion.Photo( URL='http://upload.wikimedia.org/wikipedia/commons/f/fc/MP_sounds.png', @@ -54,10 +55,12 @@ self.assertIn('MP sounds.png', [dup.replace("_", " ") for dup in duplicates]) def test_getTitle(self): + """Test getTitle().""" self.assertEqual(self.obj.getTitle('%(name)s - %(set)s.%(_ext)s'), 'Sound icon - Crystal SVG icon set.png') def test_getDescription(self): + """Test getDescription().""" self.assertEqual(self.obj.getDescription('CrystalTemplate'), """{{CrystalTemplate |author=KDE artists {{!}} Silstor @@ -77,6 +80,7 @@ code = 'commons' def setUp(self): + """Set up unit test.""" super(TestCSVReader, self).setUp() with open(os.path.join(_data_dir, 'csv_ingestion.csv')) as fileobj: self.iterator = data_ingestion.CSVReader(fileobj, 'url', @@ -84,14 +88,17 @@ self.obj = next(self.iterator) def test_PhotoURL(self): + """Test PhotoURL().""" self.assertEqual(self.obj.URL, 'http://upload.wikimedia.org/wikipedia/commons/f/fc/MP_sounds.png') def test_getTitle(self): + """Test getTitle().""" self.assertEqual(self.obj.getTitle('%(name)s - %(set)s.%(_ext)s'), 'Sound icon - Crystal SVG icon set.png') def test_getDescription(self): + """Test getDescription().""" self.assertEqual(self.obj.getDescription('CrystalTemplate'), """{{CrystalTemplate |author=KDE artists {{!}} Silstor diff --git a/tests/deletionbot_tests.py b/tests/deletionbot_tests.py index c1050df..f4a31fd 100644 --- a/tests/deletionbot_tests.py +++ b/tests/deletionbot_tests.py @@ -61,6 +61,7 @@ write = True def test_delete_mark(self): + """Test marking User:Unicodesnowman/DeleteMark for deletion.""" site = self.get_site() if site.username(sysop=True): raise unittest.SkipTest('can\'t test mark with sysop account') @@ -90,6 +91,7 @@ undelete_args = [] def setUp(self): + """Set up unit test.""" self._original_delete = pywikibot.Page.delete self._original_undelete = pywikibot.Page.undelete pywikibot.Page.delete = delete_dummy @@ -97,11 +99,13 @@ super(TestDeletionBot, self).setUp() def tearDown(self): + """Tear down unit test.""" pywikibot.Page.delete = self._original_delete pywikibot.Page.undelete = self._original_undelete super(TestDeletionBot, self).tearDown() def test_dry(self): + """Test dry run of bot.""" delete.main('-page:Main Page', '-always', '-summary:foo') self.assertEqual(self.delete_args, ['[[Main Page]]', 'foo', False, True]) delete.main('-page:FoooOoOooO', '-always', '-summary:foo', '-undelete') @@ -109,10 +113,12 @@ def delete_dummy(self, reason, prompt, mark): + """Dummy delete method.""" TestDeletionBot.delete_args = [self.title(asLink=True), reason, prompt, mark] def undelete_dummy(self, reason): + """Dummy undelete method.""" TestDeletionBot.undelete_args = [self.title(asLink=True), reason] diff --git a/tests/flow_tests.py b/tests/flow_tests.py index 2e95c48..8c4f85d 100644 --- a/tests/flow_tests.py +++ b/tests/flow_tests.py @@ -30,6 +30,7 @@ code = 'mediawiki' def setUp(self): + """Set up unit test.""" self._page = pywikibot.flow.Board( self.site, 'Talk:Sandbox') super(TestBoardBasePageMethods, self).setUp() @@ -54,6 +55,7 @@ code = 'mediawiki' def setUp(self): + """Set up unit test.""" self._page = pywikibot.flow.Board( self.site, 'Talk:Sandbox') super(TestLoadRevisionsCaching, self).setUp() diff --git a/tests/http_tests.py b/tests/http_tests.py index 9ecebae..8804345 100644 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -192,6 +192,7 @@ net = False def test_user_agent(self): + """Test http.user_agent function.""" self.assertEqual('', http.user_agent(format_string=' ')) self.assertEqual('', http.user_agent(format_string=' ')) self.assertEqual('a', http.user_agent(format_string=' a ')) @@ -209,6 +210,7 @@ http.user_agent(format_string='SVN/1.7.5 {pwb}')) def test_user_agent_username(self): + """Test http.user_agent_username function.""" self.assertEqual('%25', http.user_agent_username('%')) self.assertEqual('%2525', http.user_agent_username('%25')) self.assertEqual(';', http.user_agent_username(';')) @@ -220,6 +222,7 @@ self.assertEqual('%E2%81%82', http.user_agent_username(u'⁂')) def test_version(self): + """Test http.user_agent {version}.""" old_cache = pywikibot.version.cache try: pywikibot.version.cache = None @@ -240,11 +243,13 @@ net = False def setUp(self): + """Set up unit test.""" self.orig_format = config.user_agent_format config.user_agent_format = ('{script_product} ({script_comments}) {pwb} ' '({revision}) {http_backend} {python}') def tearDown(self): + """Tear down unit test.""" config.user_agent_format = self.orig_format def test_default_user_agent(self): @@ -272,6 +277,7 @@ @staticmethod def _create_request(charset=None, data=UTF8_BYTES): + """Helper method.""" req = threadedhttp.HttpRequest('', charset=charset) resp = requests.Response() resp.headers = {'content-type': 'charset=utf-8'} @@ -345,6 +351,7 @@ @classmethod def setUpClass(cls): + """Set up test class.""" super(BinaryTestCase, cls).setUpClass() with open(os.path.join(_images_dir, 'MP_sounds.png'), 'rb') as f: diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py index 1638114..f2e2373 100644 --- a/tests/namespace_tests.py +++ b/tests/namespace_tests.py @@ -53,7 +53,7 @@ net = False def testNamespaceTypes(self): - """Test cases for methods manipulating namespace names.""" + """Test cases for methods manipulating Namespace names.""" ns = Namespace.builtin_namespaces(use_image_name=False) self.assertIsInstance(ns, dict) @@ -71,6 +71,7 @@ self.assertEqual(ns[ns[6]], ns[6]) def testNamespaceConstructor(self): + """Test Namespace constructor.""" kwargs = {u'case': u'first-letter'} y = Namespace(id=6, custom_name=u'dummy', canonical_name=u'File', aliases=[u'Image', u'Immagine'], **kwargs) @@ -104,6 +105,7 @@ self.assertIn(u'Immagine', y) def testNamespaceToString(self): + """Test Namespace __str__ and __unicode__.""" ns = Namespace.builtin_namespaces(use_image_name=False) self.assertEqual(str(ns[0]), ':') @@ -125,6 +127,7 @@ self.assertEqual(y.custom_prefix(), u':ملف:') def testNamespaceCompare(self): + """Test Namespace comparisons.""" a = Namespace(id=0, canonical_name=u'') self.assertEqual(a, 0) @@ -209,8 +212,8 @@ net = False - def test_resolve(self): - """Test Namespace.resolve.""" + def test_resolve_equal(self): + """Test Namespace.resolve success.""" namespaces = Namespace.builtin_namespaces(use_image_name=False) main_ns = namespaces[0] file_ns = namespaces[6] @@ -245,6 +248,8 @@ self.assertEqual(Namespace.resolve(':Image'), [file_ns]) self.assertEqual(Namespace.resolve(':Image:'), [file_ns]) + def test_resolve_exceptions(self): + """Test Namespace.resolve failure.""" self.assertRaises(TypeError, Namespace.resolve, [True]) self.assertRaises(TypeError, Namespace.resolve, [False]) self.assertRaises(TypeError, Namespace.resolve, [None]) diff --git a/tests/thread_tests.py b/tests/thread_tests.py index 326a606..7dfdaf6 100644 --- a/tests/thread_tests.py +++ b/tests/thread_tests.py @@ -20,17 +20,20 @@ net = False def test_run_from_iterable(self): + """Test thread running with iterable target.""" iterable = 'abcd' thd_gen = ThreadedGenerator(target=iterable) thd_gen.start() self.assertEqual(list(thd_gen), list(iterable)) def gen_func(self): + """Helper method for generator test.""" iterable = 'abcd' for i in iterable: yield i def test_run_from_gen_function(self): + """Test thread running with generator as target.""" iterable = 'abcd' thd_gen = ThreadedGenerator(target=self.gen_func) thd_gen.start() @@ -42,6 +45,7 @@ """Base class for intersect_generators test cases.""" def assertEqualItertools(self, gens): + """Assert intersect_generators result is same as set intersection.""" # If they are a generator, we need to convert to a list # first otherwise the generator is empty the second time. datasets = [list(gen) for gen in gens] @@ -62,9 +66,11 @@ net = False def test_intersect_basic(self): + """Test basic interset without duplicates.""" self.assertEqualItertools(['abc', 'db', 'ba']) def test_intersect_with_dups(self): + """Test basic interset with duplicates.""" self.assertEqualItertools(['aabc', 'dddb', 'baa']) diff --git a/tests/tk_tests.py b/tests/tk_tests.py index 8fc10af..e625e98 100644 --- a/tests/tk_tests.py +++ b/tests/tk_tests.py @@ -33,11 +33,13 @@ @classmethod def setUpClass(cls): + """Set up test class.""" if os.environ.get('PYWIKIBOT2_TEST_GUI', '0') != '1': raise unittest.SkipTest('Tkdialog tests are disabled on Travis-CI') super(TestTkdialog, cls).setUpClass() def testTkdialog(self): + """Test Tk dialog.""" try: box = Tkdialog('foo', 'tests/data/MP_sounds.png', 'MP_sounds.png') box.show_dialog() @@ -53,11 +55,13 @@ @classmethod def setUpClass(cls): + """Set up test class.""" if os.environ.get('PYWIKIBOT2_TEST_GUI', '0') != '1': raise unittest.SkipTest('Tkinter tests are disabled on Travis-CI') super(TestTkinter, cls).setUpClass() def testTkinter(self): + """Test Tkinter window.""" root = Tkinter.Tk() root.resizable(width=Tkinter.FALSE, height=Tkinter.FALSE) root.title("pywikibot GUI") diff --git a/tests/weblib_tests.py b/tests/weblib_tests.py index 18fa710..7c4ae97 100644 --- a/tests/weblib_tests.py +++ b/tests/weblib_tests.py @@ -37,6 +37,7 @@ self.assertIn('closest', response.content) def testInternetArchiveNewest(self): + """Test Internet Archive for newest https://google.com.""" with PatchedHttp(weblib, False) as p: p.after_fetch = self._test_response archivedversion = weblib.getInternetArchiveURL('https://google.com') @@ -46,6 +47,7 @@ self.assertTrue(parsed.path.strip('/').endswith('www.google.com'), parsed.path) def testInternetArchiveOlder(self): + """Test Internet Archive for https://google.com as of June 2006.""" with PatchedHttp(weblib, False) as p: p.after_fetch = self._test_response archivedversion = weblib.getInternetArchiveURL('https://google.com', '200606') @@ -68,6 +70,7 @@ @unittest.expectedFailure def testWebCiteOlder(self): + """Test WebCite for https://google.com as of January 2013.""" archivedversion = weblib.getWebCitationURL('https://google.com', '20130101') self.assertEqual(archivedversion, 'http://www.webcitation.org/6DHSeh2L0') diff --git a/tests/wikistats_tests.py b/tests/wikistats_tests.py index 6a2dca0..6f2dff3 100644 --- a/tests/wikistats_tests.py +++ b/tests/wikistats_tests.py @@ -31,6 +31,7 @@ } def test_sort(self): + """Test sorted results.""" ws = WikiStats() data = ws.sorted('wikipedia', 'total') top = data[0] @@ -42,6 +43,7 @@ self.assertEqual(ws.languages_by_size('wikisource')[0], 'fr') def test_csv(self): + """Test CSV.""" if not csv: raise unittest.SkipTest('unicodecsv not installed.') ws = WikiStats() @@ -53,6 +55,7 @@ data = ws.get_dict def test_xml(self): + """Test XML.""" ws = WikiStats() data = ws.get_dict('wikisource', 'xml') self.assertIsInstance(data, dict) diff --git a/tox.ini b/tox.ini index d85d20b..28b2087 100644 --- a/tox.ini +++ b/tox.ini @@ -111,32 +111,53 @@ scripts/watchlist.py \ setup.py \ tests/__init__.py \ + tests/aspects.py \ tests/utils.py \ tests/archivebot_tests.py \ tests/basepage_tests.py \ - tests/category_tests.py \ + tests/bot_tests.py \ tests/cache_tests.py \ + tests/category_tests.py \ + tests/checkimages_tests.py \ tests/cosmetic_changes_tests.py \ + tests/data_ingestion_tests.py \ tests/date_tests.py \ + tests/deletionbot_tests.py \ + tests/disambredir_tests.py \ + tests/djvu_tests.py \ tests/edit_tests.py \ tests/edit_failure_tests.py \ tests/exceptions_tests.py \ tests/family_tests.py \ tests/file_tests.py \ + tests/flow_tests.py \ + tests/http_tests.py \ tests/i18n/ \ + tests/interwiki_graph_tests.py \ + tests/interwiki_link_tests.py \ tests/l10n_tests.py \ tests/link_tests.py \ - tests/interwiki_graph_tests.py \ + tests/logentry_tests.py \ + tests/mediawikiversion_tests.py \ + tests/namespace_tests.py \ + tests/proofreadpage_tests.py \ + tests/protectbot_tests.py \ tests/pwb/ \ tests/pwb_tests.py \ tests/script_tests.py \ + tests/tests_tests.py \ tests/timestripper_tests.py \ + tests/thread_tests.py \ + tests/tk_tests.py \ tests/tools_chars_tests.py \ tests/tools_ip_tests.py \ tests/tools_tests.py \ tests/ui_options_tests.py \ tests/upload_tests.py \ - tests/wikidataquery_tests.py + tests/uploadbot_tests.py \ + tests/weblib_tests.py \ + tests/wikidataquery_tests.py \ + tests/wikistats_tests.py deps = flake8>=2.2.5 flake8-docstrings -- To view, visit https://gerrit.wikimedia.org/r/226699 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45e48a744accff8f1be94cb809f557b982984ffe 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: Mattflaschen <mflaschen(a)wikimedia.org> 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, 9 months

[Gerrit] Fix indents and enable E122 and E127 (mandatory) - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix indents and enable E122 and E127 (mandatory) ...................................................................... Fix indents and enable E122 and E127 (mandatory) Change-Id: Ib1a0e42e10c78eb73d0deb376496c6f5bf56cb48 --- M pywikibot/bot_choice.py M pywikibot/comms/rcstream.py M pywikibot/comms/threadedhttp.py M pywikibot/config2.py M pywikibot/data/api.py M pywikibot/diff.py M pywikibot/page.py M pywikibot/textlib.py M scripts/add_text.py M scripts/category.py M scripts/clean_sandbox.py M scripts/flickrripper.py M scripts/imagerecat.py M scripts/pagefromfile.py M scripts/upload.py M tox.ini 16 files changed, 48 insertions(+), 44 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/bot_choice.py b/pywikibot/bot_choice.py index 3db1958..5a56915 100755 --- a/pywikibot/bot_choice.py +++ b/pywikibot/bot_choice.py @@ -111,7 +111,7 @@ shortcut = self.shortcut.upper() if index >= 0: return '{0}[{1}]{2}'.format(self.option[:index], shortcut, - self.option[index + len(self.shortcut):]) + self.option[index + len(self.shortcut):]) else: return '{0} [{1}]'.format(self.option, shortcut) diff --git a/pywikibot/comms/rcstream.py b/pywikibot/comms/rcstream.py index 7f15404..710163d 100644 --- a/pywikibot/comms/rcstream.py +++ b/pywikibot/comms/rcstream.py @@ -103,7 +103,7 @@ def on_connect(self): debug('Connected to %r; subscribing to %s' - % (thread, thread.wikihost), + % (thread, thread.wikihost), _logger) self.emit('subscribe', thread.wikihost) debug('Subscribed to %s' % thread.wikihost, _logger) diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py index 786d521..6c6f72a 100644 --- a/pywikibot/comms/threadedhttp.py +++ b/pywikibot/comms/threadedhttp.py @@ -138,9 +138,10 @@ if (self.header_encoding and codecs.lookup(self.header_encoding) != (codecs.lookup(charset) if charset else None)): if charset: - pywikibot.warning(u'Encoding "{0}" requested but "{1}" ' - 'received in the header.'.format( - charset, self.header_encoding)) + pywikibot.warning( + 'Encoding "{0}" requested but "{1}" ' + 'received in the header.'.format( + charset, self.header_encoding)) try: # TODO: Buffer decoded content, weakref does remove it too # early (directly after this method) diff --git a/pywikibot/config2.py b/pywikibot/config2.py index fcbc8de..40a5031 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -881,7 +881,7 @@ # System-level and User-level changes. # Store current variables and their types. _glv = dict((_key, _val) for _key, _val in globals().items() - if _key[0] != '_' and _key not in _imports) + if _key[0] != '_' and _key not in _imports) _gl = list(_glv.keys()) _tp = {} for _key in _gl: diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 0d94f79..d864abf 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -611,7 +611,7 @@ else: params['modules'] = [mod for mod in module_batch if not mod.startswith('query+') and - mod not in self.root_modules] + mod not in self.root_modules] params['querymodules'] = [mod[6:] for mod in module_batch if mod.startswith('query+')] @@ -717,7 +717,7 @@ if param['name'] == 'generator': break assert param['name'] == 'generator' and \ - submodules >= set(param['type']) + submodules >= set(param['type']) def _normalize_modules(self, modules): """Add query+ to any query module name not also in action modules.""" diff --git a/pywikibot/diff.py b/pywikibot/diff.py index 9a5ec48..b1136b4 100644 --- a/pywikibot/diff.py +++ b/pywikibot/diff.py @@ -457,7 +457,8 @@ first = self.b[super_hunk[0].b_rng[0]] hunk_list += [(status, index, Hunk.get_header_text( - *self._get_context_range(super_hunk), affix=''), + *self._get_context_range(super_hunk), + affix=''), mode, first)] rng_width = max(len(hunk_list[-1][2]), rng_width) line_template = ('{0}{1} {2: >' + diff --git a/pywikibot/page.py b/pywikibot/page.py index 1f94132..278ed54 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2621,7 +2621,7 @@ # The complete list can be removed, it'll either yield all of # them, or only a portion but will skip the rest anyway cached += cache.pop(timestamp)[:None if total is None else - total - len(cached)] + total - len(cached)] if total and len(cached) >= total: break # already got enough assert total is None or len(cached) <= total, \ @@ -3188,10 +3188,10 @@ # if none of the above applies, this item is in an invalid state # which needs to be raise as an exception, but also logged in case # an exception handler is catching the generic Error. - pywikibot.error('%s is in invalid state' % - self.__class__.__name__) - raise pywikibot.Error('%s is in invalid state' % - self.__class__.__name__) + pywikibot.error('%s is in invalid state' + % self.__class__.__name__) + raise pywikibot.Error('%s is in invalid state' + % self.__class__.__name__) return params @@ -4008,7 +4008,7 @@ @return: Claim """ return Claim(self.site, self.getID(), datatype=self.type, - *args, **kwargs) + *args, **kwargs) class Claim(Property): @@ -4199,7 +4199,7 @@ value_class = self.types[self.type] if not isinstance(value, value_class): raise ValueError("%s is not type %s." - % (value, value_class)) + % (value, value_class)) self.target = value def changeTarget(self, value=None, snaktype='value', **kwargs): @@ -4773,7 +4773,7 @@ raise SiteDefinitionError( u'{0} is not a local page on {1}, and the interwiki prefix ' '{2} is not supported by PyWikiBot!:\n{3}'.format( - self._text, self._site, prefix, e)) + self._text, self._site, prefix, e)) else: t = t[t.index(u":"):].lstrip(u":").lstrip(u" ") if first_other_site: @@ -4781,7 +4781,7 @@ raise pywikibot.InvalidTitle( u'{0} links to a non local site {1} via an ' 'interwiki link to {2}.'.format( - self._text, newsite, first_other_site)) + self._text, newsite, first_other_site)) elif newsite != self._source: first_other_site = newsite self._site = newsite diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index a0b4d99..88fc8ef 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -203,7 +203,7 @@ # extensions if exc not in _regex_cache: _regex_cache[exc] = re.compile(r'(?is)<%s>.*?</%s>' - % (exc, exc)) + % (exc, exc)) result.append(_regex_cache[exc]) # handle alias if exc == 'source': @@ -446,6 +446,9 @@ of it. It'll be just the marker if the separator is empty. @rtype: str """ + # set to remove any number of separator occurrences plus arbitrary + # whitespace before, after, and between them, + # by allowing to include them into marker. if separator: firstinmarker = text.find(marker) firstinseparator = firstinmarker diff --git a/scripts/add_text.py b/scripts/add_text.py index 0fb2f28..0e81491 100755 --- a/scripts/add_text.py +++ b/scripts/add_text.py @@ -160,15 +160,17 @@ result = re.findall(regexSkipUrl, site.getUrl(url)) if result != []: pywikibot.output( -u'''Exception! regex (or word) used with -exceptUrl is in the page. Skip! -Match was: %s''' % result) + 'Exception! regex (or word) used with -exceptUrl ' + 'is in the page. Skip!\n' + 'Match was: %s' % result) return (False, False, always) if regexSkip is not None: result = re.findall(regexSkip, text) if result != []: pywikibot.output( -u'''Exception! regex (or word) used with -except is in the page. Skip! -Match was: %s''' % result) + 'Exception! regex (or word) used with -except ' + 'is in the page. Skip!\n' + 'Match was: %s' % result) return (False, False, always) # If not up, text put below if not up: diff --git a/scripts/category.py b/scripts/category.py index ad4d119..20eb622 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -633,7 +633,7 @@ if not old_page.exists(): # only warn if not a talk page log = (pywikibot.log if old_page.namespace() % 2 else - pywikibot.warning) + pywikibot.warning) log(u"Moving {0} '{1}' requested, but the page doesn't " u"exist.".format(name, old_page.title())) move_possible = False diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py index b6d9824..46d8c5c 100755 --- a/scripts/clean_sandbox.py +++ b/scripts/clean_sandbox.py @@ -169,7 +169,7 @@ if not self.generator: if self.site.code not in sandboxTitle: pywikibot.error(u'No generator is given for this site' - u'(%s), exiting.' % self.site) + u'(%s), exiting.' % self.site) raise RuntimeError local_sandbox_title = sandboxTitle[self.site.code] if not isinstance(local_sandbox_title, list): @@ -206,8 +206,7 @@ if text.strip() == translatedContent.strip(): pywikibot.output( u'The sandbox is still clean, no change necessary.') - elif subst and \ - sandboxPage.userName() == self.site.user(): + elif subst and sandboxPage.userName() == self.site.user(): pywikibot.output( u'The sandbox might be clean, no change necessary.') elif pos != 0 and not subst: diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index cd79724..439c6ba 100755 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -306,7 +306,7 @@ if Tkdialog is not None and not autonomous: try: (newPhotoDescription, newFilename, skip) = Tkdialog( - photoDescription, photo, filename).show_dialog() + photoDescription, photo, filename).show_dialog() except ImportError as e: pywikibot.warning(e) pywikibot.warning('Switching to autonomous mode.') diff --git a/scripts/imagerecat.py b/scripts/imagerecat.py index fd57caf..2e9f2ba 100755 --- a/scripts/imagerecat.py +++ b/scripts/imagerecat.py @@ -380,7 +380,7 @@ cat = cat.replace('_', ' ') toFilter = toFilter + "[[Category:" + cat + "]]\n" parameters = urlencode({'source': toFilter.encode('utf-8'), - 'bot': '1'}) + 'bot': '1'}) filterCategoriesRe = re.compile(r'\[\[Category:([^\]]*)\]\]') try: filterCategoriesPage = fetch( diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index 209355a..89bd55b 100755 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -132,19 +132,20 @@ pywikibot.output(u"Page %s is redirect, skipping!" % title) return pagecontents = page.get(get_redirect=True) - if self.getOption('nocontent') != u'': - if pagecontents.find(self.getOption('nocontent')) != -1 or \ - pagecontents.find(self.getOption('nocontent').lower()) != -1: - pywikibot.output(u'Page has %s so it is skipped' % self.getOption('nocontent')) - return + nocontent = self.getOption('nocontent') + if nocontent and ( + nocontent in pagecontents or + nocontent.lower() in pagecontents): + pywikibot.output('Page has %s so it is skipped' % nocontent) + return if self.getOption('append') == 'top': pywikibot.output(u"Page %s already exists, appending on top!" - % title) + % title) contents = contents + pagecontents comment = comment_top elif self.getOption('append') == 'bottom': pywikibot.output(u"Page %s already exists, appending on bottom!" - % title) + % title) contents = pagecontents + contents comment = comment_bottom elif self.getOption('force'): diff --git a/scripts/upload.py b/scripts/upload.py index b7ea3fa..abf0ff7 100755 --- a/scripts/upload.py +++ b/scripts/upload.py @@ -389,7 +389,7 @@ except pywikibot.data.api.APIError as error: if error.code == u'uploaddisabled': pywikibot.error("Upload error: Local file uploads are disabled on %s." - % site) + % site) else: pywikibot.error("Upload error: ", exc_info=True) except Exception: diff --git a/tox.ini b/tox.ini index d85d20b..e825833 100644 --- a/tox.ini +++ b/tox.ini @@ -38,9 +38,7 @@ pywikibot/backports.py \ pywikibot/bot.py \ pywikibot/bot_choice.py \ - pywikibot/comms/__init__.py \ - pywikibot/comms/http.py \ - pywikibot/comms/rcstream.py \ + pywikibot/comms/ \ pywikibot/compat/ \ pywikibot/config2.py \ pywikibot/daemonize.py \ @@ -61,8 +59,7 @@ pywikibot/plural.py \ pywikibot/textlib.py \ pywikibot/throttle.py \ - pywikibot/tools/__init__.py \ - pywikibot/tools/ip.py \ + pywikibot/tools/ \ pywikibot/userinterfaces/__init__.py \ pywikibot/userinterfaces/terminal_interface.py \ pywikibot/weblib.py \ @@ -166,12 +163,12 @@ commands = {posargs} [flake8] -ignore = E122,E127,E241,E265,E402,E731 +ignore = E241,E265,E402,E731 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* max_line_length = 130 [pep8] -ignore = E122,E127,E241,E402,E731 +ignore = E241,E402,E731 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* max_line_length = 130 -- To view, visit https://gerrit.wikimedia.org/r/226261 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1a0e42e10c78eb73d0deb376496c6f5bf56cb48 Gerrit-PatchSet: 11 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, 9 months

[Gerrit] Remove compat only wiktionary translation file - change (pywikibot/i18n)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Remove compat only wiktionary translation file ...................................................................... Remove compat only wiktionary translation file This file is neither used by compat nor by core and not supported by twn. Backported from master. Bug: T66881 Change-Id: Icd46497e4be2a9ada838ba22fb0b6245f2a7a095 --- D wiktionary.py 1 file changed, 0 insertions(+), 89 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/wiktionary.py b/wiktionary.py deleted file mode 100644 index 261bc67..0000000 --- a/wiktionary.py +++ /dev/null @@ -1,89 +0,0 @@ -# -*- coding: utf-8 -*- -"""i18n message bundle.""" -msg = { - 'nl': { - 'wiktionary-lang-translingual': u'Taalonafhankelijk', - 'wiktionary-lang-nl': u'Nederlands', - 'wiktionary-lang-en': u'Engels', - 'wiktionary-lang-de': u'Duits', - 'wiktionary-lang-fr': u'Frans', - 'wiktionary-lang-it': u'Italiaans', - 'wiktionary-lang-eo': u'Esperanto', - 'wiktionary-lang-es': u'Spaans', - }, - 'de': { - 'wiktionary-lang-nl': u'Niederländisch', - 'wiktionary-lang-en': u'Englisch', - 'wiktionary-lang-de': u'Deutsch', - 'wiktionary-lang-fr': u'Französisch', - 'wiktionary-lang-it': u'Italienisch', - 'wiktionary-lang-eo': u'Esperanto', - 'wiktionary-lang-es': u'Spanisch', - }, - 'en': { - 'wiktionary-lang-translingual': u'Translingual', - 'wiktionary-lang-nl': u'Dutch', - 'wiktionary-lang-en': u'English', - 'wiktionary-lang-de': u'German', - 'wiktionary-lang-fr': u'French', - 'wiktionary-lang-it': u'Italian', - 'wiktionary-lang-eo': u'Esperanto', - 'wiktionary-lang-es': u'Spanish', - }, - 'eo': { - 'wiktionary-lang-nl': u'Nederlanda', - 'wiktionary-lang-en': u'Angla', - 'wiktionary-lang-de': u'Germana', - 'wiktionary-lang-fr': u'Franca', - 'wiktionary-lang-it': u'Italiana', - 'wiktionary-lang-eo': u'Esperanto', - 'wiktionary-lang-es': u'Hispana', - }, - 'ia': { - 'wiktionary-lang-translingual': u'translingual', - 'wiktionary-lang-nl': u'nederlandese', - 'wiktionary-lang-en': u'anglese', - 'wiktionary-lang-de': u'germano', - 'wiktionary-lang-fr': u'francese', - 'wiktionary-lang-it': u'italiano', - 'wiktionary-lang-eo': u'esperanto', - 'wiktionary-lang-es': u'espaniol', - }, - 'it': { - 'wiktionary-lang-nl': u'olandese', - 'wiktionary-lang-en': u'inglese', - 'wiktionary-lang-de': u'tedesco', - 'wiktionary-lang-fr': u'francese', - 'wiktionary-lang-it': u'italiano', - 'wiktionary-lang-eo': u'esperanto', - 'wiktionary-lang-es': u'spagnuolo', - }, - 'fr': { - 'wiktionary-lang-nl': u'néerlandais', - 'wiktionary-lang-en': u'anglais', - 'wiktionary-lang-de': u'allemand', - 'wiktionary-lang-fr': u'français', - 'wiktionary-lang-it': u'italien', - 'wiktionary-lang-eo': u'espéranto', - 'wiktionary-lang-es': u'espagnol', - }, - 'es': { - 'wiktionary-lang-nl': u'olandés', - 'wiktionary-lang-en': u'inglés', - 'wiktionary-lang-de': u'alemán', - 'wiktionary-lang-fr': u'francés', - 'wiktionary-lang-it': u'italiano', - 'wiktionary-lang-eo': u'esperanto', - 'wiktionary-lang-es': u'español', - }, - 'sr': { - 'wiktionary-lang-translingual': u'Вишејезички', - 'wiktionary-lang-nl': u'холандски', - 'wiktionary-lang-en': u'енглески', - 'wiktionary-lang-de': u'немачки', - 'wiktionary-lang-fr': u'француски', - 'wiktionary-lang-it': u'италијански', - 'wiktionary-lang-eo': u'есперанто', - 'wiktionary-lang-es': u'шпански', - }, -} -- To view, visit https://gerrit.wikimedia.org/r/226518 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icd46497e4be2a9ada838ba22fb0b6245f2a7a095 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/i18n Gerrit-Branch: compat Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

8 years, 9 months

[Gerrit] Remove compat only wiktionary translation file - change (pywikibot/i18n)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Remove compat only wiktionary translation file ...................................................................... Remove compat only wiktionary translation file This file is neither used by compat nor by core and not supported by twn Bug: T66881 Change-Id: Ib37bab2bf3b4d9f3b21fc5e1446d089be99a5273 --- D wiktionary.py 1 file changed, 0 insertions(+), 89 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/wiktionary.py b/wiktionary.py deleted file mode 100644 index 261bc67..0000000 --- a/wiktionary.py +++ /dev/null @@ -1,89 +0,0 @@ -# -*- coding: utf-8 -*- -"""i18n message bundle.""" -msg = { - 'nl': { - 'wiktionary-lang-translingual': u'Taalonafhankelijk', - 'wiktionary-lang-nl': u'Nederlands', - 'wiktionary-lang-en': u'Engels', - 'wiktionary-lang-de': u'Duits', - 'wiktionary-lang-fr': u'Frans', - 'wiktionary-lang-it': u'Italiaans', - 'wiktionary-lang-eo': u'Esperanto', - 'wiktionary-lang-es': u'Spaans', - }, - 'de': { - 'wiktionary-lang-nl': u'Niederländisch', - 'wiktionary-lang-en': u'Englisch', - 'wiktionary-lang-de': u'Deutsch', - 'wiktionary-lang-fr': u'Französisch', - 'wiktionary-lang-it': u'Italienisch', - 'wiktionary-lang-eo': u'Esperanto', - 'wiktionary-lang-es': u'Spanisch', - }, - 'en': { - 'wiktionary-lang-translingual': u'Translingual', - 'wiktionary-lang-nl': u'Dutch', - 'wiktionary-lang-en': u'English', - 'wiktionary-lang-de': u'German', - 'wiktionary-lang-fr': u'French', - 'wiktionary-lang-it': u'Italian', - 'wiktionary-lang-eo': u'Esperanto', - 'wiktionary-lang-es': u'Spanish', - }, - 'eo': { - 'wiktionary-lang-nl': u'Nederlanda', - 'wiktionary-lang-en': u'Angla', - 'wiktionary-lang-de': u'Germana', - 'wiktionary-lang-fr': u'Franca', - 'wiktionary-lang-it': u'Italiana', - 'wiktionary-lang-eo': u'Esperanto', - 'wiktionary-lang-es': u'Hispana', - }, - 'ia': { - 'wiktionary-lang-translingual': u'translingual', - 'wiktionary-lang-nl': u'nederlandese', - 'wiktionary-lang-en': u'anglese', - 'wiktionary-lang-de': u'germano', - 'wiktionary-lang-fr': u'francese', - 'wiktionary-lang-it': u'italiano', - 'wiktionary-lang-eo': u'esperanto', - 'wiktionary-lang-es': u'espaniol', - }, - 'it': { - 'wiktionary-lang-nl': u'olandese', - 'wiktionary-lang-en': u'inglese', - 'wiktionary-lang-de': u'tedesco', - 'wiktionary-lang-fr': u'francese', - 'wiktionary-lang-it': u'italiano', - 'wiktionary-lang-eo': u'esperanto', - 'wiktionary-lang-es': u'spagnuolo', - }, - 'fr': { - 'wiktionary-lang-nl': u'néerlandais', - 'wiktionary-lang-en': u'anglais', - 'wiktionary-lang-de': u'allemand', - 'wiktionary-lang-fr': u'français', - 'wiktionary-lang-it': u'italien', - 'wiktionary-lang-eo': u'espéranto', - 'wiktionary-lang-es': u'espagnol', - }, - 'es': { - 'wiktionary-lang-nl': u'olandés', - 'wiktionary-lang-en': u'inglés', - 'wiktionary-lang-de': u'alemán', - 'wiktionary-lang-fr': u'francés', - 'wiktionary-lang-it': u'italiano', - 'wiktionary-lang-eo': u'esperanto', - 'wiktionary-lang-es': u'español', - }, - 'sr': { - 'wiktionary-lang-translingual': u'Вишејезички', - 'wiktionary-lang-nl': u'холандски', - 'wiktionary-lang-en': u'енглески', - 'wiktionary-lang-de': u'немачки', - 'wiktionary-lang-fr': u'француски', - 'wiktionary-lang-it': u'италијански', - 'wiktionary-lang-eo': u'есперанто', - 'wiktionary-lang-es': u'шпански', - }, -} -- To view, visit https://gerrit.wikimedia.org/r/226490 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib37bab2bf3b4d9f3b21fc5e1446d089be99a5273 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 9 months

[Gerrit] [bugfix] Ignore non-existent py-file from reading authors - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [bugfix] Ignore non-existent py-file from reading authors ...................................................................... [bugfix] Ignore non-existent py-file from reading authors If a .py file does not exists, the authors couldn't be read and the script fails with IOError. This patch doesn't try to read from non-existant file. Change-Id: I6aabdc276f1ef1214532911049afa59a199604ae --- M maintenance/i18n_from_json.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/maintenance/i18n_from_json.py b/maintenance/i18n_from_json.py index 512bf2d..a4891a6 100644 --- a/maintenance/i18n_from_json.py +++ b/maintenance/i18n_from_json.py @@ -159,6 +159,8 @@ """Read old authors from file.""" self.authors = {} translators = [] + if not os.path.exists(self.dest): + return f = codecs.open(self.dest, "r", "utf-8") findcode = False while True: -- To view, visit https://gerrit.wikimedia.org/r/226489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6aabdc276f1ef1214532911049afa59a199604ae Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat 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: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: jenkins-bot <>

8 years, 9 months

← Newer
1
2
3
4
5
6
7
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits July 2015