make functions pure

Author: miquelbeltran

python3/raygun4py/raygunmsgs.py

@@ -132,6 +132,15 @@ def __init__(self):
         self.occurredOn = datetime.utcnow()
         self.details = {}
 
+    def __copy__(self):
+        new_instance = RaygunMessage()
+        new_instance.details = self.details.copy()
+        new_instance.occurredOn = self.occurredOn
+        return new_instance
+
+    def copy(self):
+        return self.__copy__()
+
     def get_error(self):
         return self.details.get("error")
 

python3/raygun4py/raygunprovider.py

@@ -295,6 +295,7 @@ def _create_message(
         )
 
     def _transform_message(self, message):
+        message = message.copy()
         message = utilities.ignore_exceptions(self.ignored_exceptions, message)
 
         if message is not None:
@@ -314,6 +315,7 @@ def _transform_message(self, message):
         return message
 
     def _post(self, raygunMessage):
+        raygunMessage = raygunMessage.copy()
         options = {
             "enforce_payload_size_limit": self.enforce_payload_size_limit,
             "log_payload_size_limit_breaches": self.log_payload_size_limit_breaches,

python3/raygun4py/utilities.py

@@ -12,10 +12,10 @@ def ignore_exceptions(ignored_exceptions, message):
 
 
 def filter_keys(filtered_keys, object):
-    iteration_target = object
-
     if isinstance(object, raygunmsgs.RaygunMessage):
         iteration_target = dict(object.__dict__)
+    else:
+        iteration_target = dict(object)
 
     for key in iter(iteration_target.keys()):
         if isinstance(iteration_target[key], dict):
@@ -31,8 +31,9 @@ def filter_keys(filtered_keys, object):
                         iteration_target[key] = "<filtered>"
 
     if isinstance(object, raygunmsgs.RaygunMessage):
-        object.__dict__.update(iteration_target)
-        return object
+        updated_object = object.copy()
+        updated_object.__dict__.update(iteration_target)
+        return updated_object
 
     return iteration_target
 

python3/tests/test_raygunprovider.py

@@ -140,46 +140,46 @@ def create_dummy_message(self):
     def test_message_with_error(self):
         msg = self.create_dummy_message()
         self.sender.on_grouping_key(self.the_callback_with_error)
-        self.sender._transform_message(msg)
+        msg =self.sender._transform_message(msg)
         self.assertEqual(msg.get_details()["groupingKey"], "Exception: None")
 
     def test_groupingkey_is_not_none_with_callback(self):
         msg = self.create_dummy_message()
         self.sender.on_grouping_key(self.the_callback)
         self.key = "foo"
-        self.sender._transform_message(msg)
+        msg =self.sender._transform_message(msg)
 
         self.assertIsNotNone(msg.get_details()["groupingKey"])
 
     def test_groupingkey_is_set_with_callback(self):
         msg = self.create_dummy_message()
         self.sender.on_grouping_key(self.the_callback)
         self.key = "foo"
-        self.sender._transform_message(msg)
+        msg = self.sender._transform_message(msg)
 
         self.assertEqual(msg.get_details()["groupingKey"], "foo")
 
     def test_groupingkey_is_string_with_callback(self):
         msg = self.create_dummy_message()
         self.sender.on_grouping_key(self.the_callback)
         self.key = "foo"
-        self.sender._transform_message(msg)
+        msg =self.sender._transform_message(msg)
 
         self.assertIsInstance(msg.get_details()["groupingKey"], str)
 
     def test_groupingkey_is_none_when_not_string_returned_from_callback(self):
         msg = self.create_dummy_message()
         self.sender.on_grouping_key(self.the_callback)
         self.key = object
-        self.sender._transform_message(msg)
+        msg = self.sender._transform_message(msg)
 
         self.assertIsNone(msg.get_details()["groupingKey"])
 
     def test_groupingkey_is_none_when_empty_string_returned_from_callback(self):
         msg = self.create_dummy_message()
         self.sender.on_grouping_key(self.the_callback)
         self.key = ""
-        self.sender._transform_message(msg)
+        msg = self.sender._transform_message(msg)
 
         self.assertIsNone(msg.get_details()["groupingKey"])
 
@@ -191,7 +191,7 @@ def test_groupingkey_is_set_when_ok_length_string_returned_from_callback(self):
         for i in range(0, 99):
             self.key += "a"
 
-        self.sender._transform_message(msg)
+        msg =self.sender._transform_message(msg)
         self.assertEqual(msg.get_details()["groupingKey"], self.key)
 
     def test_groupingkey_is_none_when_too_long_string_returned_from_callback(self):
@@ -202,7 +202,7 @@ def test_groupingkey_is_none_when_too_long_string_returned_from_callback(self):
         for i in range(0, 100):
             self.key += "a"
 
-        self.sender._transform_message(msg)
+        msg = self.sender._transform_message(msg)
         self.assertIsNone(msg.get_details()["groupingKey"])
 
 

python3/tests/test_utilities.py

@@ -7,22 +7,22 @@ class TestRaygunUtilities(unittest.TestCase):
     def test_filter_keys(self):
         test_obj = {"foo": "bar", "baz": "qux"}
 
-        utilities.filter_keys(["foo"], test_obj)
+        test_obj = utilities.filter_keys(["foo"], test_obj)
 
         self.assertEqual(test_obj["foo"], "<filtered>")
 
     def test_filter_keys_recursive(self):
         test_obj = {"foo": "bar", "baz": "qux", "boo": {"foo": "qux"}}
 
-        utilities.filter_keys(["foo"], test_obj)
+        test_obj = utilities.filter_keys(["foo"], test_obj)
 
         self.assertEqual(test_obj["foo"], "<filtered>")
         self.assertEqual(test_obj["boo"]["foo"], "<filtered>")
 
     def test_filter_keys_with_wildcard(self):
         test_obj = {"foobr": "bar", "foobz": "baz", "fooqx": "foo", "baz": "qux"}
 
-        utilities.filter_keys(["foo*"], test_obj)
+        test_obj = utilities.filter_keys(["foo*"], test_obj)
 
         self.assertEqual(test_obj["foobr"], "<filtered>")
         self.assertEqual(test_obj["foobz"], "<filtered>")