← Back to branch summary

~ubuntuone-control-tower/ubuntuone-client/trunk

« back to all changes in this revision

Viewing changes to ubuntuone/u1sync/client.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/u1sync/client.py
1
 
# canonical.ubuntuone.storage.u1sync.client
 
1
# ubuntuone.u1sync.client
2
2
#
3
3
# Client/protocol end of u1sync
4
4
#
35
35
 
36
36
from twisted.internet import reactor, defer, ssl
37
37
from twisted.internet.defer import inlineCallbacks, returnValue
38
 
from canonical.ubuntuone.storage.protocol.hash import crc32
39
 
from canonical.ubuntuone.storage.protocol.context import get_ssl_context
40
 
from canonical.ubuntuone.oauthdesktop.config import get_config \
 
38
from ubuntuone.storageprotocol.hash import crc32
 
39
from ubuntuone.storageprotocol.context import get_ssl_context
 
40
from ubuntuone.oauthdesktop.config import get_config \
41
41
                                                 as get_oauth_config
42
 
from canonical.ubuntuone.oauthdesktop.auth import AuthorisationClient
43
 
from canonical.ubuntuone.storage.u1sync.genericmerge import MergeNode
44
 
from canonical.ubuntuone.storage.u1sync.utils import should_sync
 
42
from ubuntuone.oauthdesktop.auth import AuthorisationClient
 
43
from ubuntuone.u1sync.genericmerge import MergeNode
 
44
from ubuntuone.u1sync.utils import should_sync
45
45
 
46
46
CONSUMER_KEY = "ubuntuone"
47
47
 
48
 
from canonical.ubuntuone.storage.protocol.oauth import OAuthConsumer
49
 
from canonical.ubuntuone.storage.protocol.client import (
 
48
from ubuntuone.storageprotocol.oauth import OAuthConsumer
 
49
from ubuntuone.storageprotocol.client import (
50
50
    StorageClientFactory, StorageClient)
51
 
from canonical.ubuntuone.storage.protocol import request
52
 
from canonical.ubuntuone.storage.protocol.dircontent_pb2 import \
 
51
from ubuntuone.storageprotocol import request
 
52
from ubuntuone.storageprotocol.dircontent_pb2 import \
53
53
    DirectoryContent, DIRECTORY
54
54
import uuid
55
55