From 6841e7ef287abb1d4260e7ac3c9860a168edac59 Mon Sep 17 00:00:00 2001
From: Mike Helmick <mikehelmick@me.com>
Date: Tue, 14 May 2013 21:34:22 -0400
Subject: [PATCH 1/6] Tests for all main endpoints

---
 .travis.yml      |  20 +++
 requirements.txt |   2 +
 test_twython.py  | 410 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 432 insertions(+)
 create mode 100644 .travis.yml
 create mode 100644 requirements.txt
 create mode 100644 test_twython.py

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..3f75b4d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,20 @@
+language: python
+python:
+  - 2.6
+  - 2.7
+  - 3.3
+env:
+    APP_KEY='kpowaBNkhhXwYUu3es27dQ'
+    APP_SECRET='iQ0Jr0e2xvhOwLubifWAFtmXnVT7VZAIqUXnI2FcCjU'
+    OAUTH_TOKEN='1419197916-OZKOynuB1rZ1g4DXwS2wjr1wGnknPHCUEkbvvKx'
+    OAUTH_TOKEN_SECRET='dh9YbCkDR3h3XQFXA7pjufI6S55CCZ6UjdvBNUmi1hg'
+    SCREEN_NAME='TwythonTest'
+    PROTECTED_TWITTER_1='TwythonSecure1'
+    PROTECTED_TWITTER_2='TwythonSecure2'
+    TEST_TWEET_ID='332992304010899457'
+    TEST_LIST_ID='574'
+script: nosetests -v test_twython:TwythonAPITestCase --cover-package="twython" --with-coverage
+install:
+  - pip install -r requirements.txt
+notifications:
+  email: false
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..09acfa6
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+requests==1.2.0
+requests_oauthlib==0.3.1
diff --git a/test_twython.py b/test_twython.py
new file mode 100644
index 0000000..84db80c
--- /dev/null
+++ b/test_twython.py
@@ -0,0 +1,410 @@
+import unittest
+import os
+
+from twython import Twython, TwythonError, TwythonAuthError
+
+app_key = os.environ.get('APP_KEY', 'kpowaBNkhhXwYUu3es27dQ')
+app_secret = os.environ.get('APP_SECRET', 'iQ0Jr0e2xvhOwLubifWAFtmXnVT7VZAIqUXnI2FcCjU')
+oauth_token = os.environ.get('OAUTH_TOKEN', '1419197916-OZKOynuB1rZ1g4DXwS2wjr1wGnknPHCUEkbvvKx')
+oauth_token_secret = os.environ.get('OAUTH_TOKEN_SECRET', 'dh9YbCkDR3h3XQFXA7pjufI6S55CCZ6UjdvBNUmi1hg')
+
+screen_name = os.environ.get('SCREEN_NAME', 'TwythonTest')
+
+# Protected Account you ARE following and they ARE following you
+protected_twitter_1 = os.environ.get('PROTECTED_TWITTER_1', 'TwythonSecure1')
+
+# Protected Account you ARE NOT following
+protected_twitter_2 = os.environ.get('PROTECTED_TWITTER_2', 'TwythonSecure2')
+
+# Test Ids
+test_tweet_id = os.environ.get('TEST_TWEET_ID', '318577428610031617')
+test_list_id = os.environ.get('TEST_LIST_ID', '574')  # 574 is @twitter/team
+
+
+class TwythonAPITestCase(unittest.TestCase):
+    def setUp(self):
+        self.api = Twython(app_key, app_secret,
+                           oauth_token, oauth_token_secret)
+
+    # Timelines
+    def test_get_mentions_timeline(self):
+        '''Test returning mentions timeline for authenticated user succeeds'''
+        self.api.get_mentions_timeline()
+
+    def test_get_user_timeline(self):
+        '''Test returning timeline for authenticated user and random user
+        succeeds'''
+        self.api.get_user_timeline()  # Authenticated User Timeline
+        self.api.get_user_timeline(screen_name='twitter')  # Random User Timeline
+
+    def test_get_protected_user_timeline_following(self):
+        '''Test returning a protected user timeline who you are following
+        succeeds'''
+        self.api.get_user_timeline(screen_name=protected_twitter_1)
+
+    def test_get_protected_user_timeline_not_following(self):
+        '''Test returning a protected user timeline who you are not following
+        fails and raise a TwythonAuthError'''
+        self.assertRaises(TwythonAuthError, self.api.get_user_timeline,
+                          screen_name=protected_twitter_2)
+
+    def test_get_home_timeline(self):
+        '''Test returning home timeline for authenticated user succeeds'''
+        self.api.get_home_timeline()
+
+    # Tweets
+    def test_get_retweets(self):
+        '''Test getting retweets of a specific tweet succeeds'''
+        self.api.get_retweets(id=test_tweet_id)
+
+    def test_show_status(self):
+        '''Test returning a single status details succeeds'''
+        self.api.show_status(id=test_tweet_id)
+
+    def test_update_and_destroy_status(self):
+        '''Test updating and deleting a status succeeds'''
+        status = self.api.update_status(status='Test post just to get deleted :(')
+        self.api.destroy_status(id=status['id_str'])
+
+    def test_retweet(self):
+        '''Test retweeting a status succeeds'''
+        retweet = self.api.retweet(id='99530515043983360')
+        self.api.destroy_status(id=retweet['id_str'])
+
+    def test_retweet_twice(self):
+        '''Test that trying to retweet a tweet twice raises a TwythonError'''
+        retweet = self.api.retweet(id='99530515043983360')
+        self.assertRaises(TwythonError, self.api.retweet,
+                          id='99530515043983360')
+
+        # Then clean up
+        self.api.destroy_status(id=retweet['id_str'])
+
+    def test_get_oembed_tweet(self):
+        '''Test getting info to embed tweet on Third Party site succeeds'''
+        self.api.get_oembed_tweet(id='99530515043983360')
+
+    def test_get_retweeters_ids(self):
+        '''Test getting ids for people who retweeted a tweet succeeds'''
+        self.api.get_retweeters_ids(id='99530515043983360')
+
+    # Search
+    def test_search(self):
+        '''Test searching tweets succeeds'''
+        self.api.search(q='twitter')
+
+    # Direct Messages
+    def test_get_direct_messages(self):
+        '''Test getting the authenticated users direct messages succeeds'''
+        self.api.get_direct_messages()
+
+    def test_get_sent_messages(self):
+        '''Test getting the authenticated users direct messages they've
+        sent succeeds'''
+        self.api.get_sent_messages()
+
+    def test_send_get_and_destroy_direct_message(self):
+        '''Test sending, getting, then destory a direct message succeeds'''
+        message = self.api.send_direct_message(screen_name=protected_twitter_1,
+                                               text='Hey d00d!')
+
+        self.api.get_direct_message(id=message['id_str'])
+        self.api.destroy_direct_message(id=message['id_str'])
+
+    def test_send_direct_message_to_non_follower(self):
+        '''Test sending a direct message to someone who doesn't follow you
+        fails'''
+        self.assertRaises(TwythonError, self.api.send_direct_message,
+                          screen_name=protected_twitter_2, text='Yo, man!')
+
+    # Friends & Followers
+    def test_get_user_ids_of_blocked_retweets(self):
+        '''Test that collection of user_ids that the authenticated user does
+        not want to receive retweets from succeeds'''
+        self.api.get_user_ids_of_blocked_retweets(stringify_ids='true')
+
+    def test_get_friends_ids(self):
+        '''Test returning ids of users the authenticated user and then a random
+        user is following succeeds'''
+        self.api.get_friends_ids()
+        self.api.get_friends_ids(screen_name='twitter')
+
+    def test_get_followers_ids(self):
+        '''Test returning ids of users the authenticated user and then a random
+        user are followed by succeeds'''
+        self.api.get_followers_ids()
+        self.api.get_followers_ids(screen_name='twitter')
+
+    def test_lookup_friendships(self):
+        '''Test returning relationships of the authenticating user to the
+        comma-separated list of up to 100 screen_names or user_ids provided
+        succeeds'''
+        self.api.lookup_friendships(screen_name='twitter,ryanmcgrath')
+
+    def test_get_incoming_friendship_ids(self):
+        '''Test returning incoming friendship ids succeeds'''
+        self.api.get_incoming_friendship_ids()
+
+    def test_get_outgoing_friendship_ids(self):
+        '''Test returning outgoing friendship ids succeeds'''
+        self.api.get_outgoing_friendship_ids()
+
+    def test_create_friendship(self):
+        '''Test creating a friendship succeeds'''
+        self.api.create_friendship(screen_name='justinbieber')
+
+    def test_destroy_friendship(self):
+        '''Test destroying a friendship succeeds'''
+        self.api.destroy_friendship(screen_name='justinbieber')
+
+    def test_update_friendship(self):
+        '''Test updating friendships succeeds'''
+        self.api.update_friendship(screen_name=protected_twitter_1,
+                                   retweets='true')
+
+        self.api.update_friendship(screen_name=protected_twitter_1,
+                                   retweets='false')
+
+    def test_show_friendships(self):
+        '''Test showing specific friendship succeeds'''
+        self.api.show_friendship(target_screen_name=protected_twitter_1)
+
+    def test_get_friends_list(self):
+        '''Test getting list of users authenticated user then random user is
+        following succeeds'''
+        self.api.get_friends_list()
+        self.api.get_friends_list(screen_name='twitter')
+
+    def test_get_followers_list(self):
+        '''Test getting list of users authenticated user then random user are
+        followed by succeeds'''
+        self.api.get_followers_list()
+        self.api.get_followers_list(screen_name='twitter')
+
+    # Users
+    def test_get_account_settings(self):
+        '''Test getting the authenticated user account settings succeeds'''
+        self.api.get_account_settings()
+
+    def test_verify_credentials(self):
+        '''Test representation of the authenticated user call succeeds'''
+        self.api.verify_credentials()
+
+    def test_update_account_settings(self):
+        '''Test updating a user account settings succeeds'''
+        self.api.update_account_settings(lang='en')
+
+    def test_update_delivery_service(self):
+        '''Test updating delivery settings fails because we don't have
+        a mobile number on the account'''
+        self.assertRaises(TwythonError, self.api.update_delivery_service,
+                          device='none')
+
+    def test_update_profile(self):
+        '''Test updating profile succeeds'''
+        self.api.update_profile(include_entities='true')
+
+    def test_update_profile_colors(self):
+        '''Test updating profile colors succeeds'''
+        self.api.update_profile_colors(profile_background_color='3D3D3D')
+
+    def test_list_blocks(self):
+        '''Test listing users who are blocked by the authenticated user
+        succeeds'''
+        self.api.list_blocks()
+
+    def test_list_block_ids(self):
+        '''Test listing user ids who are blocked by the authenticated user
+        succeeds'''
+        self.api.list_block_ids()
+
+    def test_create_block(self):
+        '''Test blocking a user succeeds'''
+        self.api.create_block(screen_name='justinbieber')
+
+    def test_destroy_block(self):
+        '''Test unblocking a user succeeds'''
+        self.api.destroy_block(screen_name='justinbieber')
+
+    def test_lookup_user(self):
+        '''Test listing a number of user objects succeeds'''
+        self.api.lookup_user(screen_name='twitter,justinbieber')
+
+    def test_show_user(self):
+        '''Test showing one user works'''
+        self.api.show_user(screen_name='twitter')
+
+    def test_search_users(self):
+        '''Test that searching for users succeeds'''
+        self.api.search_users(q='Twitter API')
+
+    def test_get_contributees(self):
+        '''Test returning list of accounts the specified user can
+        contribute to succeeds'''
+        self.api.get_contributees(screen_name='TechCrunch')
+
+    def test_get_contributors(self):
+        '''Test returning list of accounts that contribute to the
+        authenticated user fails because we are not a Contributor account'''
+        self.assertRaises(TwythonError, self.api.get_contributors,
+                          screen_name=screen_name)
+
+    def test_remove_profile_banner(self):
+        '''Test removing profile banner succeeds'''
+        self.api.remove_profile_banner()
+
+    def test_get_profile_banner_sizes(self):
+        '''Test getting list of profile banner sizes fails because
+        we have not uploaded a profile banner'''
+        self.assertRaises(TwythonError, self.api.get_profile_banner_sizes)
+
+    # Suggested Users
+    def test_get_user_suggestions_by_slug(self):
+        '''Test getting user suggestions by slug succeeds'''
+        self.api.get_user_suggestions_by_slug(slug='twitter')
+
+    def test_get_user_suggestions(self):
+        '''Test getting user suggestions succeeds'''
+        self.api.get_user_suggestions()
+
+    def test_get_user_suggestions_statuses_by_slug(self):
+        '''Test getting status of suggested users succeeds'''
+        self.api.get_user_suggestions_statuses_by_slug(slug='funny')
+
+    # Favorites
+    def test_get_favorites(self):
+        '''Test getting list of favorites for the authenticated
+        user succeeds'''
+        self.api.get_favorites()
+
+    def test_create_and_destroy_favorite(self):
+        '''Test creating and destroying a favorite on a tweet succeeds'''
+        self.api.create_favorite(id=test_tweet_id)
+        self.api.destroy_favorite(id=test_tweet_id)
+
+    # Lists
+    def test_show_lists(self):
+        '''Test show lists for specified user'''
+        self.api.show_lists(screen_name='twitter')
+
+    def test_get_list_statuses(self):
+        '''Test timeline of tweets authored by members of the
+        specified list succeeds'''
+        self.api.get_list_statuses(id=test_list_id)
+
+    def test_create_update_destroy_list_add_remove_list_members(self):
+        '''Test create a list, adding and removing members then
+        deleting the list succeeds'''
+        the_list = self.api.create_list(name='Stuff')
+        list_id = the_list['id_str']
+
+        self.api.update_list(list_id=list_id, name='Stuff Renamed')
+
+        # Multi add/delete members
+        self.api.create_list_members(list_id=list_id,
+                                     screen_name='johncena,xbox')
+        self.api.delete_list_members(list_id=list_id,
+                                     screen_name='johncena,xbox')
+
+        # Single add/delete member
+        self.api.add_list_member(list_id=list_id, screen_name='justinbieber')
+        self.api.delete_list_member(list_id=list_id, screen_name='justinbieber')
+
+        self.api.delete_list(list_id=list_id)
+
+    def test_get_list_memberships(self):
+        '''Test list of lists the authenticated user is a member of succeeds'''
+        self.api.get_list_memberships()
+
+    def test_get_list_subscribers(self):
+        '''Test list of subscribers of a specific list succeeds'''
+        self.api.get_list_subscribers(list_id=test_list_id)
+
+    def test_subscribe_is_subbed_and_unsubscribe_to_list(self):
+        '''Test subscribing, is a list sub and unsubbing to list succeeds'''
+        self.api.subscribe_to_list(list_id=test_list_id)
+        # Returns 404 if user is not a subscriber
+        self.api.is_list_subscriber(list_id=test_list_id,
+                                    screen_name=screen_name)
+        self.api.unsubscribe_from_list(list_id=test_list_id)
+
+    def test_is_list_member(self):
+        '''Test returning if specified user is member of a list succeeds'''
+        # Returns 404 if not list member
+        self.api.is_list_member(list_id=test_list_id, screen_name='jack')
+
+    def test_get_list_members(self):
+        '''Test listing members of the specified list succeeds'''
+        self.api.get_list_members(list_id=test_list_id)
+
+    def test_get_specific_list(self):
+        '''Test getting specific list succeeds'''
+        self.api.get_specific_list(list_id=test_list_id)
+
+    def test_get_list_subscriptions(self):
+        '''Test collection of the lists the specified user is
+        subscribed to succeeds'''
+        self.api.get_specific_list(screen_name='twitter')
+
+    def test_show_owned_lists(self):
+        '''Test collection of lists the specified user owns succeeds'''
+        self.api.get_owned_lists(screen_name='twitter')
+
+    # Saved Searches
+    def test_get_saved_searches(self):
+        '''Test getting list of saved searches for authenticated
+        user succeeds'''
+        self.api.get_saved_searches()
+
+    def test_create_get_destroy_saved_search(self):
+        '''Test getting list of saved searches for authenticated
+        user succeeds'''
+        saved_search = self.api.create_saved_search(query='#ArnoldPalmer')
+        saved_search_id = saved_search['id_str']
+
+        self.api.show_saved_search(id=saved_search_id)
+        self.api.destory_saved_search(id=saved_search_id)
+
+    # Places & Geo
+    def test_get_geo_info(self):
+        '''Test getting info about a geo location succeeds'''
+        self.api.get_geo_info(place_id='df51dec6f4ee2b2c')
+
+    def test_reverse_geo_code(self):
+        '''Test reversing geocode succeeds'''
+        self.api.reverse_geocode(lat='37.76893497', long='-122.42284884')
+
+    def test_search_geo(self):
+        '''Test search for places that can be attached
+        to a statuses/update succeeds'''
+        self.api.search_geo(query='Toronto')
+
+    def test_get_similar_places(self):
+        '''Test locates places near the given coordinates which
+        are similar in name succeeds'''
+        self.api.get_similar_places(lat='37', long='-122', name='Twitter HQ')
+
+    # Trends
+    def test_get_place_trends(self):
+        '''Test getting the top 10 trending topics for a specific
+        WOEID succeeds'''
+        self.api.get_place_trends(id=1)
+
+    def test_get_available_trends(self):
+        '''Test returning locations that Twitter has trending
+        topic information for succeeds'''
+        self.api.get_available_trends()
+
+    def test_get_closest_trends(self):
+        '''Test getting the locations that Twitter has trending topic
+        information for, closest to a specified location succeeds'''
+        self.api.get_closest_trends(lat='37', long='-122')
+
+    # Spam Reporting
+    def test_report_spam(self):
+        '''Test reporting user succeeds'''
+        self.api.report_spam(screen_name='justinbieber')
+
+
+if __name__ == '__main__':
+    unittest.main()

