added logging, trigger warning log on WARNING and NOTE

Author: radzhome

fedex/__init__.py

@@ -52,4 +52,4 @@
 our U{Github project<http://github.com/gtaylor/python-fedex/>} and enter
 an issue in the U{Issue Tracker<http://github.com/gtaylor/python-fedex/issues>}.
 """
-VERSION = __version__ = '2.3.0'
+VERSION = __version__ = '2.3.1'

fedex/base_service.py

@@ -16,19 +16,27 @@
 
 
 class GeneralSudsPlugin(MessagePlugin):
+    """
+    General Suds Plugin: Adds logging request and response functionality
+    and prunes empty WSDL objects before sending.
+    """
+
     def __init__(self, **kwargs):
+        """Initializes the request and response loggers."""
         self.request_logger = logging.getLogger('fedex.request')
         self.response_logger = logging.getLogger('fedex.response')
         self.kwargs = kwargs
 
     def marshalled(self, context):
-        # Removes the WSDL objects that do not have a value before sending.
+        """Removes the WSDL objects that do not have a value before sending."""
         context.envelope = context.envelope.prune()
 
     def sending(self, context):
+        """Logs the sent request."""
         self.request_logger.info("FedEx Request {}".format(context.envelope))
 
     def received(self, context):
+        """Logs the received response."""
         self.response_logger.info("FedEx Response {}".format(context.reply))
 
 
@@ -263,9 +271,9 @@ def _check_response_for_request_warnings(self):
         on postal code in a Rate Service request.
         """
 
-        if self.response.HighestSeverity == "NOTE":
+        if self.response.HighestSeverity in ("NOTE", "WARNING"):
             for notification in self.response.Notifications:
-                if notification.Severity == "NOTE":
+                if notification.Severity in ("NOTE", "WARNING"):
                     self.logger.warning(FedexFailure(notification.Code,
                                                      notification.Message))
 
@@ -326,6 +334,6 @@ def send_request(self, send_function=None):
         # This method can be overridden by a method on the child class object.
         self._check_response_for_request_warnings()
 
-        # Debug output.
+        # Debug output. (See Request and Response output)
         self.logger.debug("== FEDEX QUERY RESULT ==")
         self.logger.debug(self.response)

fedex/services/availability_commitment_service.py

@@ -32,7 +32,7 @@ def __init__(self, config_obj, *args, **kwargs):
         }
 
         self.CarrierCode = None
-        """ivar: Carrier Code Default to Fedex (FDXE), or can bbe FDXG."""
+        """@ivar: Carrier Code Default to Fedex (FDXE), or can bbe FDXG."""
 
         self.Origin = None
         """@ivar: Holds Origin Address WSDL object."""
@@ -65,7 +65,8 @@ def _prepare_wsdl_objects(self):
         Create the data structure and get it ready for the WSDL request.
         """
         self.CarrierCode = 'FDXE'
-        self.Origin = self.Destination = self.client.factory.create('Address')
+        self.Origin = self.client.factory.create('Address')
+        self.Destination = self.client.factory.create('Address')
         self.ShipDate = datetime.date.today().isoformat()
         self.Service = None
         self.Packaging = 'YOUR_PACKAGING'

fedex/services/country_service.py

@@ -33,10 +33,10 @@ def __init__(self, config_obj, *args, **kwargs):
         }
 
         self.CarrierCode = None
-        """ivar: Carrier Code Default to Fedex (FDXE), or can bbe FDXG."""
+        """@ivar: Carrier Code Default to Fedex (FDXE), or can bbe FDXG."""
 
         self.RoutingCode = None
-        """ivar: Routing Code Default to FDSD."""
+        """@ivar: Routing Code Default to FDSD."""
 
         self.Address = None
         """@ivar: Holds Address WSDL objects."""

fedex/tools/conversion.py

@@ -53,7 +53,7 @@ def basic_sobject_to_dict(obj):
 
 def sobject_to_dict(obj, key_to_lower=False, json_serialize=False):
     """
-    Converts a suds object to a dict.
+    Converts a suds object to a dict. Includes advanced features.
     :param json_serialize: If set, changes date and time types to iso string.
     :param key_to_lower: If set, changes index key name to lower case.
     :param obj: suds object
@@ -83,7 +83,7 @@ def sobject_to_dict(obj, key_to_lower=False, json_serialize=False):
 
 def sobject_to_json(obj, key_to_lower=False):
     """
-    Converts a suds object to json.
+    Converts a suds object to a JSON string.
     :param obj: suds object
     :param key_to_lower: If set, changes index key name to lower case.
     :return: json object