Browse Source

resolved some code issues identified by pyflakes

Helge Jung 9 years ago
parent
commit
1c29b3ecb8
3 changed files with 3 additions and 9 deletions
  1. 1 2
      modules/ffpb.py
  2. 1 4
      modules/ffpb_hamburg.py
  3. 1 3
      modules/ffpb_monitoring.py

+ 1 - 2
modules/ffpb.py

@@ -18,7 +18,6 @@ import subprocess
 import time
 
 import dns.resolver,dns.reversename
-import socket
 import SocketServer
 import threading
 
@@ -330,7 +329,7 @@ def ffpb_ensurenodeid(nodedata):
 		return nodedata
 
 	# derive node's id
-	nodeid = node['network']['mac'].replace(':','') if 'network' in node and 'mac' in node['network'] else None
+	nodeid = nodedata['network']['mac'].replace(':','') if 'network' in nodedata and 'mac' in nodedata['network'] else None
 
 	# assemble extended data
 	result = { 'node_id': nodeid }

+ 1 - 4
modules/ffpb_hamburg.py

@@ -2,10 +2,7 @@
 from __future__ import print_function
 import willie
 
-import random
-import time
-
-from ffpb import pretty_date, ffpb_fetch_stats
+from ffpb import ffpb_fetch_stats
 
 def setup(bot):
 	try:

+ 1 - 3
modules/ffpb_monitoring.py

@@ -2,11 +2,10 @@
 from __future__ import print_function
 import willie
 
-import datetime
 import shelve
 import time
 
-from ffpb import ffpb_ping
+from ffpb import ffpb_ping, pretty_date
 
 monitored_nodes = None
 
@@ -37,7 +36,6 @@ def ffpb_monitor_ping(bot):
 	# check each node under surveillance
 	for node in monitored_nodes:
 		mon = monitored_nodes[node]
-		added = mon['added']
 		last_status = mon['status']
 		last_check = mon['last_check']
 		last_success = mon['last_success']