[telepathy-python/master] stream_tube_client: import constants and interfaces

[Guillaume Desmottes]

---
 examples/stream_tube_client.py |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/examples/stream_tube_client.py b/examples/stream_tube_client.py
index 718fff4..7175b05 100644
--- a/examples/stream_tube_client.py
+++ b/examples/stream_tube_client.py
@@ -14,7 +14,8 @@ from telepathy.client import (
         Connection, Channel)
 from telepathy.interfaces import (
         CONN_INTERFACE, CHANNEL_INTERFACE_GROUP, CHANNEL_TYPE_TUBES,
-        CHANNEL_TYPE_TEXT, CONNECTION_INTERFACE_REQUESTS, CHANNEL_INTERFACE)
+        CHANNEL_TYPE_TEXT, CONNECTION_INTERFACE_REQUESTS, CHANNEL_INTERFACE,
+        CHANNEL_INTERFACE_TUBE, CHANNEL_TYPE_STREAM_TUBE)
 from telepathy.constants import (
         CONNECTION_HANDLE_TYPE_CONTACT,
         CONNECTION_HANDLE_TYPE_ROOM, CONNECTION_STATUS_CONNECTED,
@@ -24,19 +25,12 @@ from telepathy.constants import (
         SOCKET_ADDRESS_TYPE_UNIX, SOCKET_ADDRESS_TYPE_ABSTRACT_UNIX,
         SOCKET_ADDRESS_TYPE_IPV4, SOCKET_ADDRESS_TYPE_IPV6,
         SOCKET_ACCESS_CONTROL_LOCALHOST, SOCKET_ACCESS_CONTROL_PORT,
-        SOCKET_ACCESS_CONTROL_NETMASK, SOCKET_ACCESS_CONTROL_CREDENTIALS)
+        SOCKET_ACCESS_CONTROL_NETMASK, SOCKET_ACCESS_CONTROL_CREDENTIALS,
+        TUBE_CHANNEL_STATE_LOCAL_PENDING, TUBE_CHANNEL_STATE_REMOTE_PENDING,
+        TUBE_CHANNEL_STATE_OPEN, TUBE_CHANNEL_STATE_NOT_OFFERED)
 
 from account import connection_from_file
 
-# TODO: import when tube API is stable
-CHANNEL_INTERFACE_TUBE = CHANNEL_INTERFACE + ".Interface.Tube"
-CHANNEL_TYPE_STREAM_TUBE = CHANNEL_INTERFACE + ".Type.StreamTube"
-
-TUBE_CHANNEL_STATE_LOCAL_PENDING = 0
-TUBE_CHANNEL_STATE_REMOTE_PENDING = 1
-TUBE_CHANNEL_STATE_OPEN = 2
-TUBE_CHANNEL_STATE_NOT_OFFERED = 3
-
 tube_state = {TUBE_CHANNEL_STATE_LOCAL_PENDING : 'local pending',\
               TUBE_CHANNEL_STATE_REMOTE_PENDING : 'remote pending',\
               TUBE_CHANNEL_STATE_OPEN : 'open',
-- 
1.5.6.5