diff options
| author | Nathan Fritz <nathan@andyet.net> | 2010-06-01 21:45:15 -0700 |
|---|---|---|
| committer | Nathan Fritz <nathan@andyet.net> | 2010-06-01 21:45:15 -0700 |
| commit | 18e27d65ce47d877d6b2c810979df640aba7d8ba (patch) | |
| tree | 942ed2d45a54e830d6e7c005e3f872c480477866 /conn_tests/test_pubsubserver.py | |
| parent | 0c39567f208db4938614e9723901037d8801fb25 (diff) | |
| parent | aa916c9ac893a976c8e26ee07ca4a9768a5e1680 (diff) | |
| download | slixmpp-18e27d65ce47d877d6b2c810979df640aba7d8ba.tar.gz slixmpp-18e27d65ce47d877d6b2c810979df640aba7d8ba.tar.bz2 slixmpp-18e27d65ce47d877d6b2c810979df640aba7d8ba.tar.xz slixmpp-18e27d65ce47d877d6b2c810979df640aba7d8ba.zip | |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
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 |