Use json and lxml directly

Author: alexdutton

setup.py

@@ -36,6 +36,7 @@
     zip_safe=False,
     install_requires=[
         "httplib2",
+        "lxml",
     ],
     # Following left in as a memory aid for later-
     #entry_points="""

sword2/atom_objects.py

@@ -9,14 +9,16 @@
 Also provides Category, which is a convenience function to simplify reading in category information from an atom:entry
 """
 
+from datetime import datetime
+from lxml import etree
+
 from .sword2_logging import logging
 from .implementation_info import __version__
 coll_l = logging.getLogger(__name__)
 
-from .compatible_libs import etree
+
 from .utils import NS, get_text
 
-from datetime import datetime
 
 class Category(object):
     """Convenience class to aid in the intepreting of atom:category elements in XML. Currently, this is read-only.
@@ -263,11 +265,11 @@ def add_contributor(self, name, uri=None, email=None):
 
     def __str__(self):
         """Export the XML to a bytestring, ready for use"""
-        xml_str = etree.tostring(self.entry)
+        xml_str = etree.tounicode(self.entry)
         if not xml_str.startswith('<?xml version="1.0"?>'):
             xml_str = '<?xml version="1.0"?>' + xml_str
         return xml_str
-        
+
     def pretty_print(self):
         """A version of the XML document which should be slightly more readable on the command line."""
         return etree.tostring(self.entry, pretty_print=True)

sword2/collection.py

@@ -13,12 +13,14 @@
 for the things they logically handle.
 
 """
+import json
 
 from .sword2_logging import logging
 from .implementation_info import __version__
+
 coll_l = logging.getLogger(__name__)
 
-from .compatible_libs import etree
+from lxml import etree
 from .utils import NS, get_text
 
 from .deposit_receipt import Deposit_Receipt
@@ -46,18 +48,19 @@ class SDCollection(object):
     >>> c.title
     "Thesis Deposit"
     """
+
     def __init__(self, title=None,
-                       href=None,
-                       accept=[],
-                       accept_multipart=[],
-                       categories=[],
-                       collectionPolicy=None,
-                       description = None,
-                       mediation=None,
-                       treatment=None,
-                       acceptPackaging=[],
-                       service=[],
-                       dom=None):
+                 href=None,
+                 accept=[],
+                 accept_multipart=[],
+                 categories=[],
+                 collectionPolicy=None,
+                 description=None,
+                 mediation=None,
+                 treatment=None,
+                 acceptPackaging=[],
+                 service=[],
+                 dom=None):
         """
         Creates a `Collection` object - as used by `sword2.Service_Document`
 
@@ -110,7 +113,7 @@ def __init__(self, title=None,
         Again, this step is done by the `sword2.Service_Document`, but if the above XML was in the `doc` variable:
 
             # Get an etree-compatible library, such as from `lxml.etree`, `xml.etree` or `elementtree.ElementTree`
-            >>> from sword2.compatible_libs import etree
+            >>> from lxml import etree
             >>> from sword2 import SDCollection
             >>> dom = etree.fromstring(doc)
 
@@ -224,31 +227,24 @@ def to_json(self):
 
         NB this uses the attributes of the object, not the cached DOM object, so information can be altered/added
         on the fly."""
-        from .compatible_libs import json
-        if json:
-            _j = {'title':self.title,
-                  'href':self.href,
-                  'description':self.description,
-                  'accept':self.accept,
-                  'accept_multipart':self.accept_multipart,
-                  'mediation':self.mediation,
-                  'treatment':self.treatment,
-                  'collectionPolicy':self.collectionPolicy,
-                  'acceptPackaging':self.acceptPackaging,
-                  'service':self.service,
-                  'categories':self.categories}
-            return json.dumps(_j)
-        else:
-            coll_l.error("Could not return information about Collection '%s' as JSON" % self.title)
-            return
+        return json.dumps({'title': self.title,
+              'href': self.href,
+              'description': self.description,
+              'accept': self.accept,
+              'accept_multipart': self.accept_multipart,
+              'mediation': self.mediation,
+              'treatment': self.treatment,
+              'collectionPolicy': self.collectionPolicy,
+              'acceptPackaging': self.acceptPackaging,
+              'service': self.service,
+              'categories': self.categories})
+
 
 class Collection_Feed(object):
     """Nothing to see here yet. Move along."""
+
     def __init__(self, feed_iri=None, http_client=None, feed_xml=None):
         self.feed_xml = feed_xml
         self.feed_iri = feed_iri
         self._cached = []
         self.h = http_client
-
-
-

sword2/compatible_libs.py

@@ -21,7 +21,7 @@
 from .statement import Atom_Sword_Statement, Ore_Sword_Statement
 from .exceptions import *
 
-from .compatible_libs import etree
+from lxml import etree
 
 # import httplib2
 from . import http_layer

sword2/connection.py

@@ -15,7 +15,7 @@
 
 from .atom_objects import Category
 
-from .compatible_libs import etree
+from lxml import etree
 from .utils import NS, get_text
 
 class Deposit_Receipt(object):

sword2/deposit_receipt.py

@@ -55,7 +55,7 @@
 
 from .collection import SDCollection
 
-from .compatible_libs import etree
+from lxml import etree
 from .utils import NS, get_text
 
 class ServiceDocument(object):

sword2/service_document.py

@@ -3,7 +3,7 @@
 from .atom_objects import Category
 from .deposit_receipt import Deposit_Receipt
 from .sword2_logging import logging
-from .compatible_libs import etree
+from lxml import etree
 
 s_l = logging.getLogger(__name__)