Merge branch 'scop-none-header'

asfaltboy · Oct 17, 2015 · 0b090b5 · 0b090b5
2 parents 3d30ab4 + ecf83b5
commit 0b090b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/stomp/test/utils_test.py b/stomp/test/utils_test.py
@@ -10,7 +10,7 @@ def test_returns_true_when_localhost(self):
         self.assertEquals(2, is_localhost(('192.168.1.92', 8000)))
 
     def test_convert_frame_to_lines(self):
-        f = Frame('SEND', { 'header1' : 'value1'}, 'this is the body')
+        f = Frame('SEND', {'header1' : 'value1', 'headerNone': None}, 'this is the body')
 
         lines = convert_frame_to_lines(f)
 

diff --git a/stomp/utils.py b/stomp/utils.py
@@ -169,6 +169,8 @@ def convert_frame_to_lines(frame):
         lines.append(frame.cmd)
         lines.append("\n")
     for key, vals in sorted(frame.headers.items()):
+        if vals is None:
+            continue
         if type(vals) != tuple:
             vals = (vals,)
         for val in vals: