From 7a78a21225818695ab1375a5d035296400b89b07 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Sat, 24 Dec 2011 18:16:56 +0100
Subject: Fix FORMATS's parsing related bug

---
 mat-cli | 4 +++-
 mat-gui | 3 ++-
 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 @@
 import sys
 import xml.sax
 import optparse
+import os
 
 import hachoir_core
 
@@ -115,7 +116,8 @@ def list_supported():
     handler = mat.XMLParser()
     parser = xml.sax.make_parser()
     parser.setContentHandler(handler)
-    with open(mat.get_sharedir() + 'FORMATS', 'r') as xmlfile:
+    path = os.path.join(mat.get_sharedir(), 'FORMATS')
+    with open(path, 'r') as xmlfile:
         parser.parse(xmlfile)
 
     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'))
         handler = mat.XMLParser()
         parser = xml.sax.make_parser()
         parser.setContentHandler(handler)
-        with open(mat.get_sharedir() + 'FORMATS', 'r') as xmlfile:
+        path = os.path.join(mat.get_sharedir(), 'FORMATS')
+        with open(path, 'r') as xmlfile:
             parser.parse(xmlfile)
 
         for item in handler.list:  # list of dict : one dict per format
-- 
cgit v1.3