Merge branch 'master' into jordan_patch

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

diff --git a/twitter/__init__.py b/twitter/__init__.py
index 5c33defadb024cfe43b2385617136a72c558aae7..5ceb15257adc610089b73287e0a7f5d61d21247f 100644 (file)
--- a/twitter/__init__.py
+++ b/twitter/__init__.py
@@ -5,3 +5,5 @@ For building your own applications, look at the `Twitter` class.
 """
 
 from api import *
+from auth import NoAuth, UserPassAuth
+from oauth import OAuth