New package structure; twython is now separated out into core/oauth/streaming. To maintain compatibility with older Twython versions, simply import twython like: 'import twython.core as twython' - this will allow for easier oauth/streaming development, and should hopefully fix a lot of the installation issues people kept running into with easy_install

.gitignore

@@ -0,0 +1,4 @@
+*.pyc
+build
+dist
+twython.egg-info

__init__.py

@@ -1 +0,0 @@
-import twython as twython

examples/current_trends.py

@@ -1,4 +1,4 @@
-import twitter
+import twython.core as twython
 
 """ Instantiate Twython with no Authentication """
 twitter = twython.setup()

examples/daily_trends.py

@@ -1,4 +1,4 @@
-import twitter
+import twython.core as twython
 
 """ Instantiate Twython with no Authentication """
 twitter = twython.setup()

examples/get_friends_timeline.py

@@ -1,7 +1,7 @@
-import twython, pprint
+import twython.core as twython, pprint
 
 # Authenticate using Basic (HTTP) Authentication
-twitter = twython.setup(authtype="Basic", username="example", password="example")
+twitter = twython.setup(username="example", password="example")
 friends_timeline = twitter.getFriendsTimeline(count="150", page="3")
 
 for tweet in friends_timeline:

examples/get_user_mention.py

@@ -1,6 +1,6 @@
-import twitter
+import twython.core as twython
 
-twitter = twython.setup(authtype="Basic", username="example", password="example")
+twitter = twython.setup(username="example", password="example")
 mentions = twitter.getUserMentions(count="150")
 
 print mentions

examples/get_user_timeline.py

@@ -1,4 +1,4 @@
-import twython
+import twython.core as twython
 
 # We won't authenticate for this, but sometimes it's necessary
 twitter = twython.setup()

examples/public_timeline.py

@@ -1,4 +1,4 @@
-import twython
+import twython.core as twython
 
 # Getting the public timeline requires no authentication, huzzah
 twitter = twython.setup()

examples/rate_limit.py

@@ -1,7 +1,7 @@
-import twython
+import twython.core as twython
 
 # Instantiate with Basic (HTTP) Authentication
-twitter = twython.setup(authtype="Basic", username="example", password="example")
+twitter = twython.setup(username="example", password="example")
 
 # This returns the rate limit for the requesting IP
 rateLimit = twitter.getRateLimitStatus()

examples/search_results.py

@@ -1,4 +1,4 @@
-import twython
+import twython.core as twython
 
 """ Instantiate Tango with no Authentication """
 twitter = twython.setup()

examples/shorten_url.py

@@ -1,4 +1,4 @@
-import twython
+import twython as twython
 
 # Shortening URLs requires no authentication, huzzah
 twitter = twython.setup()

examples/twython_setup.py

@@ -1,11 +1,7 @@
-import twython
+import twython.core as twython
 
-# Using no authentication and specifying Debug
+# Using no authentication
-twitter = twython.setup(debug=True)
+twitter = twython.setup()
 
-# Using Basic Authentication
+# Using Basic Authentication (core is all about basic auth, look to twython.oauth in the future for oauth)
-twitter = twython.setup(authtype="Basic", username="example", password="example")
+twitter = twython.setup(username="example", password="example")
-
-# Using OAuth Authentication (Note: OAuth is the default, specify Basic if needed)
-auth_keys = {"consumer_key": "yourconsumerkey", "consumer_secret": "yourconsumersecret"}
-twitter = twython.setup(username="example", password="example", oauth_keys=auth_keys)

examples/update_profile_image.py

@@ -1,5 +1,5 @@
-import twython
+import twython.core as twython
 
 # Instantiate Twython with Basic (HTTP) Authentication
-twitter = twython.setup(authtype="Basic", username="example", password="example")
+twitter = twython.setup(username="example", password="example")
 twitter.updateProfileImage("myImage.png")

examples/update_status.py

@@ -1,5 +1,5 @@
-import twython
+import twython.core as twython
 
 # Create a Twython instance using Basic (HTTP) Authentication and update our Status
-twitter = twython.setup(authtype="Basic", username="example", password="example")
+twitter = twython.setup(username="example", password="example")
 twitter.updateStatus("See how easy this was?")

examples/weekly_trends.py

@@ -1,4 +1,4 @@
-import twython
+import twython.core as twython
 
 """ Instantiate Twython with no Authentication """
 twitter = twython.setup()

setup.py

@@ -3,9 +3,7 @@
 import sys, os
 
 __author__ = 'Ryan McGrath <ryan@venodesigns.net>'
-__version__ = '0.9'
+__version__ = '1.0'
-
-# For the love of god, use Pip to install this.
 
 # Distutils version
 METADATA = dict(

twython/__init__.py

@@ -0,0 +1 @@
+import core, oauth, streaming

twython/core.py

@@ -16,7 +16,7 @@ from urlparse import urlparse
 from urllib2 import HTTPError
 
 __author__ = "Ryan McGrath <ryan@venodesigns.net>"
-__version__ = "0.9"
+__version__ = "1.0"
 
 """Twython - Easy Twitter utilities in Python"""
 

twython/oauth/__init__.py

@@ -7,17 +7,17 @@
 	Questions, comments? ryan@venodesigns.net
 """
 
-import twython, httplib, urllib, urllib2, mimetypes, mimetools
+import httplib, urllib, urllib2, mimetypes, mimetools
 
 from urlparse import urlparse
 from urllib2 import HTTPError
 
 try:
-	import oauth
+	import oauth as oauthlib
 except ImportError:
 	pass
 
-class twyauth:
+class oauth:
 	def __init__(self, username, consumer_key, consumer_secret, signature_method = None, headers = None, version = 1):
 		"""oauth(username = None, consumer_secret = None, consumer_key = None, headers = None)
 

twython/streaming/__init__.py

@@ -1,6 +1,8 @@
 #!/usr/bin/python
 
 """
+	Yes, this is just in __init__ for now, hush.
+
 	The beginnings of Twitter Streaming API support in Twython. Don't expect this to work at all,
 	consider it a stub for now. -- Ryan
 	

twython3k/__init__.py

@@ -0,0 +1 @@
+import core