diff options
| author | jvoisin | 2011-12-24 18:16:56 +0100 |
|---|---|---|
| committer | jvoisin | 2011-12-24 18:16:56 +0100 |
| commit | 7a78a21225818695ab1375a5d035296400b89b07 (patch) | |
| tree | 03fbca938097bfaeb647ce5cececf3c5fdd70cb6 | |
| parent | c8040553263ea127fae0a4d5124858e7c21388f2 (diff) | |
Fix FORMATS's parsing related bug
| -rwxr-xr-x | mat-cli | 4 | ||||
| -rwxr-xr-x | mat-gui | 3 |
2 files changed, 5 insertions, 2 deletions
| @@ -6,6 +6,7 @@ | |||
| 6 | import sys | 6 | import sys |
| 7 | import xml.sax | 7 | import xml.sax |
| 8 | import optparse | 8 | import optparse |
| 9 | import os | ||
| 9 | 10 | ||
| 10 | import hachoir_core | 11 | import 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: |
| @@ -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 |
