← Back to branch summary

~facundo/ubuntuone-client/support-initial-disconnection

« back to all changes in this revision

Viewing changes to ubuntuone/oauthdesktop/auth.py

  • Committer: Rodney Dawes
  • Date: 2009-06-26 17:01:42 UTC
  • mto: This revision was merged to the branch mainline in revision 60.
  • Revision ID: rodney.dawes@canonical.com-20090626170142-a738504rgnarizuw
        Remove the canonical namespace, and just use ubuntuone as the toplevel
        Move storage/syncdaemon and storage/u1sync up a level

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/oauthdesktop/auth.py
1
 
# canonical.ubuntuone.oauthdesktop.auth - Client authorization module
 
1
# ubuntuone.oauthdesktop.auth - Client authorization module
2
2
#
3
3
# Author: Stuart Langridge <stuart.langridge@canonical.com>
4
4
#
30
30
import dbus
31
31
 
32
32
import gnomekeyring
33
 
from canonical.ubuntuone.storage.protocol import oauth
34
 
from canonical.ubuntuone.oauthdesktop.key_acls import set_all_key_acls
 
33
from ubuntuone.storageprotocol import oauth
 
34
from ubuntuone.oauthdesktop.key_acls import set_all_key_acls
35
35
 
36
36
from twisted.internet import reactor
37
37
from twisted.web import server, resource
38
38
 
39
 
from canonical.ubuntuone.oauthdesktop.logger import setupLogging
 
39
from ubuntuone.oauthdesktop.logger import setupLogging
40
40
setupLogging()
41
41
import logging
42
42
logger = logging.getLogger("UbuntuOne.OAuthDesktop.auth")