diff --git a/salt/crypt.py b/salt/crypt.py index 2d19c9d9b5..7b6ad6c7f5 100644 --- a/salt/crypt.py +++ b/salt/crypt.py @@ -188,7 +188,7 @@ class Auth(object): context = zmq.Context() socket = context.socket(zmq.REQ) socket.connect(self.opts['master_uri']) - payload = self.serial.package(self.minion_sign_in_payload()) + payload = self.serial.dumps(self.minion_sign_in_payload()) socket.send(payload) payload = self.serial.unpackage(socket.recv()) if 'load' in payload: diff --git a/salt/payload.py b/salt/payload.py index e07091a412..b671b52cbc 100644 --- a/salt/payload.py +++ b/salt/payload.py @@ -44,7 +44,7 @@ class Serial(object): self.opts = opts self.serial = self.opts.get('serial', 'msgpack') - def loads(msg): + def loads(self, msg): ''' Run the correct loads serialization format ''' @@ -56,14 +56,14 @@ class Serial(object): except: return msgpack.loads(msg) - def load(fn_): + def load(self, fn_): ''' Run the correct serialization to load a file ''' data = fn_.read() return self.loads(data) - def dumps(msg): + def dumps(self, msg): ''' Run the correct dums serialization format ''' @@ -72,7 +72,7 @@ class Serial(object): else: return msgpack.dumps(msg) - def dump(msg, fn_): + def dump(self, msg, fn_): ''' Serialize the correct data into the named file object '''