[telepathy-gabble/master] remove unused imports in OLPC tests

[Dafydd Harries]

---
 tests/twisted/olpc/change-notifications.py        |    8 ++------
 tests/twisted/olpc/current-activity.py            |    5 +----
 tests/twisted/olpc/gadget-invite.py               |    5 ++---
 tests/twisted/olpc/gadget-publish.py              |    8 ++------
 tests/twisted/olpc/gadget-restarted.py            |    6 ++----
 tests/twisted/olpc/olpc-activity-search.py        |    5 ++---
 tests/twisted/olpc/olpc-buddy-search.py           |    2 +-
 tests/twisted/olpc/olpc-muc-invitation.py         |    2 +-
 tests/twisted/olpc/olpc-muc-prop-change.py        |    2 +-
 tests/twisted/olpc/test-olpc-bundle.py            |    2 +-
 tests/twisted/olpc/test-olpc-set-props-preload.py |    3 +--
 tests/twisted/olpc/util.py                        |    2 +-
 tests/twisted/olpc/view-presence.py               |    6 ++----
 13 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/tests/twisted/olpc/change-notifications.py b/tests/twisted/olpc/change-notifications.py
index d418318..dfa1bb8 100644
--- a/tests/twisted/olpc/change-notifications.py
+++ b/tests/twisted/olpc/change-notifications.py
@@ -3,12 +3,8 @@ test OLPC Buddy properties change notifications
 """
 # FIXME: merge this file to other tests ?
 
-import dbus
-
-from servicetest import call_async, EventPattern
-from gabbletest import exec_test, make_result_iq, acknowledge_iq
-
-from twisted.words.xish import domish, xpath
+from servicetest import EventPattern
+from gabbletest import exec_test, acknowledge_iq
 
 from util import announce_gadget, send_buddy_changed_properties_msg
 import ns
diff --git a/tests/twisted/olpc/current-activity.py b/tests/twisted/olpc/current-activity.py
index 3c23be1..d5378b4 100644
--- a/tests/twisted/olpc/current-activity.py
+++ b/tests/twisted/olpc/current-activity.py
@@ -5,10 +5,7 @@ test OLPC Buddy properties current activity
 import dbus
 
 from servicetest import call_async, EventPattern
-from gabbletest import exec_test, make_result_iq, acknowledge_iq
-from twisted.words.protocols.jabber.client import IQ
-
-from twisted.words.xish import domish, xpath
+from gabbletest import exec_test, acknowledge_iq
 
 from util import (announce_gadget, send_buddy_changed_current_act_msg,
     answer_to_current_act_pubsub_request, answer_error_to_pubsub_request,
diff --git a/tests/twisted/olpc/gadget-invite.py b/tests/twisted/olpc/gadget-invite.py
index 23df8a5..59152eb 100644
--- a/tests/twisted/olpc/gadget-invite.py
+++ b/tests/twisted/olpc/gadget-invite.py
@@ -4,12 +4,11 @@ test gadget invitation when an activity becomes public
 
 import dbus
 
-from servicetest import call_async, EventPattern, sync_dbus
+from servicetest import call_async, EventPattern
 from gabbletest import exec_test, make_result_iq, acknowledge_iq, sync_stream,\
     make_muc_presence
 
-from twisted.words.xish import domish, xpath
-from twisted.words.protocols.jabber.client import IQ
+from twisted.words.xish import xpath
 
 from util import announce_gadget, gadget_publish
 import ns
diff --git a/tests/twisted/olpc/gadget-publish.py b/tests/twisted/olpc/gadget-publish.py
index a1349ee..f50fd0c 100644
--- a/tests/twisted/olpc/gadget-publish.py
+++ b/tests/twisted/olpc/gadget-publish.py
@@ -4,12 +4,8 @@ test OLPC search activity
 
 import dbus
 
-from servicetest import call_async, EventPattern, tp_name_prefix
-from gabbletest import (exec_test, make_result_iq, acknowledge_iq, sync_stream,
-    elem)
-
-from twisted.words.xish import domish, xpath
-from twisted.words.protocols.jabber.client import IQ
+from servicetest import EventPattern
+from gabbletest import exec_test, acknowledge_iq
 
 from util import announce_gadget, gadget_publish
 import ns
diff --git a/tests/twisted/olpc/gadget-restarted.py b/tests/twisted/olpc/gadget-restarted.py
index 29b68d4..e9fc979 100644
--- a/tests/twisted/olpc/gadget-restarted.py
+++ b/tests/twisted/olpc/gadget-restarted.py
@@ -4,11 +4,9 @@ test OLPC search activity
 
 import dbus
 
-from servicetest import call_async, EventPattern
-from gabbletest import exec_test, make_result_iq, acknowledge_iq, sync_stream
+from servicetest import EventPattern
+from gabbletest import exec_test, acknowledge_iq, sync_stream
 
-from twisted.words.xish import domish, xpath
-from twisted.words.protocols.jabber.client import IQ
 from util import announce_gadget, request_random_activity_view, elem
 import ns
 
diff --git a/tests/twisted/olpc/olpc-activity-search.py b/tests/twisted/olpc/olpc-activity-search.py
index 4559b2a..cad8f4b 100644
--- a/tests/twisted/olpc/olpc-activity-search.py
+++ b/tests/twisted/olpc/olpc-activity-search.py
@@ -5,10 +5,9 @@ test OLPC search activity
 import dbus
 
 from servicetest import call_async, EventPattern
-from gabbletest import exec_test, make_result_iq, acknowledge_iq, sync_stream
+from gabbletest import exec_test, acknowledge_iq, sync_stream
 
-from twisted.words.xish import domish, xpath
-from twisted.words.protocols.jabber.client import IQ
+from twisted.words.xish import xpath
 from util import (announce_gadget, request_random_activity_view,
     answer_error_to_pubsub_request, send_reply_to_activity_view_request,
     parse_properties, properties_to_xml, create_gadget_message, close_view)
diff --git a/tests/twisted/olpc/olpc-buddy-search.py b/tests/twisted/olpc/olpc-buddy-search.py
index 2b97589..36808b1 100644
--- a/tests/twisted/olpc/olpc-buddy-search.py
+++ b/tests/twisted/olpc/olpc-buddy-search.py
@@ -7,7 +7,7 @@ import dbus
 from servicetest import call_async, EventPattern
 from gabbletest import exec_test, make_result_iq, acknowledge_iq
 
-from twisted.words.xish import domish, xpath
+from twisted.words.xish import xpath
 from twisted.words.protocols.jabber.client import IQ
 
 from util import (announce_gadget, properties_to_xml, parse_properties,
diff --git a/tests/twisted/olpc/olpc-muc-invitation.py b/tests/twisted/olpc/olpc-muc-invitation.py
index 76de0ef..c8c0148 100644
--- a/tests/twisted/olpc/olpc-muc-invitation.py
+++ b/tests/twisted/olpc/olpc-muc-invitation.py
@@ -6,7 +6,7 @@ import dbus
 
 from twisted.words.xish import domish, xpath
 
-from gabbletest import go, make_result_iq, exec_test, make_muc_presence
+from gabbletest import exec_test, make_muc_presence
 from servicetest import call_async, EventPattern
 import ns
 
diff --git a/tests/twisted/olpc/olpc-muc-prop-change.py b/tests/twisted/olpc/olpc-muc-prop-change.py
index 0e203ad..7347247 100644
--- a/tests/twisted/olpc/olpc-muc-prop-change.py
+++ b/tests/twisted/olpc/olpc-muc-prop-change.py
@@ -6,7 +6,7 @@ import dbus
 
 from twisted.words.xish import domish, xpath
 
-from gabbletest import go, make_result_iq, exec_test, acknowledge_iq, make_muc_presence
+from gabbletest import exec_test, acknowledge_iq, make_muc_presence
 from servicetest import call_async, EventPattern
 import ns
 
diff --git a/tests/twisted/olpc/test-olpc-bundle.py b/tests/twisted/olpc/test-olpc-bundle.py
index a0ea5e9..b8a59f9 100644
--- a/tests/twisted/olpc/test-olpc-bundle.py
+++ b/tests/twisted/olpc/test-olpc-bundle.py
@@ -3,7 +3,7 @@ interface"""
 import dbus
 
 from servicetest import call_async, EventPattern
