Remove underscores from key names,

CHANGES.txt

@@ -53,7 +53,8 @@ Next Release
     serializations now separate the data sent by the process from the
     "headers" using two linefeed characters (to make parsing easier).
     In event serialization "header" values, we've removed the space
-    between the header name and the value.
+    between the header name and the value.  The names of keys in all
+    event types have had underscores removed.
 
 3.0a2
 

src/supervisor/events.py

@@ -42,7 +42,7 @@ class EventBufferOverflowEvent(Event):
     def __str__(self):
         name = self.group.config.name
         typ = getEventNameByType(self.event)
-        return 'group_name:%s\nevent_type:%s' % (name, typ)
+        return 'groupname:%s\neventtype:%s' % (name, typ)
 
 class ProcessCommunicationEvent(Event):
     # event mode tokens
@@ -57,7 +57,7 @@ class ProcessCommunicationEvent(Event):
         groupname = ''
         if self.process.group is not None:
             groupname = self.process.group.config.name
-        return 'process_name:%s\ngroup_name:%s\npid:%s\n\n%s' % (
+        return 'processname:%s\ngroupname:%s\npid:%s\n\n%s' % (
             self.process.config.name,
             groupname,
             self.pid,
@@ -81,7 +81,7 @@ class ProcessStateChangeEvent(Event):
         groupname = ''
         if self.process.group is not None:
             groupname = self.process.group.config.name
-        return 'process_name:%s\ngroup_name:%s\npid:%s' % (
+        return 'processname:%s\ngroupname:%s\npid:%s' % (
             self.process.config.name,
             groupname,
             self.pid)

src/supervisor/tests/test_events.py

@@ -126,8 +126,8 @@ class TestSerializations(unittest.TestCase):
         process1.group = DummyGroup
         event = ProcessCommunicationStdoutEvent(process1, 1, 'yo')
         headers, payload = self._deserialize(str(event))
-        self.assertEqual(headers['process_name'], 'process1', headers)
-        self.assertEqual(headers['group_name'], 'process1', headers)
+        self.assertEqual(headers['processname'], 'process1', headers)
+        self.assertEqual(headers['groupname'], 'process1', headers)
         self.assertEqual(headers['pid'], '1', headers)
         self.assertEqual(payload, 'yo')
             
@@ -141,8 +141,8 @@ class TestSerializations(unittest.TestCase):
         from supervisor.events import ProcessCommunicationStderrEvent
         event = ProcessCommunicationStderrEvent(process1, 1, 'yo')
         headers, payload = self._deserialize(str(event))
-        self.assertEqual(headers['process_name'], 'process1', headers)
-        self.assertEqual(headers['group_name'], 'process1', headers)
+        self.assertEqual(headers['processname'], 'process1', headers)
+        self.assertEqual(headers['groupname'], 'process1', headers)
         self.assertEqual(headers['pid'], '1', headers)
 
     def test_overflow_event(self):
@@ -156,8 +156,8 @@ class TestSerializations(unittest.TestCase):
         wrapped = events.ProcessCommunicationStderrEvent(process1, 1, 'yo')
         event = events.EventBufferOverflowEvent(process1, wrapped)
         headers, payload = self._deserialize(str(event))
-        self.assertEqual(headers['group_name'], 'foo')
-        self.assertEqual(headers['event_type'], 'None')
+        self.assertEqual(headers['groupname'], 'foo')
+        self.assertEqual(headers['eventtype'], 'None')
 
     def test_process_sc_event(self):
         from supervisor import events
@@ -169,8 +169,8 @@ class TestSerializations(unittest.TestCase):
         process1.group = DummyGroup
         event = events.StartingFromStoppedEvent(process1, 1)
         headers, payload = self._deserialize(str(event))
-        self.assertEqual(headers['process_name'], 'process1')
-        self.assertEqual(headers['group_name'], 'process1')
+        self.assertEqual(headers['processname'], 'process1')
+        self.assertEqual(headers['groupname'], 'process1')
         self.assertEqual(headers['pid'], '1')
 
     def test_supervisor_sc_event(self):

src/supervisor/tests/test_process.py

@@ -1282,7 +1282,7 @@ class EventListenerPoolTests(ProcessGroupBaseTests):
         header, payload = process1.stdin_buffer.split('\n', 1)
         
         self.assertEquals(payload,
-            'process_name:process1\ngroup_name:whatever\npid:1', payload)
+            'processname:process1\ngroupname:whatever\npid:1', payload)
         headers = header.split()
         self.assertEqual(
             headers[5],