Public feed
#376620
Index: __init__.py
===================================================================
--- __init__.py (revision 7440)
+++ __init__.py (working copy)
@@ -28,9 +28,8 @@
# Kick off handler registration
from Products.Marshall import handlers
-if config.hasLibxml2:
- # Kick off namespace registration
- from Products.Marshall import namespaces
+# Kick off namespace registration
+from Products.Marshall import namespaces
from Products.Marshall.marshaller import ControlledMarshaller
Index: handlers/__init__.py
===================================================================
--- handlers/__init__.py (revision 7440)
+++ handlers/__init__.py (working copy)
@@ -32,11 +32,12 @@
RFC822Marshaller)
if config.hasLibxml2:
- # Now register our own xml marshallers
+ # Now register simple marshaller
from Products.Marshall.handlers.simple import SimpleXMLMarshaller
- from Products.Marshall.handlers.atxml import ATXMLMarshaller
-
registerComponent('simple_xml', 'Simple XML Marshaller',
SimpleXMLMarshaller)
- registerComponent('atxml', 'ATXML Marshaller',
- ATXMLMarshaller)
+
+# Register atxml marshaller
+from Products.Marshall.handlers.atxml import ATXMLMarshaller
+registerComponent('atxml', 'ATXML Marshaller',
+ ATXMLMarshaller)