diff options
author | Tom Nichols <tmnichols@gmail.com> | 2010-06-02 15:45:51 -0400 |
---|---|---|
committer | Tom Nichols <tmnichols@gmail.com> | 2010-06-02 15:45:51 -0400 |
commit | 77bff9cce7deff133017c3aa2c36ff121adfd544 (patch) | |
tree | 4eed9803932e32dd6e691b9dc2c6dc8b081dbb01 /conn_tests/test_pubsubserver.py | |
parent | 3f41fdd231998aeb68a7490f723d3c092bd7e380 (diff) | |
parent | 7930ed22f2371ba3405f9644f427bec9554d2a15 (diff) | |
download | slixmpp-77bff9cce7deff133017c3aa2c36ff121adfd544.tar.gz slixmpp-77bff9cce7deff133017c3aa2c36ff121adfd544.tar.bz2 slixmpp-77bff9cce7deff133017c3aa2c36ff121adfd544.tar.xz slixmpp-77bff9cce7deff133017c3aa2c36ff121adfd544.zip |
Merge branch 'hacks' of git@github.com:tomstrummer/SleekXMPP into hacks
Diffstat (limited to 'conn_tests/test_pubsubserver.py')
-rw-r--r-- | conn_tests/test_pubsubserver.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/conn_tests/test_pubsubserver.py b/conn_tests/test_pubsubserver.py index d1e2208f..15635b4b 100644 --- a/conn_tests/test_pubsubserver.py +++ b/conn_tests/test_pubsubserver.py @@ -5,7 +5,6 @@ from xml.etree import cElementTree as ET import os import time import sys -import thread import unittest import sleekxmpp.plugins.xep_0004 from sleekxmpp.xmlstream.matcher.stanzapath import StanzaPath |