Allow use of enums as tag/value

Author: Code0x58

simplefix/message.py

@@ -38,13 +38,14 @@
 import sys
 import time
 import warnings
+from enum import Enum
 
 from .constants import SOH_STR, TAG_BEGINSTRING, TAG_BODYLENGTH, TAG_CHECKSUM, TAG_MSGTYPE
 from .enums import TagType
 
 
 def fix_val(value):
-    """Make a FIX value from a string, bytes, or number."""
+    """Make a FIX value from a string, bytes, number, or bytes Enums."""
     if type(value) is bytes:
         return value
 
@@ -54,11 +55,15 @@ def fix_val(value):
     if type(value) is str:
         return bytes(value, 'UTF-8')
 
+    # e.g. members of simplefix.enums
+    if isinstance(value, Enum):
+        return value.value
+
     return bytes(str(value), 'ASCII')
 
 
 def fix_tag(value):
-    """Make a FIX tag value from string, bytes, or integer."""
+    """Make a FIX tag value from string, bytes, integer, or TagType."""
     if sys.version_info[0] == 2:
         return bytes(value)
 
@@ -68,6 +73,9 @@ def fix_tag(value):
     if type(value) is str:
         return value.encode('ASCII')
 
+    if isinstance(value, TagType):
+        value = value.value
+
     return str(value).encode('ASCII')
 
 

test/test_message.py

@@ -24,11 +24,11 @@
 ########################################################################
 
 import datetime
-import sys
 import time
 import unittest
 
 from simplefix import FixMessage
+from simplefix.enums import TagType, MSGTYPE
 from simplefix.message import fix_tag, fix_val
 
 
@@ -922,6 +922,11 @@ def test_tag_int(self):
         self.assertEqual(b"123", fix_tag(123))
         self.assertEqual(bytes, type(fix_tag(123)))
 
+    def test_tag_enum(self):
+        """Test enum tag value returns bytes."""
+        self.assertEqual(b"123", fix_tag(TagType.GAPFILLFLAG))
+        self.assertEqual(bytes, type(fix_tag(TagType.GAPFILLFLAG)))
+
     def test_val_bytes(self):
         """Test bytes value returns bytes."""
         self.assertEqual(b"123", fix_val(b"123"))
@@ -932,6 +937,11 @@ def test_val_str(self):
         self.assertEqual(b"123", fix_val("123"))
         self.assertEqual(bytes, type(fix_val("123")))
 
+    def test_val_bytes(self):
+        """Test bytes value returns bytes."""
+        self.assertEqual(b"1", fix_val(MSGTYPE.TEST_REQUEST))
+        self.assertEqual(bytes, type(fix_val(MSGTYPE.TEST_REQUEST)))
+
 
 if __name__ == "__main__":
     unittest.main()