jenkins-bot has submitted this change and it was merged.
Change subject: pep8-ified pywikibot/interwiki_graph.py ......................................................................
pep8-ified pywikibot/interwiki_graph.py
Change-Id: I7c0143664d06c3040181df12360626ace65482e9 --- M pywikibot/interwiki_graph.py 1 file changed, 11 insertions(+), 7 deletions(-)
Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified
diff --git a/pywikibot/interwiki_graph.py b/pywikibot/interwiki_graph.py index 21b39f7..5daf1a6 100644 --- a/pywikibot/interwiki_graph.py +++ b/pywikibot/interwiki_graph.py @@ -14,8 +14,10 @@ import pywikibot from pywikibot import config2 as config
+ class GraphImpossible(Exception): "Drawing a graph is not possible on your system." +
class GraphSavingThread(threading.Thread): """ @@ -36,15 +38,16 @@ for format in config.interwiki_graph_formats: filename = 'interwiki-graphs/' + getFilename(self.originPage, format) - if self.graph.write(filename, prog = 'dot', format = format): + if self.graph.write(filename, prog='dot', format=format): pywikibot.output(u'Graph saved as %s' % filename) else: pywikibot.output(u'Graph could not be saved as %s' % filename)
+ class GraphDrawer: def __init__(self, subject): if not pydotfound: - raise GraphImpossible, 'pydot is not installed.' + raise GraphImpossible('pydot is not installed.') self.graph = None self.subject = subject
@@ -53,7 +56,7 @@ page.title())).encode('utf-8')
def addNode(self, page): - node = pydot.Node(self.getLabel(page), shape = 'rectangle') + node = pydot.Node(self.getLabel(page), shape='rectangle') node.set_URL(""http://%s%s%5C"" % (page.site.hostname(), page.site.get_address(page.urlname()))) @@ -70,8 +73,8 @@ node.set_color('green') node.set_style('filled,bold') # if we found more than one valid page for this language: - if len(filter(lambda p: p.site == page.site and p.exists() \ - and not p.isRedirectPage(), + if len(filter(lambda p: p.site == page.site and p.exists() + and not p.isRedirectPage(), # noqa self.subject.foundIn.keys())) > 1: # mark conflict by octagonal node node.set_shape('octagon') @@ -133,14 +136,15 @@ self.addNode(page) # mark start node by pointing there from a black dot. firstLabel = self.getLabel(self.subject.originPage) - self.graph.add_node(pydot.Node('start', shape = 'point')) + self.graph.add_node(pydot.Node('start', shape='point')) self.graph.add_edge(pydot.Edge('start', firstLabel)) for page, referrers in self.subject.foundIn.iteritems(): for refPage in referrers: self.addDirectedEdge(page, refPage) self.saveGraphFile()
-def getFilename(page, extension = None): + +def getFilename(page, extension=None): filename = '%s-%s-%s' % (page.site.family.name, page.site.language(), page.titleForFilename())