duplicity-team team mailing list archive

[edso <edgar.soldin@xxxxxx>]

edso has proposed merging lp:~ed.so/duplicity/u1_and_manpage into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~ed.so/duplicity/u1_and_manpage/+merge/141237

Manpage
- document Ubuntu One required python libs
- added continuous contributors and backend author notes

U1backend
- lazily import non standard python libs, fixes
http://article.gmane.org/gmane.comp.sysutils.backup.duplicity.general/5753

-- 
https://code.launchpad.net/~ed.so/duplicity/u1_and_manpage/+merge/141237
Your team duplicity-team is requested to review the proposed merge of lp:~ed.so/duplicity/u1_and_manpage into lp:duplicity.

=== modified file 'bin/duplicity.1'
--- bin/duplicity.1	2012-12-22 15:15:17 +0000
+++ bin/duplicity.1	2012-12-25 11:18:20 +0000
@@ -64,6 +64,15 @@
 .B ssh pexpect backend
 .B sftp/scp client binaries
 OpenSSH - http://www.openssh.com/
+.TP
+.B "Ubuntu One"
+.B httplib2
+(python  HTTP client library)
+- http://code.google.com/p/httplib2/
+.br
+.B oauthlib
+(python OAuth request-signing logic)
+- http://pypi.python.org/pypi/oauthlib
 
 .SH SYNOPSIS
 .B duplicity [full|incremental]
@@ -1468,9 +1477,21 @@
 ).
 
 .SH AUTHOR
-Original Author - Ben Escoto <bescoto@xxxxxxxxxxxx>
-
-Current Maintainer - Kenneth Loafman <kenneth@xxxxxxxxxxx>
+.TP
+.BR "Original Author" " - Ben Escoto <bescoto@xxxxxxxxxxxx>"
+.TP
+.BR "Current Maintainer" " - Kenneth Loafman <kenneth@xxxxxxxxxxx>"
+.br
+.TP
+.B "Continuous Contributors"
+Edgar Soldin, Mike Terry
+.PP
+Most backends were contributed individually.
+Information about their authorship may be found in the according file's header.
+.br
+Also we'd like to thank everybody posting issue to the mailing list or on 
+launchpad, sending in patches or contributing otherwise. Duplicity wouldn't
+be as stable and useful if it weren't for you.
 
 .SH SEE ALSO
 .BR rdiffdir (1),

=== modified file 'duplicity/backends/u1backend.py'
--- duplicity/backends/u1backend.py	2012-12-05 17:58:26 +0000
+++ duplicity/backends/u1backend.py	2012-12-25 11:18:20 +0000
@@ -24,8 +24,6 @@
 from duplicity import log
 from duplicity import globals
 
-from httplib2 import Http
-from oauthlib import oauth1
 from urlparse import urlparse, parse_qsl
 from json import loads, dumps
 import urllib
@@ -37,6 +35,10 @@
 class OAuthHttpClient(object):
     """a simple HTTP client with OAuth added on"""
     def __init__(self):
+        # lazily import non standard python libs
+        from oauthlib import oauth1
+        from httplib2 import Http
+
         self.consumer_key = None
         self.consumer_secret = None
         self.token = None