-from gabbletest import exec_test, make_result_iq, acknowledge_iq
+from gabbletest import exec_test, acknowledge_iq
 
 from twisted.words.xish import domish, xpath
 import ns
diff --git a/tests/twisted/olpc/test-olpc-set-props-preload.py b/tests/twisted/olpc/test-olpc-set-props-preload.py
index 9a6dc41..318558b 100644
--- a/tests/twisted/olpc/test-olpc-set-props-preload.py
+++ b/tests/twisted/olpc/test-olpc-set-props-preload.py
@@ -6,8 +6,7 @@ Test connecting to a server.
 import dbus
 from twisted.words.xish import xpath
 
-from servicetest import EventPattern
-from gabbletest import go, exec_test
+from gabbletest import exec_test
 import ns
 
 def test(q, bus, conn, stream):
diff --git a/tests/twisted/olpc/util.py b/tests/twisted/olpc/util.py
index aab1486..c787535 100644
--- a/tests/twisted/olpc/util.py
+++ b/tests/twisted/olpc/util.py
@@ -1,7 +1,7 @@
 import dbus
 
 from servicetest import call_async, EventPattern
-from gabbletest import make_result_iq, acknowledge_iq, elem, elem_iq
+from gabbletest import make_result_iq, elem, elem_iq
 from twisted.words.xish import domish, xpath
 from twisted.words.protocols.jabber.client import IQ
 import ns
diff --git a/tests/twisted/olpc/view-presence.py b/tests/twisted/olpc/view-presence.py
index 0e257d0..e6de383 100644
--- a/tests/twisted/olpc/view-presence.py
+++ b/tests/twisted/olpc/view-presence.py
@@ -7,11 +7,9 @@ import dbus
 from servicetest import call_async, EventPattern
 from gabbletest import exec_test, make_result_iq, acknowledge_iq, sync_stream
 
-from twisted.words.xish import domish, xpath
-from twisted.words.protocols.jabber.client import IQ
+from twisted.words.xish import xpath
 
-from util import (announce_gadget, properties_to_xml, parse_properties,
-    create_gadget_message, close_view, elem)
+from util import announce_gadget, create_gadget_message, elem
 import ns
 
 tp_name_prefix = 'org.freedesktop.Telepathy'
-- 
1.5.6.5