summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjvoisin2013-04-27 16:45:58 +0200
committerjvoisin2013-04-27 16:45:58 +0200
commit9ef770c24e2d79280f5ae0009a98c44535448ffe (patch)
tree2524fb5be976cd64b8d994f7a3fa409511e6e3b5
parentfb6c1836512bb293ae5ffbbcc74b88c0a74dafa5 (diff)
Fix a merge mistake
-rwxr-xr-xmat2
1 files changed, 1 insertions, 1 deletions
diff --git a/mat b/mat
index 6151c86..d996708 100755
--- a/mat
+++ b/mat
@@ -105,7 +105,7 @@ def list_supported():
105 handler = mat.XMLParser() 105 handler = mat.XMLParser()
106 parser = xml.sax.make_parser() 106 parser = xml.sax.make_parser()
107 parser.setContentHandler(handler) 107 parser.setContentHandler(handler)
108 path = os.path.join(mat.get_formats(), 'FORMATS') 108 path = os.path.join(mat.get_datadir(), 'FORMATS')
109 with open(path, 'r') as xmlfile: 109 with open(path, 'r') as xmlfile:
110 parser.parse(xmlfile) 110 parser.parse(xmlfile)
111 111