← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/main.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/syncdaemon/main.py
1
 
# canonical.ubuntuone.storage.syncdaemon.main - main SyncDaemon innards
 
1
# ubuntuone.syncdaemon.main - main SyncDaemon innards
2
2
#
3
3
# Author: Guillermo Gonzalez <guillermo.gonzalez@canonical.com>
4
4
#         John Lenton <john.lenton@canonical.com>
26
26
 
27
27
from twisted.internet import defer, reactor, task
28
28
 
29
 
from canonical.ubuntuone.storage.protocol import oauth
30
 
from canonical.ubuntuone.storage.syncdaemon import (
 
29
from ubuntuone.storageprotocol import oauth
 
30
from ubuntuone.syncdaemon import (
31
31
    action_queue,
32
32
    dbus_interface,
33
33
    event_queue,
38
38
    sync,
39
39
    volume_manager,
40
40
)
41
 
from canonical.ubuntuone.storage.syncdaemon.state import SyncDaemonStateManager
 
41
from ubuntuone.syncdaemon.state import SyncDaemonStateManager
42
42
 
43
43
 
44
44
class Main(object):