From 75f1c009125b308ff80f53050881cb5bebb4c477 Mon Sep 17 00:00:00 2001
From: Mike Place <mp@saltstack.com>
Date: Tue, 13 May 2014 13:20:50 -0600
Subject: [PATCH] Removes stale code.

Does nothing but remove deprecated code that is no longer in use.
---
 salt/modules/publish.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/salt/modules/publish.py b/salt/modules/publish.py
index ff3f0b3062..85a8a2f9f3 100644
--- a/salt/modules/publish.py
+++ b/salt/modules/publish.py
@@ -47,13 +47,11 @@ def _publish(
     '''
     if fun == 'publish.publish':
         log.info('Function name is \'publish.publish\'. Returning {}')
-        # Need to log something here
         return {}
 
     arg = _normalize_arg(arg)
 
     log.info('Publishing {0!r} to {master_uri}'.format(fun, **__opts__))
-    # sreq = salt.payload.SREQ(__opts__['master_uri'])
     auth = salt.crypt.SAuth(__opts__)
     tok = auth.gen_token('salt')
     load = {'cmd': 'minion_pub',
@@ -70,8 +68,6 @@ def _publish(
     sreq = salt.transport.Channel.factory(__opts__)
     try:
         peer_data = sreq.send(load)
-        # peer_data = auth.crypticle.loads(
-        #     sreq.send('aes', auth.crypticle.dumps(load), 1))
     except SaltReqTimeoutError:
         return '{0!r} publish timed out'.format(fun)
     if not peer_data:
@@ -83,8 +79,6 @@ def _publish(
             'tok': tok,
             'jid': peer_data['jid']}
     ret = sreq.send(load)
-    #  auth.crypticle.loads(
-    #         sreq.send('aes', auth.crypticle.dumps(load), 5))
     if form == 'clean':
         cret = {}
         for host in ret:
@@ -216,7 +210,6 @@ def runner(fun, arg=None, timeout=5):
     arg = _normalize_arg(arg)
 
     log.info('Publishing runner {0!r} to {master_uri}'.format(fun, **__opts__))
-    # sreq = salt.payload.SREQ(__opts__['master_uri'])
     auth = salt.crypt.SAuth(__opts__)
     tok = auth.gen_token('salt')
     load = {'cmd': 'minion_runner',
@@ -229,7 +222,5 @@ def runner(fun, arg=None, timeout=5):
     sreq = salt.transport.Channel.factory(__opts__)
     try:
         return sreq.send(load)
-        # return auth.crypticle.loads(
-        #    sreq.send('aes', auth.crypticle.dumps(load), 1))
     except SaltReqTimeoutError:
         return '{0!r} runner publish timed out'.format(fun)