add suds-jurko support, still compatible with suds

Author: Rad Wojcik

fedex/base_service.py

@@ -12,8 +12,20 @@
 
 import suds
 from suds.client import Client
+from suds.plugin import MessagePlugin
 
 
+class GeneralPlugin(MessagePlugin):
+
+    def marshalled(self, context):
+        context.envelope = context.envelope.prune()
+
+    def sending(self, context):
+        logging.info("FedEx Request {}".format(context.envelope))
+
+    def received(self, context):
+        logging.info("FedEx Response {}".format(context.reply))
+
 class FedexBaseServiceException(Exception):
     """
     Exception: Serves as the base exception that other service-related
@@ -101,7 +113,7 @@ def __init__(self, config_obj, wsdl_name, *args, **kwargs):
             self.logger.info("Using production server.")
             self.wsdl_path = os.path.join(config_obj.wsdl_path, wsdl_name)
 
-        self.client = Client('file:///%s' % self.wsdl_path.lstrip('/'), faults=True)
+        self.client = Client('file:///%s' % self.wsdl_path.lstrip('/'),  plugins=[GeneralPlugin()])
         #self.client.options.cache.clear()  # Clear the cache, then re-init client when changing wsdl file.
 
         self.VersionId = None

fedex/services/track_service.py

@@ -108,5 +108,5 @@ def _assemble_and_send_request(self):
             TransactionDetail=self.TransactionDetail,
             Version=self.VersionId,
             SelectionDetails=self.SelectionDetails,
-            TrackRequestProcessingOptionType=self.TrackRequestProcessingOptionType)
+            ProcessingOptions=self.TrackRequestProcessingOptionType)
 

setup.py

@@ -31,6 +31,6 @@
       license='BSD',
       classifiers=CLASSIFIERS,
       keywords=KEYWORDS,
-      requires=['suds'],
-      install_requires=['suds'],
+      requires=['suds-jurko'],
+      install_requires=['suds-jurko'],
 )

tests/test_ship_service.py

@@ -55,6 +55,7 @@ def test_create_delete_shipment(self):
         shipment.RequestedShipment.LabelSpecification.LabelStockType = 'PAPER_7X4.75'
         shipment.RequestedShipment.LabelSpecification.LabelPrintingOrientation = 'BOTTOM_EDGE_OF_TEXT_FIRST'
 
+        # Use order if setting multiple labels or delete
         del shipment.RequestedShipment.LabelSpecification.LabelOrder
 
         package1_weight = shipment.create_wsdl_object_of_type('Weight')