Merge lp:~ed.so/duplicity/fix.dpbx.import into lp:~duplicity-team/duplicity/0.7-series

Proposed by edso
Status: Merged
Merged at revision: 1019
Proposed branch: lp:~ed.so/duplicity/fix.dpbx.import
Merge into: lp:~duplicity-team/duplicity/0.7-series
Diff against target: 22 lines (+3/-2)
1 file modified
duplicity/backends/dpbxbackend.py (+3/-2)
To merge this branch: bzr merge lp:~ed.so/duplicity/fix.dpbx.import
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+241697@code.launchpad.net

Description of the change

fix dpbx import error import lazily

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'duplicity/backends/dpbxbackend.py'
2--- duplicity/backends/dpbxbackend.py 2014-10-27 02:27:36 +0000
3+++ duplicity/backends/dpbxbackend.py 2014-11-13 15:18:13 +0000
4@@ -36,8 +36,6 @@
5 from duplicity import util
6 from duplicity.errors import BackendException
7
8-from dropbox import client, rest, session
9-
10
11 # You can register your own developer account with Dropbox and
12 # register a new application for yourself, obtaining the new
13@@ -96,6 +94,9 @@
14 """Connect to remote store using Dr*pB*x service"""
15 def __init__(self, parsed_url):
16 duplicity.backend.Backend.__init__(self, parsed_url)
17+
18+ global client, rest, session
19+ from dropbox import client, rest, session
20
21 class StoredSession(session.DropboxSession):
22 """a wrapper around DropboxSession that stores a token to a file on disk"""

Subscribers

People subscribed via source and target branches