|
@@ -1,15 +1,12 @@
|
|
|
#!/usr/bin/python
|
|
|
|
|
|
from __future__ import print_function
|
|
|
-from copy import deepcopy
|
|
|
import io
|
|
|
import json
|
|
|
-import socket
|
|
|
+import string
|
|
|
import subprocess
|
|
|
import time
|
|
|
|
|
|
-import string
|
|
|
-import StringIO
|
|
|
|
|
|
class BatmanParser:
|
|
|
batadv_vis = 'batadv-vis'
|
|
@@ -28,7 +25,7 @@ class BatmanParser:
|
|
|
raise Exception("batadv-vis not found or incompatible: " + str(err))
|
|
|
|
|
|
try:
|
|
|
- check = json.loads(testdata)
|
|
|
+ json.loads(testdata)
|
|
|
except Exception as err:
|
|
|
raise Exception("batadv-vis does not return valid JSON data: " + str(err))
|
|
|
|
|
@@ -53,7 +50,6 @@ class BatmanParser:
|
|
|
|
|
|
# dump raw data into file if requested
|
|
|
if not batadv_dump is None:
|
|
|
- jsondata = json.dumps(batmandata, ensure_ascii=False)
|
|
|
f = io.open(batadv_dump, 'w')
|
|
|
f.write(rawdata)
|
|
|
f.close()
|