~mvo/ubuntu-sso-client/strawman-lp711413

« back to all changes in this revision

Viewing changes to ubuntu_sso/main.py

  • Committer: natalia.bidart at canonical
  • Date: 2010-06-10 14:34:40 UTC
  • mto: This revision was merged to the branch mainline in revision 537.
  • Revision ID: natalia.bidart@canonical.com-20100610143440-nzqm5ad5g0xd2k29
Making rename of ubuntu.sso to ubuntu_sso to avoid package name clashing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#!/usr/bin/python
2
2
 
3
 
# ubuntu.sso.main - main login handling interface
 
3
# ubuntu_sso.main - main login handling interface
4
4
#
5
5
# Author: Stuart Langridge <stuart.langridge@canonical.com>
6
6
#
30
30
 
31
31
from dbus.mainloop.glib import DBusGMainLoop
32
32
 
33
 
from ubuntu.sso import DBUS_IFACE_AUTH_NAME
34
 
from ubuntu.sso.config import get_config
 
33
from ubuntu_sso import DBUS_IFACE_AUTH_NAME
 
34
from ubuntu_sso.config import get_config
35
35
 
36
 
from ubuntu.sso.logger import setupLogging
37
 
logger = setupLogging("ubuntu.sso.main")
 
36
from ubuntu_sso.logger import setupLogging
 
37
logger = setupLogging("ubuntu_sso.main")
38
38
 
39
39
DBusGMainLoop(set_as_default=True)
40
40
 
78
78
                     "access='%s', secret='%s'", request_token_url,
79
79
                     user_authorisation_url, access_token_url, consumer_secret)
80
80
 
81
 
        from ubuntu.sso.auth import AuthorisationClient
 
81
        from ubuntu_sso.auth import AuthorisationClient
82
82
        client = AuthorisationClient(self.realm,
83
83
                                     request_token_url,
84
84
                                     user_authorisation_url,
99
99
        self.consumer_key = str(consumer_key)
100
100
        (request_token_url, user_authorisation_url,
101
101
          access_token_url, consumer_secret) =  self.get_config_urls(self.realm)
102
 
        from ubuntu.sso.auth import AuthorisationClient
 
102
        from ubuntu_sso.auth import AuthorisationClient
103
103
        client = AuthorisationClient(self.realm,
104
104
                                     request_token_url,
105
105
                                     user_authorisation_url,