~ubuntu-branches/ubuntu/oneiric/ubuntuone-client/oneiric

« back to all changes in this revision

Viewing changes to ubuntuone/u1sync/client.py

  • Committer: Bazaar Package Importer
  • Author(s): Rodney Dawes
  • Date: 2010-06-08 17:31:18 UTC
  • mto: This revision was merged to the branch mainline in revision 31.
  • Revision ID: james.westby@ubuntu.com-20100608173118-o8s897ll11rtne99
Tags: upstream-1.3.0
ImportĀ upstreamĀ versionĀ 1.3.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
 
35
35
from twisted.internet import reactor, defer
36
36
from twisted.internet.defer import inlineCallbacks, returnValue
37
 
from ubuntuone.storageprotocol.hash import crc32
 
37
from ubuntuone.storageprotocol.content_hash import crc32
38
38
from ubuntuone.storageprotocol.context import get_ssl_context
39
39
from ubuntuone.oauthdesktop.config import get_config \
40
40
                                                 as get_oauth_config