Permalink
Browse files

fixed problems created by change in how json is imported

  • Loading branch information...
1 parent 2ee71a5 commit 667de7ed5a56305047dc0590eb9b15de828760ca @trey0 trey0 committed Mar 29, 2011
Showing with 5 additions and 6 deletions.
  1. +4 −5 Slave.py
  2. +1 −1 shellJson.py
View
@@ -6,7 +6,6 @@
import sys
-
from geocamPycroraptor.Printable import Printable
from geocamPycroraptor.PycroEncoder import PycroEncoder
from geocamPycroraptor import anyjson as json
@@ -42,10 +41,10 @@ def handleConnect(self, conn):
self.write('get status -a\n')
def handleLine(self, conn, text):
- json = json.loads(text)
- print 'Slave: handleLine:', json
- if json[0] == 'status':
- _, taskName, status = json
+ cmd = json.loads(text)
+ print 'Slave: handleLine:', cmd
+ if cmd[0] == 'status':
+ _, taskName, status = cmd
self.handleStatus(taskName, status)
else:
pass # nothing to do for other message types yet
View
@@ -4,7 +4,7 @@
# All Rights Reserved.
# __END_LICENSE__
-import re, json
+import re
import geocamPycroraptor.exceptions
from geocamPycroraptor import anyjson as json

0 comments on commit 667de7e

Please sign in to comment.