Changes in src/sas/dataloader/readers/associations.py [5dfdfa7:fd5ac0d] in sasview

File:

• src/sas/dataloader/readers/associations.py (modified) (3 diffs)

src/sas/dataloader/readers/associations.py

@@ -17 +17 @@
 import sys
 import logging
-import json
+from lxml import etree
+# Py2exe compatibility: import _elementpath to ensure that py2exe finds it
+from lxml import _elementpath
 
-FILE_NAME = 'defaults.json'
+## Format version for the XML settings file
+VERSION = 'sasloader/1.0'
 
-def read_associations(loader, settings=FILE_NAME):
+
+def read_associations(loader, settings='defaults.xml'):
     """
     Read the specified settings file to associate
@@ -27 +31 @@
     
     :param loader: Loader object
-    :param settings: path to the json settings file [string]
+    :param settings: path to the XML settings file [string]
     """
     reader_dir = os.path.dirname(__file__)
@@ -43 +47 @@
         path = "./%s" % settings
     if os.path.isfile(path):
-        with open(path) as fh:
-            json_tree = json.load(fh)
+        tree = etree.parse(path, parser=etree.ETCompatXMLParser())
+        
+        # Check the format version number
+        # Specifying the namespace will take care of the file format version
+        root = tree.getroot()
         
         # Read in the file extension associations
-        entry_list = json_tree['SasLoader']['FileType']
+        entry_list = root.xpath('/ns:SasLoader/ns:FileType',
+                                 namespaces={'ns': VERSION})
 
         # For each FileType entry, get the associated reader and extension
         for entry in entry_list:
-            reader = entry['-reader']
-            ext = entry['-extension']
+            reader = entry.get('reader')
+            ext = entry.get('extension')
             
             if reader is not None and ext is not None: