add doc to send tweets with images in README + consolidate api.py/README

[z_archive/twitter.git] / twitter / __init__.py

diff --git a/twitter/__init__.py b/twitter/__init__.py
index ec19917bd8e2fd754bfa580b5a8d58b3ce5091ce..326c8f279841cb9b70f6aa545a36d5ca5f712b5c 100644 (file)
--- a/twitter/__init__.py
+++ b/twitter/__init__.py
@@ -12,34 +12,35 @@ from .api import Twitter, TwitterError, TwitterHTTPError, TwitterResponse
 from .auth import NoAuth, UserPassAuth
 from .oauth import (OAuth, read_token_file, write_token_file,
                     __doc__ as oauth_doc)
+from .oauth2 import OAuth2
 from .stream import TwitterStream
 from .oauth_dance import oauth_dance
 
-# Who needs Sphinx? Not me!
+__doc__ = __doc__ or ""
 
 __doc__ += """
 The Twitter class
-=================
+-----------------
 """
-__doc__ += dedent(Twitter.__doc__)
+__doc__ += dedent(Twitter.__doc__ or "")
 
 __doc__ += """
 The TwitterStream class
-=======================
+-----------------------
 """
-__doc__ += dedent(TwitterStream.__doc__)
+__doc__ += dedent(TwitterStream.__doc__ or "")
 
 
 __doc__ += """
 Twitter Response Objects
-========================
+------------------------
 """
-__doc__ += dedent(TwitterResponse.__doc__)
+__doc__ += dedent(TwitterResponse.__doc__ or "")
 
 
 __doc__ += """
 Authentication
-==============
+--------------
 
 You can authenticate with Twitter in three ways: NoAuth, OAuth, or
 UserPassAuth. Get help() on these classes to learn how to use them.
@@ -48,11 +49,11 @@ OAuth is probably the most useful.
 
 
 Working with OAuth
-==================
+------------------
 """
 
-__doc__ += dedent(oauth_doc)
+__doc__ += dedent(oauth_doc or "")
 
 __all__ = ["Twitter", "TwitterStream", "TwitterResponse", "TwitterError",
            "TwitterHTTPError", "NoAuth", "OAuth", "UserPassAuth",
-           "read_token_file", "write_token_file", "oauth_dance"]
+           "read_token_file", "write_token_file", "oauth_dance", "OAuth2"]