Author: jim++ Date: 2007-12-27 22:52:45 +0100 (Thu, 27 Dec 2007) New Revision: 9204

Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/common/pubsub.py trunk/src/common/stanza_session.py trunk/src/disco.py trunk/src/features_window.py trunk/src/gajim.py trunk/src/lastfm.py trunk/src/roster_window.py Log: pyflakes checks, remove unused imports, mainly

Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/common/connection.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -56,8 +56,6 @@ import logging log = logging.getLogger('gajim.c.connection')

-import gtkgui_helpers - ssl_error = { 2: _("Unable to get issuer certificate"), 3: _("Unable to get certificate CRL"),

Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/common/connection_handlers.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -1281,7 +1281,7 @@ reply.setType('error')

reply.addChild(feature) - reply.addChild(node=xmpp.ErrorNode('service-unavailable', typ='cancel')) + reply.addChild(node=common.xmpp.ErrorNode('service-unavailable', typ='cancel'))

con.send(reply)

Modified: trunk/src/common/pubsub.py =================================================================== --- trunk/src/common/pubsub.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/common/pubsub.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -1,6 +1,5 @@ import xmpp import gajim -import dataforms import connection_handlers

class ConnectionPubSub: @@ -61,7 +60,7 @@ if configure: conf = c.addChild('configure') if configure_form is not None: - conf.addChild(node=configuration_form) + conf.addChild(node=configure_form)

self.connection.send(query)

Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/common/stanza_session.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -1,7 +1,6 @@ from common import gajim

from common import xmpp -from common import helpers from common import exceptions

import random

Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/disco.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -46,7 +46,6 @@ import weakref import gobject import gtk -import gobject import pango

import dialogs

Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/features_window.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -21,7 +21,6 @@ import os import sys import gtk -import gobject import gtkgui_helpers

import dialogs

Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/gajim.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -44,7 +44,6 @@ # os.environ['GTK_BASEPATH'] = 'gtk'

import sys -import urllib

import logging consoleloghandler = logging.StreamHandler() @@ -222,7 +221,6 @@

import re import signal -import getopt import time import math

Modified: trunk/src/lastfm.py =================================================================== --- trunk/src/lastfm.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/lastfm.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -25,7 +25,7 @@

from urllib import urlopen from xml.dom import minidom -from time import time, strftime +from time import time

class LastFM: # Where to fetch the played song information

Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/roster_window.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -30,7 +30,6 @@ import os import sys import time -import urllib

import common.sleepy import history_window