[Supervisor-checkins] r803 - in supervisor/trunk/src/supervisor: . tests

[Mike Naberezny]

Author: Mike Naberezny <mike at maintainable.com>
Date: Mon Aug 18 12:45:10 2008
New Revision: 803

Log:
Remove old code from bad merge in r802.

Modified:
   supervisor/trunk/src/supervisor/supervisorctl.py
   supervisor/trunk/src/supervisor/tests/test_supervisorctl.py

Modified: supervisor/trunk/src/supervisor/supervisorctl.py
==============================================================================
--- supervisor/trunk/src/supervisor/supervisorctl.py	(original)
+++ supervisor/trunk/src/supervisor/supervisorctl.py	Mon Aug 18 12:45:10 2008
@@ -777,19 +777,6 @@
     def help_reload(self):
         self.ctl.output("reload \t\tRestart the remote supervisord.")
 
-    def _formatChanges(self, (added, changed, dropped)):
-        changedict = {}
-        for n, t in [(added, 'available'),
-                     (changed, 'changed'),
-                     (dropped, 'disappeared')]:
-            changedict.update(dict(zip(n, [t] * len(n))))
-
-        if changedict:
-            for name in sorted(changedict):
-                self.ctl.output("%s: %s" % (name, changedict[name]))
-        else:
-            self.ctl.output("No config updates to proccesses")
-
     def do_add(self, arg):
         names = arg.strip().split()
 

Modified: supervisor/trunk/src/supervisor/tests/test_supervisorctl.py
==============================================================================
--- supervisor/trunk/src/supervisor/tests/test_supervisorctl.py	(original)
+++ supervisor/trunk/src/supervisor/tests/test_supervisorctl.py	Mon Aug 18 12:45:10 2008
@@ -472,12 +472,6 @@
         self.assertEqual(result, None)
         self.assertEqual(options._server.supervisor._shutdown, True)
 
-    def test__formatChanges(self):
-        plugin = self._makeOne()
-        # Don't explode, plz
-        plugin._formatChanges([['added'], ['changed'], ['dropped']])
-        plugin._formatChanges([[], [], []])
-
     def test_add(self):
         plugin = self._makeOne()
         result = plugin.do_add('foo')