jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optimize imports

Browse Source
This commit is contained in:
Jean-Philippe Caruana 2013-07-26 13:04:08 +02:00
parent 18dde97c8c
commit 2c26fb0d76
11 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sleekxmpp/__init__.py
View File

@ -14,6 +14,5 @@ from sleekxmpp.jid import JID, InvalidJID
from sleekxmpp.xmlstream.handler import * from sleekxmpp.xmlstream.handler import *
from sleekxmpp.xmlstream import XMLStream, RestartStream from sleekxmpp.xmlstream import XMLStream, RestartStream
from sleekxmpp.xmlstream.matcher import * from sleekxmpp.xmlstream.matcher import *
from sleekxmpp.xmlstream.stanzabase import StanzaBase, ET
from sleekxmpp.version import __version__, __version_info__ from sleekxmpp.version import __version__, __version_info__

6
sleekxmpp/basexmpp.py
View File

@ -19,14 +19,13 @@ import logging
import threading import threading
import sleekxmpp import sleekxmpp
from sleekxmpp import plugins, features, roster from sleekxmpp import plugins, roster
from sleekxmpp.api import APIRegistry from sleekxmpp.api import APIRegistry
from sleekxmpp.exceptions import IqError, IqTimeout from sleekxmpp.exceptions import IqError, IqTimeout
from sleekxmpp.stanza import Message, Presence, Iq, StreamError from sleekxmpp.stanza import Message, Presence, Iq, StreamError
from sleekxmpp.stanza.roster import Roster from sleekxmpp.stanza.roster import Roster
from sleekxmpp.stanza.nick import Nick from sleekxmpp.stanza.nick import Nick
from sleekxmpp.stanza.htmlim import HTMLIM
from sleekxmpp.xmlstream import XMLStream, JID from sleekxmpp.xmlstream import XMLStream, JID
from sleekxmpp.xmlstream import ET, register_stanza_plugin from sleekxmpp.xmlstream import ET, register_stanza_plugin
@ -34,8 +33,7 @@ from sleekxmpp.xmlstream.matcher import MatchXPath
from sleekxmpp.xmlstream.handler import Callback from sleekxmpp.xmlstream.handler import Callback
from sleekxmpp.xmlstream.stanzabase import XML_NS from sleekxmpp.xmlstream.stanzabase import XML_NS
from sleekxmpp.features import * from sleekxmpp.plugins import PluginManager, load_plugin
from sleekxmpp.plugins import PluginManager, register_plugin, load_plugin
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

2
sleekxmpp/features/feature_bind/bind.py
View File

@ -12,7 +12,7 @@ from sleekxmpp.jid import JID
from sleekxmpp.stanza import Iq, StreamFeatures from sleekxmpp.stanza import Iq, StreamFeatures
from sleekxmpp.features.feature_bind import stanza from sleekxmpp.features.feature_bind import stanza
from sleekxmpp.xmlstream import register_stanza_plugin from sleekxmpp.xmlstream import register_stanza_plugin
from sleekxmpp.plugins import BasePlugin, register_plugin from sleekxmpp.plugins import BasePlugin
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

1
sleekxmpp/features/feature_mechanisms/mechanisms.py
View File

@ -6,7 +6,6 @@
See the file LICENSE for copying permission. See the file LICENSE for copying permission.
""" """
import sys
import ssl import ssl
import logging import logging

2
sleekxmpp/features/feature_preapproval/preapproval.py
View File

@ -8,7 +8,7 @@
import logging import logging
from sleekxmpp.stanza import Iq, StreamFeatures from sleekxmpp.stanza import StreamFeatures
from sleekxmpp.features.feature_preapproval import stanza from sleekxmpp.features.feature_preapproval import stanza
from sleekxmpp.xmlstream import register_stanza_plugin from sleekxmpp.xmlstream import register_stanza_plugin
from sleekxmpp.plugins.base import BasePlugin from sleekxmpp.plugins.base import BasePlugin

2
sleekxmpp/features/feature_rosterver/rosterver.py
View File

