From 301ac21f2a4b6032d05fba362d167bf182404ee6 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 30 Aug 2010 16:09:09 +0200 Subject: little fixes --- module/plugins/hooks/ClickAndLoad.py | 2 +- module/plugins/hooks/ExternalScripts.py | 2 +- module/plugins/hooks/XMPPInterface.py | 11 +---------- 3 files changed, 3 insertions(+), 12 deletions(-) (limited to 'module/plugins/hooks') diff --git a/module/plugins/hooks/ClickAndLoad.py b/module/plugins/hooks/ClickAndLoad.py index b9824b863..fcbb27c21 100644 --- a/module/plugins/hooks/ClickAndLoad.py +++ b/module/plugins/hooks/ClickAndLoad.py @@ -43,7 +43,7 @@ class ClickAndLoad(Hook): thread.start_new_thread(proxy, (ip, self.port, 9666)) except: - self.logger.error("ClickAndLoad port already in use.") + self.log.error("ClickAndLoad port already in use.") def proxy(*settings): diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py index a3ed2f168..111b60d22 100644 --- a/module/plugins/hooks/ExternalScripts.py +++ b/module/plugins/hooks/ExternalScripts.py @@ -20,7 +20,7 @@ from module.plugins.Hook import Hook import subprocess -from os import listdir, sep +from os import listdir from os.path import join import sys diff --git a/module/plugins/hooks/XMPPInterface.py b/module/plugins/hooks/XMPPInterface.py index bfd60d271..b2d8f301b 100644 --- a/module/plugins/hooks/XMPPInterface.py +++ b/module/plugins/hooks/XMPPInterface.py @@ -18,20 +18,11 @@ @interface-version: 0.2 """ -import socket -import sys -from threading import Thread -import time -from time import sleep -from traceback import print_exc - -from pyxmpp.all import JID,Iq,Presence,Message,StreamError +from pyxmpp.all import JID,Message from pyxmpp.jabber.client import JabberClient from pyxmpp.interface import implements from pyxmpp.interfaces import * -from pyxmpp.streamtls import TLSSettings -from module.plugins.Hook import Hook from module.plugins.hooks.IRCInterface import IRCInterface class XMPPInterface(IRCInterface, JabberClient): -- cgit v1.2.3