<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -46,22 +46,25 @@ with Timetric to set up your tokens.
     # want to make this config persistant (the shelve module is a lightweight
     # place to start) because the library will store OAuth authentication
     # information back to this config.
-    &gt;&gt;&gt; conf = {'authtype':'oauth', 'consumer_secret': 'XXX', 'consumer_key': 'XXX'}
+    &gt;&gt;&gt; conf = {'authtype':'oauth', 'consumer_key: 'XXX',
+                                    'consumer_secret': 'XXX'}
     &gt;&gt;&gt; client = timetric.TimetricClient(conf)
 
     # The first time through you'll need to authorize your key with Timetric
     # by sending the user to an authorization request page.
+    &gt;&gt; token = client.get_request_token()
     &gt;&gt;&gt; import webbrowser
-    &gt;&gt;&gt; webbrowser.open(client.get_authorize_url())
+    &gt;&gt;&gt; webbrowser.open(client.get_authorize_url(token))
 
     # Once the user has authorized at that page, you can continue.
-    &gt;&gt;&gt; client.get_access_token()
-
-    # You're now authorized.
-
+    &gt;&gt;&gt; access_token = client.get_access_token(token)
 
+    # You can now re-authorize to use this token:
+    &gt;&gt;&gt; conf.update({'oauth_key':access_token.key,
+                     'oauth_secret':access_token.secret})
+    &gt;&gt;&gt; client = timetric.TimetricClient(conf)
 
-Usage::
+API token setup:
 
     &gt;&gt;&gt; import timetric
 
@@ -70,8 +73,11 @@ Usage::
 
     # you initialize the timetric client:
     &gt;&gt;&gt; client = timetric.TimetricClient(conf)
+
+
+Usage::
     
-    # It appears there's no API method to get a list of a particular
+    # There's no API method to get a list of a particular
     # user's series, so you need to somehow &quot;know&quot; the series ID.
     &gt;&gt;&gt; series = client.series('p-DpewL0TO-iBE4nMBCTsQ')
     </diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -90,7 +90,7 @@ class TimetricClient(object):
             self.consumer, http_url=self.request_token_url)
         req.sign_request(self.SIGNATURE, self.consumer, None)
         resp, body = self.http.request(req.to_url(), 'GET')
-        return oauth.OAuthToken.from_string(body)
+        return self.oauth_module.OAuthToken.from_string(body)
 
     def get_authorize_url(self, token=None, callback=None):
         &quot;&quot;&quot;
@@ -98,7 +98,7 @@ class TimetricClient(object):
         &quot;&quot;&quot;
         if not token:
             token = self.get_request_token()
-        req = self.oauth_module.oauth.OAuthRequest.from_token_and_callback(
+        req = self.oauth_module.OAuthRequest.from_token_and_callback(
             token=token, http_url=self.authorization_url, callback=callback)
         return req.to_url()
         
@@ -108,11 +108,11 @@ class TimetricClient(object):
         
         Stores the access token in the config dict for later use.
         &quot;&quot;&quot;
-        req = self.oauth_module.oauth.OAuthRequest.from_consumer_and_token(
+        req = self.oauth_module.OAuthRequest.from_consumer_and_token(
             self.consumer, token=token, http_url=self.access_token_url)
         req.sign_request(self.SIGNATURE, self.consumer, token)
         resp, body = self.http.request(req.to_url(), 'GET')
-        self.access_token = oauth.OAuthToken.from_string(body)
+        self.access_token = self.oauth_module.OAuthToken.from_string(body)
         self.config['oauth_token'] = self.access_token.key
         self.config['oauth_secret'] = self.access_token.secret
         return self.access_token</diff>
      <filename>timetric/__init__.py</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>8bae6ca83fd8a813c1918293405fafec2e5f8b35</id>
    </parent>
  </parents>
  <author>
    <name>Toby White</name>
    <email>toby@scrtplns.com</email>
  </author>
  <url>http://github.com/jacobian/timetric/commit/028ff52d0892ce2c560a06d257515d08661ad928</url>
  <id>028ff52d0892ce2c560a06d257515d08661ad928</id>
  <committed-date>2009-06-03T06:42:21-07:00</committed-date>
  <authored-date>2009-06-03T06:42:21-07:00</authored-date>
  <message>Fix up some name errors involved in the OAuth-token-exchange dance, and correct the documentation.</message>
  <tree>3a312221a82f76e7b62382992a21049394be90e1</tree>
  <committer>
    <name>Toby White</name>
    <email>toby@scrtplns.com</email>
  </committer>
</commit>
