Update Entry object to accept existing xml, dump content on connection error, add

pjbull · pjbull · commit f228058515e3 · 2013-08-22T12:44:41.000-04:00
-Entry object can now take existing xml as its starting point
-fixed a bug in service_document that prevented connections to DSpace
(and DASH) sword servers.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,6 @@ dist/
 sword2.egg-info/
 *.pyc
 *.py~
-
+*.conf
 
 .DS_Store
diff --git a/sword2/atom_objects.py b/sword2/atom_objects.py
@@ -156,15 +156,15 @@ class Entry(object):
         xmlns:dcterms="http://purl.org/dc/terms/">
     <generator uri="http://bitbucket.org/beno/python-sword2" version="%s"/>
 </entry>""" % __version__
-    def __init__(self, **kw):
+    def __init__(self, atomEntryXml=None, **kw):
         """Create a basic `Entry` document, setting the generator and a timestamp for the updated element value.
         
         Any keyword parameters passed in will be passed to the add_fields method and added to the entry
         bootstrap document. It's currently not possible to add a namespace and use it within the init call."""
         
         # create a namespace map which we'll use in all of the elements
         self.nsmap = {"dcterms" : "http://purl.org/dc/terms/", "atom" : "http://www.w3.org/2005/Atom"}
-        self.entry = etree.fromstring(self.bootstrap)
+        self.entry = etree.fromstring(self.bootstrap if not atomEntryXml else atomEntryXml)
         if not 'updated' in kw.keys():
             kw['updated'] = datetime.now().isoformat()
         self.add_fields(**kw)
diff --git a/sword2/connection.py b/sword2/connection.py
@@ -257,7 +257,7 @@ def _return_error_or_exception(self, cls, resp, content):
         
         `self.raise_except` can be altered at any time to affect this methods behaviour."""
         if self.raise_except:
-            raise cls(resp)
+            raise cls(resp, content)
         else:
             # content type can contain both the mimetype and the charset (e.g. text/xml; charset=utf-8)
             if resp['content-type'].startswith("text/xml") or resp['content-type'].startswith("application/xml"):
@@ -312,7 +312,7 @@ def _handle_error_response(self, resp, content):
             conn_l.error("Server error occured. Response headers from the server:\n%s" % resp)
             return self._return_error_or_exception(ServerError, resp, content)
         else:
-            conn_l.error("Unknown error occured. Response headers from the server:\n%s" % resp)
+            conn_l.error("Unknown error occured. Response headers from the server:\n%s\n%s" % (resp, content))
             return self._return_error_or_exception(HTTPResponseError, resp, content)
     
     def _cache_deposit_receipt(self, d):
diff --git a/sword2/exceptions.py b/sword2/exceptions.py
@@ -6,8 +6,9 @@
 
 class HTTPResponseError(Exception):
     """Generic exception for http codes greater than 399 and less than 599 """
-    def __init__(self, response=None):
+    def __init__(self, response=None, content=None):
         self.response = response
+        self.content = content
         
 class ServerError(HTTPResponseError):
     """ for http error codes 500 and up """
diff --git a/sword2/service_document.py b/sword2/service_document.py
@@ -149,7 +149,7 @@ def validate(self):
                     for accept in accepts:
                         multipart = accept.get("alternate")
                         if multipart is not None:
-                            if multipart != "multipart-related":
+                            if multipart != "multipart-related" and multipart != "multipart/related":
                                 multipart_accept_valid = False
                                 sd_l.debug("Multipart accept alternate is incorrect: " + str(multipart))
                         else:
