X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Ftp%2Fconn.py;h=c0e1ce2cfc39582dcf2bc9bb4f7f3692718feddb;hp=256a5746b952892e1488e15f3907bb627f3448a0;hb=c6c19d3806952ece8a1c0823cb2c55dac11db865;hpb=b14494d3d36e55d4a6c2cbd2e467e1686cbb8f7e diff --git a/src/tp/conn.py b/src/tp/conn.py index 256a574..c0e1ce2 100644 --- a/src/tp/conn.py +++ b/src/tp/conn.py @@ -42,7 +42,7 @@ from telepathy.interfaces import (CONN_INTERFACE, from handle import Handle from properties import DBusProperties -from telepathy._generated.Connection import Connection as _Connection +from _generated.Connection import Connection as _Connection _BAD = re.compile(r'(?:^[0-9])|(?:[^A-Za-z0-9])') @@ -332,15 +332,15 @@ class Connection(_Connection, DBusProperties): return ret -from telepathy._generated.Connection_Interface_Aliasing \ +from _generated.Connection_Interface_Aliasing \ import ConnectionInterfaceAliasing -from telepathy._generated.Connection_Interface_Avatars \ +from _generated.Connection_Interface_Avatars \ import ConnectionInterfaceAvatars -from telepathy._generated.Connection_Interface_Capabilities \ +from _generated.Connection_Interface_Capabilities \ import ConnectionInterfaceCapabilities \ as _ConnectionInterfaceCapabilities @@ -398,7 +398,7 @@ class ConnectionInterfaceCapabilities(_ConnectionInterfaceCapabilities): # return all my capabilities return [(ctype, caps[1]) for ctype, caps in my_caps.iteritems()] -from telepathy._generated.Connection_Interface_Requests \ +from _generated.Connection_Interface_Requests \ import ConnectionInterfaceRequests \ as _ConnectionInterfaceRequests @@ -550,11 +550,11 @@ class ConnectionInterfaceRequests( self.signal_new_channels([channel]) -from telepathy._generated.Connection_Interface_Presence \ +from _generated.Connection_Interface_Presence \ import ConnectionInterfacePresence -from telepathy._generated.Connection_Interface_Simple_Presence \ +from _generated.Connection_Interface_Simple_Presence \ import ConnectionInterfaceSimplePresence -from telepathy._generated.Connection_Interface_Contacts \ +from _generated.Connection_Interface_Contacts \ import ConnectionInterfaceContacts