summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjvoisin2011-12-24 18:16:56 +0100
committerjvoisin2011-12-24 18:16:56 +0100
commit7a78a21225818695ab1375a5d035296400b89b07 (patch)
tree03fbca938097bfaeb647ce5cececf3c5fdd70cb6
parentc8040553263ea127fae0a4d5124858e7c21388f2 (diff)
Fix FORMATS's parsing related bug
-rwxr-xr-xmat-cli4
-rwxr-xr-xmat-gui3
2 files changed, 5 insertions, 2 deletions
diff --git a/mat-cli b/mat-cli
index 2ee0637..1058d46 100755
--- a/mat-cli
+++ b/mat-cli
@@ -6,6 +6,7 @@
6import sys 6import sys
7import xml.sax 7import xml.sax
8import optparse 8import optparse
9import os
9 10
10import hachoir_core 11import hachoir_core
11 12
@@ -115,7 +116,8 @@ def list_supported():
115 handler = mat.XMLParser() 116 handler = mat.XMLParser()
116 parser = xml.sax.make_parser() 117 parser = xml.sax.make_parser()
117 parser.setContentHandler(handler) 118 parser.setContentHandler(handler)
118 with open(mat.get_sharedir() + 'FORMATS', 'r') as xmlfile: 119 path = os.path.join(mat.get_sharedir(), 'FORMATS')
120 with open(path, 'r') as xmlfile:
119 parser.parse(xmlfile) 121 parser.parse(xmlfile)
120 122
121 for item in handler.list: 123 for item in handler.list:
diff --git a/mat-gui b/mat-gui
index 66ddf53..380e4d8 100755
--- a/mat-gui
+++ b/mat-gui
@@ -371,7 +371,8 @@ data loss, but clean more efficiently'))
371 handler = mat.XMLParser() 371 handler = mat.XMLParser()
372 parser = xml.sax.make_parser() 372 parser = xml.sax.make_parser()
373 parser.setContentHandler(handler) 373 parser.setContentHandler(handler)
374 with open(mat.get_sharedir() + 'FORMATS', 'r') as xmlfile: 374 path = os.path.join(mat.get_sharedir(), 'FORMATS')
375 with open(path, 'r') as xmlfile:
375 parser.parse(xmlfile) 376 parser.parse(xmlfile)
376 377
377 for item in handler.list: # list of dict : one dict per format 378 for item in handler.list: # list of dict : one dict per format