edso has proposed merging lp:~ed.so/duplicity/gdocs.pydrive into lp:duplicity.
Requested reviews: duplicity-team (duplicity-team) For more details, see: https://code.launchpad.net/~ed.so/duplicity/gdocs.pydrive/+merge/260657 make pydrive new gdocs default backend keep gdata backend as gdata+gdocs:// -- Your team duplicity-team is requested to review the proposed merge of lp:~ed.so/duplicity/gdocs.pydrive into lp:duplicity.
=== modified file 'bin/duplicity.1' --- bin/duplicity.1 2015-05-30 11:53:02 +0000 +++ bin/duplicity.1 2015-05-31 14:15:24 +0000 @@ -1037,13 +1037,16 @@ ftp[s]://user[:password]@other.host[:port]/some_dir .PP .B NOTE: -use lftp+, ncftp+ prefixes to enforce a specific backend, e.g. ncftp+ftp://... +use lftp+, ncftp+ prefixes to enforce a specific backend, default is lftp+ftp://... .RE .PP .B "Google Docs" .PP .RS gdocs://user[:password]@other.host/some_dir +.PP +.B NOTE: +use pydrive+, gdata+ prefixes to enforce a specific backend, default is pydrive+gdocs://... .RE .PP .B "Google Cloud Storage" @@ -1957,10 +1960,13 @@ .B python-urllib3 - https://github.com/shazow/urllib3 .TP -.BR "gdocs backend" " (Google Docs)" +.BR "gdocs gdata backend" " (legacy Google Docs backend)" .B Google Data APIs Python Client Library - http://code.google.com/p/gdata-python-client/ .TP +.BR "gdocs pydrive backend" "(default)" +see pydrive backend +.TP .BR "gio backend" " (Gnome VFS API)" .B PyGObject - http://live.gnome.org/PyGObject @@ -1976,6 +1982,17 @@ .B Python library for mega API - https://github.com/ckornacker/mega.py, ubuntu ppa - ppa:ckornacker/backup .TP +.BR "multi backend" +.B Multi -- store to more than one backend +.br +(also see +.BR "A NOTE ON MULTI BACKEND" +) below. +.TP +.BR "ncftp backend" " (ftp, select via ncftp+ftp://)" +.B NcFTP +- http://www.ncftp.com/ +.TP .BR "OneDrive backend" " (Microsoft OneDrive)" .B python-requests - http://python-requests.org @@ -1983,24 +2000,23 @@ .B python-requests-oauthlib - https://github.com/requests/requests-oauthlib .TP -.BR "ncftp backend" " (ftp, select via ncftp+ftp://)" -.B NcFTP -- http://www.ncftp.com/ -.TP .B "Par2 Wrapper Backend" .B par2cmdline - http://parchive.sourceforge.net/ .TP +.BR "pydrive backend" +.B PyDrive -- a wrapper library of google-api-python-client +- https://pypi.python.org/pypi/PyDrive +.br +(also see +.BR "A NOTE ON PYDRIVE BACKEND" +) below. +.TP .B "rsync backend" .B rsync client binary - http://rsync.samba.org/ -.PP -There are two -.B ssh backends -for scp/sftp/ssh access (also see -.BR "A NOTE ON SSH BACKENDS" ). .TP -.BR "ssh paramiko backend" " (enabled by default)" +.BR "ssh paramiko backend" " (default)" .B paramiko (SSH2 for python) - http://pypi.python.org/pypi/paramiko (downloads); http://github.com/paramiko/paramiko (project page) @@ -2030,22 +2046,6 @@ .br (also see .BR "A NOTE ON SSL CERTIFICATE VERIFICATION" ). -.TP -.BR "pydrive backend" -.B PyDrive -- a wrapper library of google-api-python-client -- https://pypi.python.org/pypi/PyDrive -.br -(also see -.BR "A NOTE ON PYDRIVE BACKEND" -) below. -.TP -.BR "multi backend" -.B Multi -- store to more than one backend -.br -(also see -.BR "A NOTE ON MULTI BACKEND" -) below. -.br .SH AUTHOR .TP === modified file 'duplicity/backends/gdocsbackend.py' --- duplicity/backends/gdocsbackend.py 2015-01-22 23:38:29 +0000 +++ duplicity/backends/gdocsbackend.py 2015-05-31 14:15:24 +0000 @@ -184,5 +184,6 @@ # Done! return result -duplicity.backend.register_backend('gdocs', GDocsBackend) -duplicity.backend.uses_netloc.extend(['gdocs']) +""" gdata is an alternate way to access gdocs, currently 05/2015 lacking OAuth support """ +duplicity.backend.register_backend('gdata+gdocs', GDocsBackend) +duplicity.backend.uses_netloc.extend(['gdata+gdocs']) === modified file 'duplicity/backends/pydrivebackend.py' --- duplicity/backends/pydrivebackend.py 2015-05-30 11:53:02 +0000 +++ duplicity/backends/pydrivebackend.py 2015-05-31 14:15:24 +0000 @@ -108,4 +108,9 @@ return {'size': size} duplicity.backend.register_backend('pydrive', PyDriveBackend) -duplicity.backend.uses_netloc.extend(['pydrive']) +""" pydrive is an alternate way to access gdocs """ +duplicity.backend.register_backend('pydrive+gdocs', PyDriveBackend) +""" register pydrive as the default way to access gdocs """ +duplicity.backend.register_backend('gdocs', PyDriveBackend) + +duplicity.backend.uses_netloc.extend(['pydrive','pydrive+gdocs','gdocs'])
_______________________________________________ Mailing list: https://launchpad.net/~duplicity-team Post to : [email protected] Unsubscribe : https://launchpad.net/~duplicity-team More help : https://help.launchpad.net/ListHelp
