From fa963cb95932b969d8c8e6ee417e20ad921275cc Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Wed, 16 Sep 2015 06:35:54 +0300 Subject: [PATCH] Fix file format message:w --- slpkg/graph.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/slpkg/graph.py b/slpkg/graph.py index 88945d08..5c19da69 100644 --- a/slpkg/graph.py +++ b/slpkg/graph.py @@ -31,6 +31,14 @@ class Graph(object): """ def __init__(self, image): self.image = image + self.file_format = [ + "bmp", "canon", "cmap", "cmapx", "cmapx_np", "dot", + "eps", "fig", "gd", "gd2", "gif", "gtk", "gv", "ico", + "imap", "imap_np", "ismap", "jpe", "jpeg", "jpg", "pdf", + "pic", "plain", "plain-ext", "png", "pov", "ps", "ps2", + "svg", "svgz", "tif", "tiff", "tk", "vml", "vmlz", + "vrml", "wbmp", "x11", "xdot", "xlib" + ] def dependencies(self, deps_dict): """Generate graph file with depenndencies map tree @@ -64,18 +72,11 @@ class Graph(object): def check_file(self): """Check for file format and type """ - file_format = [ - "bmp", "canon", "cmap", "cmapx", "cmapx_np", "dot", - "eps", "fig", "gd", "gd2", "gif", "gtk", "gv", "ico", - "imap", "imap_np", "ismap", "jpe", "jpeg", "jpg", "pdf", - "pic", "plain", "plain-ext", "png", "pov", "ps", "ps2", - "svg", "svgz", "tif", "tiff", "tk", "vml", "vmlz", - "vrml", "wbmp", "x11", "xdot", "xlib" - ] try: - if self.image.split(".")[1] not in file_format: - print("Format: {0} not recognized. Use one of: {1}".format( - self.image.split(".")[1], " ".join(file_format))) + if self.image.split(".")[1] not in self.file_format: + print("Format: '{0}' not recognized. Use one of " + "them:\n{1}".format(self.image.split(".")[1], + ", ".join(self.file_format))) raise SystemExit() except IndexError: print("slpkg: error: Image file suffix missing")