jenkins-bot has submitted this change and it was merged.
Change subject: Repair test_octagon ......................................................................
Repair test_octagon
Also replaces two deprecated calls in interwiki_graph.py.
Bug: T128988 Change-Id: Ica8fca7b4f0e6480dbd18aa8cb10f019d620ec86 --- M pywikibot/interwiki_graph.py M tests/interwiki_graph_tests.py 2 files changed, 4 insertions(+), 4 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/pywikibot/interwiki_graph.py b/pywikibot/interwiki_graph.py index f9c1edd..85d903b 100644 --- a/pywikibot/interwiki_graph.py +++ b/pywikibot/interwiki_graph.py @@ -169,7 +169,7 @@ node = pydot.Node(self.getLabel(page), shape='rectangle') node.set_URL(""http://%s%s%5C"" % (page.site.hostname(), - page.site.get_address(page.urlname()))) + page.site.get_address(page.title(asUrl=True)))) node.set_style('filled') node.set_fillcolor('white') node.set_fontsize('11') @@ -271,7 +271,7 @@ """ filename = '%s-%s-%s' % (page.site.family.name, page.site.code, - page.titleForFilename()) + page.title(as_filename=True)) if extension: filename += '.%s' % extension return filename diff --git a/tests/interwiki_graph_tests.py b/tests/interwiki_graph_tests.py index 68f87a0..3a06b4e 100644 --- a/tests/interwiki_graph_tests.py +++ b/tests/interwiki_graph_tests.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- """Test Interwiki Graph functionality.""" # -# (C) Pywikibot team, 2015 +# (C) Pywikibot team, 2015-2016 # # Distributed under the terms of the MIT license. # @@ -72,7 +72,7 @@
drawer = interwiki_graph.GraphDrawer(data)
- self.assertEqual(set(['en']), drawer._octagon_site_set()) + self.assertEqual(set([self.pages['en'].site]), drawer._octagon_site_set())
drawer.createGraph()