From c2851cd1e895bbc83e731d4fd0ded88903a4836b Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@zarb.org>
Date: Sat, 2 Nov 2013 11:29:40 +0100
Subject: [PATCH 1/3] make pyflakes a bit more silent
- explictely import json, since this is used ( only to silence pyflakes)
- remove shutil as it is unused
---
utilities/accelerate | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utilities/accelerate b/utilities/accelerate
index d8b4f0b1762..e44bca71d6b 100644
--- a/utilities/accelerate
+++ b/utilities/accelerate
@@ -72,9 +72,9 @@ EXAMPLES = '''
import base64
import getpass
+import json
import os
import os.path
-import shutil
import signal
import socket
import struct
From d000ef1844a9d9ee4fc36fac3f3d748b7b01c7aa Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@zarb.org>
Date: Sat, 2 Nov 2013 11:31:02 +0100
Subject: [PATCH 2/3] remove unused variable (pyflakes)
---
utilities/accelerate | 2 --
1 file changed, 2 deletions(-)
diff --git a/utilities/accelerate b/utilities/accelerate
index e44bca71d6b..38a96caba17 100644
--- a/utilities/accelerate
+++ b/utilities/accelerate
@@ -360,13 +360,11 @@ class ThreadedTCPRequestHandler(SocketServer.BaseRequestHandler):
return dict(failed=True, msg='internal error: out_path is required')
final_path = None
- final_user = None
if 'user' in data and data.get('user') != getpass.getuser():
vv("the target user doesn't match this user, we'll move the file into place via sudo")
(fd,out_path) = tempfile.mkstemp(prefix='ansible.', dir=os.path.expanduser('~/.ansible/tmp/'))
out_fd = os.fdopen(fd, 'w', 0)
final_path = data['out_path']
- final_user = data['user']
else:
out_path = data['out_path']
out_fd = open(out_path, 'w')
From 33e1a82faee71319d84156d88302b94ca391d395 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@zarb.org>
Date: Sat, 2 Nov 2013 11:32:54 +0100
Subject: [PATCH 3/3] fix incorrect send_data call. there is no client
variable, and send_data is a class method. Pyflakes complained about it.
---
utilities/accelerate | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utilities/accelerate b/utilities/accelerate
index 38a96caba17..9b79ca36494 100644
--- a/utilities/accelerate
+++ b/utilities/accelerate
@@ -250,7 +250,7 @@ class ThreadedTCPRequestHandler(SocketServer.BaseRequestHandler):
vv("bad decrypt, skipping...")
data2 = json.dumps(dict(rc=1))
data2 = self.server.key.Encrypt(data2)
- send_data(client, data2)
+ self.send_data(data2)
return
vvvv("loading json from the data")