Merge branch 'master' of github.com:guyrt/twitter-data-examples

[twitter-api-cdsw-solutions] / tweepy / __init__.py

diff --git a/tweepy/__init__.py b/tweepy/__init__.py
index ff0005fa5ee72ec80a0486914a03a0fbb969b0b5..b691e3491272a128992e8e8a7198016f5bb0ae24 100644 (file)
--- a/tweepy/__init__.py
+++ b/tweepy/__init__.py
@@ -5,7 +5,7 @@
 """
 Tweepy Twitter API library
 """
-__version__ = '2.3'
+__version__ = '3.3.0'
 __author__ = 'Joshua Roesslein'
 __license__ = 'MIT'
 
@@ -13,7 +13,7 @@ from tweepy.models import Status, User, DirectMessage, Friendship, SavedSearch,
 from tweepy.error import TweepError
 from tweepy.api import API
 from tweepy.cache import Cache, MemoryCache, FileCache
-from tweepy.auth import OAuthHandler
+from tweepy.auth import OAuthHandler, AppAuthHandler
 from tweepy.streaming import Stream, StreamListener
 from tweepy.cursor import Cursor
 
@@ -21,7 +21,5 @@ from tweepy.cursor import Cursor
 api = API()
 
 def debug(enable=True, level=1):
-
-    import httplib
-    httplib.HTTPConnection.debuglevel = level
-
+    from six.moves.http_client import HTTPConnection
+    HTTPConnection.debuglevel = level