[Telepathy-commits] [telepathy-salut/master] merge 2 import lines

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Fri Dec 5 05:05:02 PST 2008


---
 tests/twisted/avahi/file_transfer_helper.py |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/tests/twisted/avahi/file_transfer_helper.py b/tests/twisted/avahi/file_transfer_helper.py
index 74d6d15..1ac2395 100644
--- a/tests/twisted/avahi/file_transfer_helper.py
+++ b/tests/twisted/avahi/file_transfer_helper.py
@@ -7,8 +7,7 @@ import urllib
 import httplib
 import urlparse
 
-from avahitest import AvahiAnnouncer, AvahiListener
-from avahitest import get_host_name
+from avahitest import AvahiAnnouncer, AvahiListener, get_host_name
 
 from xmppstream import setup_stream_listener, connect_to_stream
 from servicetest import make_channel_proxy, EventPattern
-- 
1.5.6.5




More information about the Telepathy-commits mailing list