summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorNathan Fritz <nathan@andyet.net>2010-07-26 18:13:54 -0700
committerNathan Fritz <nathan@andyet.net>2010-07-26 18:13:54 -0700
commit2b6454786ace5f9cc585fd30f1337809f2107bf8 (patch)
tree585768e41d2f59463c9f79592370a4c60f8a134a /sleekxmpp/plugins
parenta349a2a317a6ca7152e0adb21d5fabbfd632ebaf (diff)
parentc8989c04f3675235e3ae730cb240e2154b5d9e76 (diff)
downloadslixmpp-2b6454786ace5f9cc585fd30f1337809f2107bf8.tar.gz
slixmpp-2b6454786ace5f9cc585fd30f1337809f2107bf8.tar.bz2
slixmpp-2b6454786ace5f9cc585fd30f1337809f2107bf8.tar.xz
slixmpp-2b6454786ace5f9cc585fd30f1337809f2107bf8.zip
Merge branch 'experimental' of git@github.com:fritzy/SleekXMPP into experimental
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0050.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0050.py b/sleekxmpp/plugins/xep_0050.py
index 4ff42859..5efb9116 100644
--- a/sleekxmpp/plugins/xep_0050.py
+++ b/sleekxmpp/plugins/xep_0050.py
@@ -9,7 +9,6 @@ from __future__ import with_statement
from . import base
import logging
from xml.etree import cElementTree as ET
-import traceback
import time
class xep_0050(base.base_plugin):