<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>TODO</filename>
    </added>
    <added>
      <filename>twisted/plugins/myservice.py</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,3 +1,4 @@
 *.tap
 *.pyc
-twistd.pid
+dropin.cache
+twistd.*</diff>
      <filename>.gitignore</filename>
    </modified>
    <modified>
      <diff>@@ -8,3 +8,6 @@ Start the generated tap (in the foreground):
 twistd -nf oauth_proxy.tap
 
 (For mktap to find oauth_proxy, you may need to make sure that &quot;.&quot; is in your PYTHONPATH)
+
+Or, just run it with twistd:
+twistd -n oauth_proxy --consumer_key &lt;consumer key&gt; --consumer_secret &lt;consumer secret&gt; [--token &lt;token&gt;] [--token_secret &lt;token secret&gt;] [-p &lt;proxy port&gt;] [--ssl]</diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -7,14 +7,14 @@
 ## TODO
 # - provide a way of specifying access tokens (and possibly secrets, if not handled via lookup) - Basic Auth?
 
+import cgi
+from oauth import oauth
 import sgmllib, re, urlparse
+import sys
 from twisted.internet import ssl
 from twisted.web import proxy, http
-import sys
-from twisted.python import log
+from twisted.python import log, usage
 from zope.interface import implements, Interface
-from oauth import oauth
-import cgi
 
 class IOAuthCredentialProvider(Interface):
 	&quot;&quot;&quot;An OAuth credential provider&quot;&quot;&quot;
@@ -22,6 +22,7 @@ class IOAuthCredentialProvider(Interface):
 	def fetchCredentials():
 		&quot;&quot;&quot;Fetch credentials&quot;&quot;&quot;
 
+
 class StaticOAuthCredentialProvider:
 	implements(IOAuthCredentialProvider)
 	
@@ -31,6 +32,7 @@ class StaticOAuthCredentialProvider:
 	def fetchCredentials(self):
 		return self.credentials
 
+
 class OAuthCredentials:
 	&quot;&quot;&quot;
 	A container for OAuth credentials
@@ -46,6 +48,20 @@ class OAuthCredentials:
 		self.signatureMethod = signatureMethod
 
 
+class Options(usage.Options):
+	synopsis = &quot;Usage: mktap oauth_proxy --consumer_key &lt;consumer key&gt; --consumer_secret &lt;consumer secret&gt; [--token &lt;token&gt;] [--token_secret &lt;token secret&gt;] [-p &lt;proxy port&gt;] [--ssl] &quot;
+	longdesc = &quot;Makes an OAuth HTTP proxy server..&quot;
+	optParameters = [
+		['consumer_key', None, None, &quot;OAuth Consumer Key&quot;],
+		['consumer_secret', None, None, &quot;OAuth Consumer Secret&quot;],
+		['token', None, None, &quot;OAuth Access/Request Token&quot;],
+		['token_secret', None, None, &quot;OAuth Access/Request Token Secret&quot;],
+		['port', 'p', 8001, &quot;Proxy port&quot;, int],
+	]
+
+	optFlags = [['ssl', 's']]
+
+
 class OAuthProxyClient(proxy.ProxyClient):
 	def connectionMade(self):
 		# if retrieval of OAuth credentials is to be asynchronous, it needs to be done here (if it's even possible)</diff>
      <filename>oauth_proxy/oauth_proxy.py</filename>
    </modified>
    <modified>
      <diff>@@ -1,20 +1,10 @@
 import sys
 from twisted.application import internet, service
-from twisted.python import usage
 import oauth_proxy
 
-class Options(usage.Options):
-	synopsis = &quot;Usage: mktap oauth_proxy --consumer_key &lt;consumer key&gt; --consumer_secret &lt;consumer secret&gt; [--token &lt;token&gt;] [--token_secret &lt;token secret&gt;] [-p &lt;proxy port&gt;] [--ssl] &quot;
-	longdesc = &quot;Makes an OAuth HTTP proxy server..&quot;
-	optParameters = [
-		['consumer_key', None, None, &quot;OAuth Consumer Key&quot;],
-		['consumer_secret', None, None, &quot;OAuth Consumer Secret&quot;],
-		['token', None, None, &quot;OAuth Access/Request Token&quot;],
-		['token_secret', None, None, &quot;OAuth Access/Request Token Secret&quot;],
-		['port', 'p', 8001, &quot;Proxy port&quot;, int],
-	]
-
-	optFlags = [['ssl', 's']]
+class Options(oauth_proxy.Options):
+	pass
+
 
 def makeService(config):
 	s = service.MultiService()</diff>
      <filename>oauth_proxy/tap.py</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>oauth_proxy/oauth_proxy.tac</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>23e726e9a38be26eb09f2f8f3c8ba09c4d82eda2</id>
    </parent>
  </parents>
  <author>
    <name>Seth Fitzsimmons</name>
    <email>seth@mojodna.net</email>
  </author>
  <url>http://github.com/mojodna/oauth-proxy/commit/e111113a37bd86cbf0a662d93ebb514f0c5ac087</url>
  <id>e111113a37bd86cbf0a662d93ebb514f0c5ac087</id>
  <committed-date>2008-04-22T18:09:44-07:00</committed-date>
  <authored-date>2008-04-22T18:09:44-07:00</authored-date>
  <message>refactored to allow it to run from twistd directly</message>
  <tree>d9f8c9cc8444febb70915b7d86996aab98a7f4d5</tree>
  <committer>
    <name>Seth Fitzsimmons</name>
    <email>seth@mojodna.net</email>
  </committer>
</commit>
