jenkins-bot has submitted this change and it was merged.
Change subject: print warning when message was not found in Python script.
......................................................................
print warning when message was not found in Python script.
Change-Id: I5ad6b6c7a82ef37c7d38a1eb55c1a8b6b725ecab
---
M scripts/maintenance/make_i18n_dict.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/maintenance/make_i18n_dict.py b/scripts/maintenance/make_i18n_dict.py
index de37f2c..fa9cca1 100755
--- a/scripts/maintenance/make_i18n_dict.py
+++ b/scripts/maintenance/make_i18n_dict.py
@@ -59,6 +59,8 @@
for msg in args:
if hasattr(self.script, msg):
self.messages[msg] = msg
+ else:
+ print('message {0} not found'.format(msg))
for new, old in kwargs.items():
self.messages[old] = new.replace('_', '-')
self.dict = {}
--
To view, visit https://gerrit.wikimedia.org/r/234947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ad6b6c7a82ef37c7d38a1eb55c1a8b6b725ecab
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: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: Cache sites with a conflict
......................................................................
Cache sites with a conflict
Signed-off-by: xqt <info(a)gno.de>
Change-Id: I5ae3112272f260517ef68e2d8981c4b578359d23
---
M pywikibot/interwiki_graph.py
M tests/interwiki_graph_tests.py
2 files changed, 21 insertions(+), 6 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/interwiki_graph.py b/pywikibot/interwiki_graph.py
index 86fe257..f9c1edd 100644
--- a/pywikibot/interwiki_graph.py
+++ b/pywikibot/interwiki_graph.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""Module with the Graphviz drawing calls."""
#
-# (C) Pywikibot team, 2006-2015
+# (C) Pywikibot team, 2006-2016
#
# Distributed under the terms of the MIT license.
#
@@ -10,6 +10,7 @@
__version__ = '$Id$'
#
+import itertools
import threading
try:
@@ -20,6 +21,7 @@
import pywikibot
from pywikibot import config2 as config
+from pywikibot.tools import Counter
# deprecated value
pydotfound = not isinstance(pydot, ImportError)
@@ -150,6 +152,18 @@
"""Get label for page."""
return '"%s:%s"' % (page.site.code, page.title())
+ def _octagon_site_set(self):
+ """Build a list of sites with more than one valid page."""
+ page_list = self.subject.found_in.keys()
+
+ # Only track sites of normal pages
+ each_site = [page.site for page in page_list
+ if page.exists() and not page.isRedirectPage()]
+
+ return set(x[0] for x in itertools.takewhile(
+ lambda x: x[1] > 1,
+ Counter(each_site).most_common()))
+
def addNode(self, page):
"""Add a node for page."""
node = pydot.Node(self.getLabel(page), shape='rectangle')
@@ -168,11 +182,7 @@
if page.namespace() != self.subject.originPage.namespace():
node.set_color('green')
node.set_style('filled,bold')
- # if we found more than one valid page for this language:
- # TODO: Only iterate through at most 2 elements
- if len([p for p in self.subject.foundIn.keys()
- if p.site == page.site and p.exists() and
- not p.isRedirectPage()]) > 1: # noqa
+ if page.site in self.octagon_sites:
# mark conflict by octagonal node
node.set_shape('octagon')
self.graph.add_node(node)
@@ -232,6 +242,9 @@
# create empty graph
self.graph = pydot.Dot()
# self.graph.set('concentrate', 'true')
+
+ self.octagon_sites = self._octagon_site_set()
+
for page in self.subject.foundIn.keys():
# a node for each found page
self.addNode(page)
diff --git a/tests/interwiki_graph_tests.py b/tests/interwiki_graph_tests.py
index ed5ae61..68f87a0 100644
--- a/tests/interwiki_graph_tests.py
+++ b/tests/interwiki_graph_tests.py
@@ -72,6 +72,8 @@
drawer = interwiki_graph.GraphDrawer(data)
+ self.assertEqual(set(['en']), drawer._octagon_site_set())
+
drawer.createGraph()
nodes = drawer.graph.obj_dict['nodes']
--
To view, visit https://gerrit.wikimedia.org/r/186619
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ae3112272f260517ef68e2d8981c4b578359d23
Gerrit-PatchSet: 6
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 <>