Merge branch 'master' into py3-2

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

diff --git a/twitter/__init__.py b/twitter/__init__.py
index 25a4b5d7edc10b6097abf5bec0d348aafb3d210f..77bc02bdd0accd49687deb06828716c070302ec7 100644 (file)
--- a/twitter/__init__.py
+++ b/twitter/__init__.py
@@ -4,6 +4,6 @@ The minimalist yet fully featured Twitter API and Python toolset.
 For building your own applications, look at the `Twitter` class.
 """
 
-from api import *
-from auth import NoAuth
-from oauth import OAuth
+from .api import Twitter, TwitterError, TwitterHTTPError, TwitterResponse
+from .auth import NoAuth
+from .oauth import OAuth, read_token_file, write_token_file