← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/fsm/fsm.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/fsm/fsm.py
1
 
# canonical.ubuntuone.storage.syncdaemon.fsm.fsm - a fsm
 
1
# ubuntuone.syncdaemon.fsm.fsm - a fsm
2
2
#
3
3
# Author: Lucio Torre <lucio.torre@canonical.com>
4
4
#
21
21
"""
22
22
import itertools
23
23
 
24
 
from canonical.ubuntuone.storage.syncdaemon import logger
 
24
from ubuntuone.syncdaemon import logger
25
25
 
26
26
try:
27
27
    product = itertools.product
191
191
                # fsm_parser depends on python-uno for reading ods documents
192
192
                # this shouldnt be called with an .ods file on production
193
193
                # environments
194
 
                from canonical.ubuntuone.storage.syncdaemon.fsm import \
 
194
                from ubuntuone.syncdaemon.fsm import \
195
195
                    fsm_parser
196
196
                spec = fsm_parser.parse(input_data)
197
197
            elif input_data.endswith(".py"):