Fix decode attribute error with options for py3 (#555)

Author: zippolyte

datadog/dogshell/wrap.py

@@ -211,8 +211,9 @@ def build_event_body(cmd, returncode, stdout, stderr, notifications):
         )
 
     if notifications:
+        notifications = notifications.decode("utf-8", "replace") if isinstance(notifications, bytes) else notifications
         fmt_notifications = u"**>>>> NOTIFICATIONS <<<<**\n\n {notifications}\n".format(
-            notifications=notifications.decode("utf-8", "replace")
+            notifications=notifications
         )
 
     return \

tests/unit/dogwrap/test_dogwrap.py

@@ -47,6 +47,11 @@ def test_build_event_body(self):
         event_body = build_event_body(cmd, returncode, stdout, stderr, notifications)
         self.assertEqual(expected_body, event_body)
 
+        # notifications can be unicode already in py3, make sure we don't try decoding
+        notifications = notifications.decode("utf-8", "replace")
+        event_body = build_event_body(cmd, returncode, stdout, stderr, notifications)
+        self.assertEqual(expected_body, event_body)
+
     def test_parse_options(self):
         options, cmd = parse_options([])
         self.assertEqual(cmd, '')