Improved some doc strings

Author: wndhydrnt

CHANGELOG.md

@@ -1,4 +1,9 @@
-## 0.6.0 (unreleased)
+## 0.6.0
+
+Features:
+
+  - Issue unique access tokens
+  - Define what grants a client is allowed to use
 
 Improvements:
 

docs/error.rst

@@ -3,16 +3,14 @@
 
 .. automodule:: oauth2.error
 
+.. autoclass:: AccessTokenNotFound
+
 .. autoclass:: AuthCodeNotFound
 
 .. autoclass:: ClientNotFoundError
 
 .. autoclass:: OAuthBaseError
 
-.. autoclass:: OAuthClientError
-
-.. autoclass:: OAuthUserError
-
 .. autoclass:: OAuthInvalidError
 
 .. autoclass:: UserNotAuthenticated

docs/oauth2.rst

@@ -2,6 +2,8 @@
 =============================
 
 .. autoclass:: oauth2.Provider
+   :members: scope_separator
 
 .. automethod:: oauth2.Provider.add_grant
 .. automethod:: oauth2.Provider.dispatch
+.. automethod:: oauth2.Provider.enable_unique_tokens

oauth2/__init__.py

@@ -141,6 +141,9 @@ def __init__(self, access_token_store, auth_code_store, client_store,
     def add_grant(self, grant):
         """
         Adds a Grant that the provider should support.
+
+        :param grant: An instance of a class that extends
+                      :class:`oauth2.grant.GrantHandlerFactory`
         """
         if hasattr(grant, "expires_in"):
             self.token_generator.expires_in = grant.expires_in
@@ -197,7 +200,17 @@ def enable_unique_tokens(self):
     @property
     def scope_separator(self, separator):
         """
-        Sets the separator of values in scope query parameter.
+        Sets the separator of values in the scope query parameter.
+        Defaults to " " (whitespace).
+
+        The following code makes the Provider use "," instead of " "::
+
+            provider = Provider()
+
+            provider.scope_separator = ","
+
+        Now the scope parameter in the request of a client can look like this:
+        `scope=foo,bar`.
         """
         Scope.separator = separator
 

oauth2/error.py

@@ -52,13 +52,6 @@ def __init__(self, error, error_uri=None, explanation=None):
         super(OAuthBaseError, self).__init__()
 
 
-class OAuthClientError(OAuthBaseError):
-    """
-    Indicates an error during recognition of a client.
-    """
-    pass
-
-
 class OAuthInvalidError(OAuthBaseError):
     """
     Indicates an error during validation of a request.

oauth2/grant.py

@@ -27,10 +27,8 @@
 * The server that issues the access.
 
 """
-from oauth2.error import OAuthInvalidError, OAuthClientError, \
-    ClientNotFoundError, UserNotAuthenticated, AccessTokenNotFound, \
-    UserIdentifierMissingError, OAuthInvalidNoRedirectError, \
-    RedirectUriUnknown
+from oauth2.error import OAuthInvalidError, UserNotAuthenticated, \
+    AccessTokenNotFound, UserIdentifierMissingError, RedirectUriUnknown
 from oauth2.compatibility import urlencode, quote
 import json
 import time

oauth2/test/__init__.py

@@ -1,7 +1,8 @@
 import sys
 
-# Enables unit tests to be work under Python 2.6
-# Code copied from https://github.com/facebook/tornado/blob/master/tornado/test/util.py 
+# Enables unit tests to work under Python 2.6
+# Code copied from
+# https://github.com/facebook/tornado/blob/master/tornado/test/util.py
 if sys.version_info >= (2, 7):
     import unittest
 else: