0
@@ -2,7 +2,7 @@ This is an OAuth proxy.  It allows vanilla requests to be funneled through it an
0
 appropriately using OAuth.  For now, it only uses a single, pre-set access token.
0
 
0
 To create an OAuth proxy server:
0
-mktap oauth_proxy --consumer_key <consumer key> --consumer_secret <consumer secret> [--token <token>] [--token_secret <token secret>] [-p <proxy port>] [--ssl]
0
+mktap oauth_proxy --consumer-key <consumer key> --consumer-secret <consumer secret> [--token <token>] [--token-secret <token secret>] [-p <proxy port>] [--ssl]
0
 
0
 Start the generated tap (in the foreground):
0
 twistd -nf oauth_proxy.tap
0
@@ -10,4 +10,4 @@ twistd -nf oauth_proxy.tap
0
 (For mktap to find oauth_proxy, you may need to make sure that "." is in your PYTHONPATH)
0
 
0
 Or, just run it with twistd:
0
-twistd -n oauth_proxy --consumer_key <consumer key> --consumer_secret <consumer secret> [--token <token>] [--token_secret <token secret>] [-p <proxy port>] [--ssl]
0
+twistd -n oauth_proxy --consumer-key <consumer key> --consumer-secret <consumer secret> [--token <token>] [--token-secret <token secret>] [-p <proxy port>] [--ssl]

0
@@ -55,13 +55,13 @@ class OAuthCredentials:
0
 
0
 
0
 class Options(usage.Options):
0
-	synopsis = "Usage: mktap oauth_proxy --consumer_key <consumer key> --consumer_secret <consumer secret> [--token <token>] [--token_secret <token secret>] [-p <proxy port>] [--ssl] "
0
-	longdesc = "Makes an OAuth HTTP proxy server.."
0
+	synopsis = "Usage: oauth_proxy --consumer-key <consumer key> --consumer-secret <consumer secret> [--token <token>] [--token-secret <token secret>] [-p <proxy port>] [--ssl]"
0
+	longdesc = "An OAuth HTTP proxy server.."
0
   optParameters = [
0
-		['consumer_key', None, None, "OAuth Consumer Key"],
0
-		['consumer_secret', None, None, "OAuth Consumer Secret"],
0
+		['consumer-key', None, None, "OAuth Consumer Key"],
0
+		['consumer-secret', None, None, "OAuth Consumer Secret"],
0
     ['token', None, None, "OAuth Access/Request Token"],
0
-		['token_secret', None, None, "OAuth Access/Request Token Secret"],
0
+		['token-secret', None, None, "OAuth Access/Request Token Secret"],
0
     ['port', 'p', 8001, "Proxy port", int],
0
   ]
0
 
0
@@ -71,6 +71,8 @@ class Options(usage.Options):
0
 class OAuthProxyClient(proxy.ProxyClient):
0
   def connectionMade(self):
0
     # if retrieval of OAuth credentials is to be asynchronous, it needs to be done here (if it's even possible)
0
+		# otherwise, this class has no point
0
+		# however, it's possible that reading headers can't happen in OAuthProxyClientFactory
0
     proxy.ProxyClient.connectionMade(self)
0
 
0
 

0
@@ -11,11 +11,11 @@ def makeService(config):
0
 
0
   useSSL = config["ssl"]
0
 
0
-	consumerKey = config["consumer_key"]
0
-	consumerSecret = config["consumer_secret"]
0
-	if config.has_key("token") and config.has_key("token_secret"):
0
+	consumerKey = config["consumer-key"]
0
+	consumerSecret = config["consumer-secret"]
0
+	if config.has_key("token") and config.has_key("token-secret"):
0
     token = config["token"]
0
-		tokenSecret = config["token_secret"]
0
+		tokenSecret = config["token-secret"]
0
   else:
0
     token = tokenSecret = None
0