Changeset 5dfdfa7 in sasview

Timestamp:

Feb 16, 2015 10:27:41 AM (9 years ago)

Author:

krzywon

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

4ec242e, b45cde3, 66f21cd

Parents:

8836849

Message:

Changed the default dataloader association file from xml to json to
allow easier integration into a stand-alone data loader package with no
external dependencies.

Location:

src/sas/dataloader/readers

Files:

• associations.py (modified) (3 diffs)
• defaults.json (added)
• defaults.xml (deleted)

src/sas/dataloader/readers/associations.py

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