From d3e17dcd4bf31166602e1f54cb0d349012c83156 Mon Sep 17 00:00:00 2001
From: Mike Helmick <mikehelmick@me.com>
Date: Tue, 14 May 2013 21:52:25 -0400
Subject: [PATCH 2/6] Auth test, updating func names and tests that failed

Coverage 56%
---
 .travis.yml     |  2 +-
 test_twython.py | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3f75b4d..be9c1f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ env:
     PROTECTED_TWITTER_2='TwythonSecure2'
     TEST_TWEET_ID='332992304010899457'
     TEST_LIST_ID='574'
-script: nosetests -v test_twython:TwythonAPITestCase --cover-package="twython" --with-coverage
+script: nosetests -v test_twython:TwythonAPITestCase test_twython:TwythonAuthTestCase --cover-package="twython" --with-coverage
 install:
   - pip install -r requirements.txt
 notifications:
diff --git a/test_twython.py b/test_twython.py
index 84db80c..2659108 100644
--- a/test_twython.py
+++ b/test_twython.py
@@ -21,6 +21,17 @@ test_tweet_id = os.environ.get('TEST_TWEET_ID', '318577428610031617')
 test_list_id = os.environ.get('TEST_LIST_ID', '574')  # 574 is @twitter/team
 
 
+class TwythonAuthTestCase(unittest.TestCase):
+    def setUp(self):
+        self.api = Twython(app_key, app_secret)
+
+    def test_get_authentication_tokens(self):
+        '''Test getting authentication tokens works'''
+        self.api.get_authentication_tokens(callback_url='http://google.com/',
+                                           force_login=True,
+                                           screen_name=screen_name)
+
+
 class TwythonAPITestCase(unittest.TestCase):
     def setUp(self):
         self.api = Twython(app_key, app_secret,
@@ -290,7 +301,7 @@ class TwythonAPITestCase(unittest.TestCase):
     def test_get_list_statuses(self):
         '''Test timeline of tweets authored by members of the
         specified list succeeds'''
-        self.api.get_list_statuses(id=test_list_id)
+        self.api.get_list_statuses(list_id=test_list_id)
 
     def test_create_update_destroy_list_add_remove_list_members(self):
         '''Test create a list, adding and removing members then
@@ -344,11 +355,11 @@ class TwythonAPITestCase(unittest.TestCase):
     def test_get_list_subscriptions(self):
         '''Test collection of the lists the specified user is
         subscribed to succeeds'''
-        self.api.get_specific_list(screen_name='twitter')
+        self.api.get_list_subscriptions(screen_name='twitter')
 
     def test_show_owned_lists(self):
         '''Test collection of lists the specified user owns succeeds'''
-        self.api.get_owned_lists(screen_name='twitter')
+        self.api.show_owned_lists(screen_name='twitter')
 
     # Saved Searches
     def test_get_saved_searches(self):
@@ -359,11 +370,11 @@ class TwythonAPITestCase(unittest.TestCase):
     def test_create_get_destroy_saved_search(self):
         '''Test getting list of saved searches for authenticated
         user succeeds'''
-        saved_search = self.api.create_saved_search(query='#ArnoldPalmer')
+        saved_search = self.api.create_saved_search(query='#Twitter')
         saved_search_id = saved_search['id_str']
 
         self.api.show_saved_search(id=saved_search_id)
-        self.api.destory_saved_search(id=saved_search_id)
+        self.api.destroy_saved_search(id=saved_search_id)
 
     # Places & Geo
     def test_get_geo_info(self):

From 0d3ae38c390ffe4b597efe502d161a8674041718 Mon Sep 17 00:00:00 2001
From: Mike Helmick <mikehelmick@me.com>
Date: Tue, 14 May 2013 22:07:05 -0400
Subject: [PATCH 3/6] Update .travis.yml

---
 .travis.yml | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index be9c1f4..572a778 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,19 @@
 language: python
 python:
-  - 2.6
-  - 2.7
-  - 3.3
+  - '2.6'
+  - '2.7'
+  - '3.3'
 env:
-    APP_KEY='kpowaBNkhhXwYUu3es27dQ'
-    APP_SECRET='iQ0Jr0e2xvhOwLubifWAFtmXnVT7VZAIqUXnI2FcCjU'
-    OAUTH_TOKEN='1419197916-OZKOynuB1rZ1g4DXwS2wjr1wGnknPHCUEkbvvKx'
-    OAUTH_TOKEN_SECRET='dh9YbCkDR3h3XQFXA7pjufI6S55CCZ6UjdvBNUmi1hg'
-    SCREEN_NAME='TwythonTest'
-    PROTECTED_TWITTER_1='TwythonSecure1'
-    PROTECTED_TWITTER_2='TwythonSecure2'
-    TEST_TWEET_ID='332992304010899457'
-    TEST_LIST_ID='574'
+    - APP_KEY='kpowaBNkhhXwYUu3es27dQ'
+    - APP_SECRET='iQ0Jr0e2xvhOwLubifWAFtmXnVT7VZAIqUXnI2FcCjU'
+    - OAUTH_TOKEN='1419197916-OZKOynuB1rZ1g4DXwS2wjr1wGnknPHCUEkbvvKx'
+    - OAUTH_TOKEN_SECRET='dh9YbCkDR3h3XQFXA7pjufI6S55CCZ6UjdvBNUmi1hg'
+    - SCREEN_NAME='TwythonTest'
+    - PROTECTED_TWITTER_1='TwythonSecure1'
+    - PROTECTED_TWITTER_2='TwythonSecure2'
+    - TEST_TWEET_ID='332992304010899457'
+    - TEST_LIST_ID='574'
 script: nosetests -v test_twython:TwythonAPITestCase test_twython:TwythonAuthTestCase --cover-package="twython" --with-coverage
-install:
-  - pip install -r requirements.txt
+install: pip install -r requirements.txt
 notifications:
   email: false

From bb5e0dece15e1715099f58b3fc77a1803d5d7bd2 Mon Sep 17 00:00:00 2001
From: Mike Helmick <mikehelmick@me.com>
Date: Wed, 15 May 2013 16:36:53 -0400
Subject: [PATCH 4/6] Adding secure travis keys

Changed keys for the old dev app, so they're invalid now. Adding secure
generated keys for app key/secret, oauth token/secret
---
 .travis.yml     | 25 +++++++++++++------------
 test_twython.py |  8 ++++----
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 572a778..f968a0f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,19 @@
 language: python
 python:
-  - '2.6'
-  - '2.7'
-  - '3.3'
+  - 2.6
+  - 2.7
+  - 3.3
 env:
-    - APP_KEY='kpowaBNkhhXwYUu3es27dQ'
-    - APP_SECRET='iQ0Jr0e2xvhOwLubifWAFtmXnVT7VZAIqUXnI2FcCjU'
-    - OAUTH_TOKEN='1419197916-OZKOynuB1rZ1g4DXwS2wjr1wGnknPHCUEkbvvKx'
-    - OAUTH_TOKEN_SECRET='dh9YbCkDR3h3XQFXA7pjufI6S55CCZ6UjdvBNUmi1hg'
-    - SCREEN_NAME='TwythonTest'
-    - PROTECTED_TWITTER_1='TwythonSecure1'
-    - PROTECTED_TWITTER_2='TwythonSecure2'
-    - TEST_TWEET_ID='332992304010899457'
-    - TEST_LIST_ID='574'
+  global:
+    - secure: "U+9hLkIIV004Ap4w7EA0THPBErvdL8fIpZ6BuwVcf6MMRwZ3Sqm4s23ukvQs\nTUGa9+97gsh41RCijpriAQLogXtyRZlwWpk3rWQmMavxaiibciNE+Py9GG5z\nUpgw+AWNS2ZfRsBsg2GhsWLk+UHb63ixFbU0PCRPalx9e6ycW2g="
+    - secure: "Zf2Q7mBwWdM7sDboyZ5KR3qj5M6J9XqCFNbDaPEHJru8FSv0HB6WCQe7ddh6\nQ3OKCGiCQyFgzBPfBKD6qIVmYYbiGqFD75grKG/0M4ZJw1CSrkOQQ3qs/Nlk\nhuKmTpY7zx+c1m/XjHSWE2nW7bWnRybDDsJL0y7gcfeupwePyDU="
+    - secure: "cXRljeHb4/jS5rMb24uLhC8pdQU0psqdT5ErZLYiOlxxG7SpM0Nn3ULiZ5xT\nK7K7s3bkt2MyFc68MST9TwZS7UUGYopDBV/SF0+EXdtMmtUZ5pm552G4Lwqf\nrXmQDYZDrLrq8T+1sMSGiLhUUP9kKyVdN8Oy1UzuVkJrN4in/Do="
+    - secure: "GqPSc1AHB8mVaQtw3NL2ZT1pOi3QARPmw+fNeU0zl66dsFIt3GsFPsk3ncjn\n5OdsRjsvwyyE/SMreJvARxnxEAlxsQ2t/UWBPwaeYJjcnkZ6wJ66UcWw63YT\nX5XEmrbJy58bo5qZ3rABFb5JW4rWb9q/02L48riHVSuvzYi6YP8="
+    - SCREEN_NAME=TwythonTest
+    - PROTECTED_TWITTER_1=TwythonSecure1
+    - PROTECTED_TWITTER_2=TwythonSecure2
+    - TEST_TWEET_ID=332992304010899457
+    - TEST_LIST_ID=574
 script: nosetests -v test_twython:TwythonAPITestCase test_twython:TwythonAuthTestCase --cover-package="twython" --with-coverage
 install: pip install -r requirements.txt
 notifications:
diff --git a/test_twython.py b/test_twython.py
index 2659108..26008cf 100644
--- a/test_twython.py
+++ b/test_twython.py
@@ -3,10 +3,10 @@ import os
 
 from twython import Twython, TwythonError, TwythonAuthError
 
-app_key = os.environ.get('APP_KEY', 'kpowaBNkhhXwYUu3es27dQ')
-app_secret = os.environ.get('APP_SECRET', 'iQ0Jr0e2xvhOwLubifWAFtmXnVT7VZAIqUXnI2FcCjU')
-oauth_token = os.environ.get('OAUTH_TOKEN', '1419197916-OZKOynuB1rZ1g4DXwS2wjr1wGnknPHCUEkbvvKx')
-oauth_token_secret = os.environ.get('OAUTH_TOKEN_SECRET', 'dh9YbCkDR3h3XQFXA7pjufI6S55CCZ6UjdvBNUmi1hg')
+app_key = os.environ.get('APP_KEY')
+app_secret = os.environ.get('APP_SECRET')
+oauth_token = os.environ.get('OAUTH_TOKEN')
+oauth_token_secret = os.environ.get('OAUTH_TOKEN_SECRET')
 
 screen_name = os.environ.get('SCREEN_NAME', 'TwythonTest')
 

From a76b93e49107d987bb7633a7374909be2a27ccf5 Mon Sep 17 00:00:00 2001
From: Mike Helmick <mikehelmick@me.com>
Date: Wed, 15 May 2013 16:55:55 -0400
Subject: [PATCH 5/6] Okay, let's try this secure stuff again

---
 .travis.yml | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f968a0f..8f1d82d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,17 +3,29 @@ python:
   - 2.6
   - 2.7
   - 3.3
-env:
-  global:
-    - secure: "U+9hLkIIV004Ap4w7EA0THPBErvdL8fIpZ6BuwVcf6MMRwZ3Sqm4s23ukvQs\nTUGa9+97gsh41RCijpriAQLogXtyRZlwWpk3rWQmMavxaiibciNE+Py9GG5z\nUpgw+AWNS2ZfRsBsg2GhsWLk+UHb63ixFbU0PCRPalx9e6ycW2g="
-    - secure: "Zf2Q7mBwWdM7sDboyZ5KR3qj5M6J9XqCFNbDaPEHJru8FSv0HB6WCQe7ddh6\nQ3OKCGiCQyFgzBPfBKD6qIVmYYbiGqFD75grKG/0M4ZJw1CSrkOQQ3qs/Nlk\nhuKmTpY7zx+c1m/XjHSWE2nW7bWnRybDDsJL0y7gcfeupwePyDU="
-    - secure: "cXRljeHb4/jS5rMb24uLhC8pdQU0psqdT5ErZLYiOlxxG7SpM0Nn3ULiZ5xT\nK7K7s3bkt2MyFc68MST9TwZS7UUGYopDBV/SF0+EXdtMmtUZ5pm552G4Lwqf\nrXmQDYZDrLrq8T+1sMSGiLhUUP9kKyVdN8Oy1UzuVkJrN4in/Do="
-    - secure: "GqPSc1AHB8mVaQtw3NL2ZT1pOi3QARPmw+fNeU0zl66dsFIt3GsFPsk3ncjn\n5OdsRjsvwyyE/SMreJvARxnxEAlxsQ2t/UWBPwaeYJjcnkZ6wJ66UcWw63YT\nX5XEmrbJy58bo5qZ3rABFb5JW4rWb9q/02L48riHVSuvzYi6YP8="
-    - SCREEN_NAME=TwythonTest
-    - PROTECTED_TWITTER_1=TwythonSecure1
-    - PROTECTED_TWITTER_2=TwythonSecure2
-    - TEST_TWEET_ID=332992304010899457
-    - TEST_LIST_ID=574
+env: 
+  global: 
+  - secure: |-
+      W+6YFPFcqhh3o9JzQj4D3FI9LdvMCrrRcbqlcbNaMqTjMo3MMLNs08bhvzFm
+      wWjU+vSdaZO79/WzHidifBf2BbAgF4xNfY/mOl9EycPmvjNPx2AzOtfG2rb/
+      PxJoY0Vloxi0ZfJqWpiAc/xTpXQ/2lRmkVbggeQ5px3wYLOfKr4=
+  - secure: |-
+      FCsHF9JqATGopWQK+M88o6ZxEYduZKTTrQeTbm4yI8g1PksjmO9vG7cYYub0
+      mlpWUwZ8EHjQKOcMPRQqE1z71rr6zGRHlyy7TaiXGZMXr3JtyTuvJDkHQjIz
+      DR1+/1FGlTl4dWGDiOfWWsLOKAOnI2/u/z9CROgwMybjFl5l3R8=
+  - secure: |-
+      XB0p3AQ4gWYhZMt0czR6qbWmx80qJHCC2W3Zi5b7JMJAP5alb4GqzbZyuf8M
+      zUFwUgM2j/93/Vds/QGL4oMVSy6ECOo4lWnXs1Gt08ZMJZrJjvTSnjWrqwL9
+      txRwyxZgFuJwtmIfIILTus+GMlGeW9lKvFDJwb698Fx3faXC35A=
+  - secure: |-
+      GCwKif9aZkpBVU6IJzDQAf0o13FrS7tRsME/CG+1xorqcLPcq+G6aN+10NGN
+      OyWCX2RceE/3dwP3fDiypwl4hIWWzKnAza3toebomvniAKSsDGOG59j+n+QY
+      TDeyJJ5oIa1DYbL94aeZyc4nn/C8ZafADqiHGfOU8swSdarnIcg=
+  - SCREEN_NAME=TwythonTest
+  - PROTECTED_TWITTER_1=TwythonSecure1
+  - PROTECTED_TWITTER_2=TwythonSecure2
+  - TEST_TWEET_ID=332992304010899457
+  - TEST_LIST_ID=574
 script: nosetests -v test_twython:TwythonAPITestCase test_twython:TwythonAuthTestCase --cover-package="twython" --with-coverage
 install: pip install -r requirements.txt
 notifications:

From 077406a8b344e335af037e31e0839a84c86bfa0b Mon Sep 17 00:00:00 2001
From: Mike Helmick <mikehelmick@me.com>
Date: Wed, 15 May 2013 17:38:28 -0400
Subject: [PATCH 6/6] Adding coverage to requirements

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 09acfa6..70bd0e7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
+coverage==3.6.0
 requests==1.2.0
 requests_oauthlib==0.3.1