Merge lp:~nataliabidart/u1sync/no-more-oauth into lp:~facundo/u1sync/opensourcing

[Natalia Bidart]

- No more oauth options for u1sync, since is no longer used.

[Natalia Bidart (nataliabidart)]

Confirmed tests pass on magicicada-server using this revno for the u1sync branch.

The key that tests keep working is that test_sync uses:

    def _u1sync_client(self):
        """Create a u1sync client instance."""
        client = u1sync.client.Client()
        client.connect_ssl("localhost", self.ssl_port, True)
        client.set_capabilities()
        auth_info = self.access_tokens['jack']
        client.simple_auth(auth_info['username'], auth_info['password'])
        return client

so the oauth option is never really used.

=== modified file 'man/u1sync.1'
--- man/u1sync.1	2011-02-09 14:58:35 +0000
+++ man/u1sync.1	2015-08-14 22:22:59 +0000
@@ -97,9 +97,6 @@
 \fB\-\-list\-shares\fR
 lists available shares
 .TP
-\fB\-\-oauth\fR=\fIKEY\fR:\fISECRET\fR
-explicitly specify an OAuth token to use rather than querying the keyring
-.TP
 \fB\-\-port\fR=\fIPORT\fR
 specify a non-default port to connect to
 .TP

=== modified file 'u1sync/main.py'
--- u1sync/main.py	2011-02-09 14:58:35 +0000
+++ u1sync/main.py	2015-08-14 22:22:59 +0000
@@ -35,7 +35,6 @@
 from twisted.internet import reactor
 from Queue import Queue
 
-from oauth.oauth import OAuthToken, OAuthConsumer
 import ubuntuone.storageprotocol.dircontent_pb2 as dircontent_pb2
 from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY, SYMLINK
 from u1sync.genericmerge import (
@@ -293,12 +292,6 @@
                       default='fs-1.one.ubuntu.com',
                       help="The server address")
 
-    oauth_meta_var = "[CONSUMER_KEY:CONSUMER_SECRET:]KEY:SECRET"
-    oauth_help = "Explicitly provide OAuth credentials. You can either " \
-                 "provide the 4 values (consumer key and secret, plus the " \
-                 "key and secret), or just the last two (key and secret)."
-    parser.add_option("--oauth", dest="oauth", metavar=oauth_meta_var,
-                      help=oauth_help)
     action_list = ", ".join(sorted(MERGE_ACTIONS.keys()))
     parser.add_option("--action", dest="action", metavar="ACTION",
                       default=None,
@@ -372,21 +365,6 @@
         options.action = DEFAULT_MERGE_ACTION
 
 
-    token = None
-    consumer = None
-    if options.oauth is None:
-        parser.error("--oauth is required")
-    else:
-        values = options.oauth.split(':')
-        if len(values) == 4:
-            (consumer_key, consumer_secret, key, secret) = values
-            consumer = OAuthConsumer(consumer_key, consumer_secret)
-        elif len(values) == 2:
-            (key, secret) = values
-        else:
-            parser.error("--oauth requires %s" % oauth_meta_var)
-        token = OAuthToken(key, secret)
-
     if options.share is not None:
         try:
             uuid.UUID(options.share)
@@ -407,7 +385,6 @@
 
         try:
             client.set_capabilities()
-            client.oauth_from_token(token, consumer)
 
             if options.mode == "sync":
                 do_sync(client=client, directory=directory,