@ -8,7 +8,7 @@
import logging import logging
from sleekxmpp.stanza import Iq, StreamFeatures from sleekxmpp.stanza import StreamFeatures
from sleekxmpp.features.feature_rosterver import stanza from sleekxmpp.features.feature_rosterver import stanza
from sleekxmpp.xmlstream import register_stanza_plugin from sleekxmpp.xmlstream import register_stanza_plugin
from sleekxmpp.plugins.base import BasePlugin from sleekxmpp.plugins.base import BasePlugin

1
sleekxmpp/plugins/xep_0082.py
View File

@ -6,7 +6,6 @@
See the file LICENSE for copying permission. See the file LICENSE for copying permission.
""" """
import logging
import datetime as dt import datetime as dt
from sleekxmpp.plugins import BasePlugin, register_plugin from sleekxmpp.plugins import BasePlugin, register_plugin

1
sleekxmpp/roster/__init__.py
View File

@ -6,7 +6,6 @@
See the file LICENSE for copying permission. See the file LICENSE for copying permission.
""" """
from sleekxmpp.xmlstream import JID
from sleekxmpp.roster.item import RosterItem from sleekxmpp.roster.item import RosterItem
from sleekxmpp.roster.single import RosterNode from sleekxmpp.roster.single import RosterNode
from sleekxmpp.roster.multi import Roster from sleekxmpp.roster.multi import Roster

6
sleekxmpp/test/sleektest.py
View File

@ -9,14 +9,12 @@
import unittest import unittest
from xml.parsers.expat import ExpatError from xml.parsers.expat import ExpatError
import sleekxmpp
from sleekxmpp import ClientXMPP, ComponentXMPP from sleekxmpp import ClientXMPP, ComponentXMPP
from sleekxmpp.util import Queue from sleekxmpp.util import Queue
from sleekxmpp.stanza import Message, Iq, Presence from sleekxmpp.stanza import Message, Iq, Presence
from sleekxmpp.test import TestSocket, TestLiveSocket from sleekxmpp.test import TestSocket, TestLiveSocket
from sleekxmpp.exceptions import XMPPError, IqTimeout, IqError from sleekxmpp.xmlstream import ET
from sleekxmpp.xmlstream import ET, register_stanza_plugin from sleekxmpp.xmlstream import ElementBase
from sleekxmpp.xmlstream import ElementBase, StanzaBase
from sleekxmpp.xmlstream.tostring import tostring from sleekxmpp.xmlstream.tostring import tostring
from sleekxmpp.xmlstream.matcher import StanzaPath, MatcherId from sleekxmpp.xmlstream.matcher import StanzaPath, MatcherId
from sleekxmpp.xmlstream.matcher import MatchXMLMask, MatchXPath from sleekxmpp.xmlstream.matcher import MatchXMLMask, MatchXPath

4
sleekxmpp/thirdparty/socks.py vendored
View File

@ -28,9 +28,6 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMANGE.
This module provides a standard socket-like interface for Python This module provides a standard socket-like interface for Python
for tunneling connections through SOCKS proxies. for tunneling connections through SOCKS proxies.
"""
"""
Minor modifications made by Christopher Gilbert (http://motomastyle.com/) Minor modifications made by Christopher Gilbert (http://motomastyle.com/)
for use in PyLoris (http://pyloris.sourceforge.net/) for use in PyLoris (http://pyloris.sourceforge.net/)
@ -42,7 +39,6 @@ mainly to merge bug fixes found in Sourceforge
import socket import socket
import struct import struct
import sys
PROXY_TYPE_SOCKS4 = 1 PROXY_TYPE_SOCKS4 = 1
PROXY_TYPE_SOCKS5 = 2 PROXY_TYPE_SOCKS5 = 2

1
sleekxmpp/util/stringprep_profiles.py
View File

@ -16,7 +16,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import sys
import stringprep import stringprep
from unicodedata import ucd_3_2_0 as unicodedata from unicodedata import ucd_3_2_0 as unicodedata