Remove api_version when domain is not api.twitter.com.

diff --git a/tests/test_sanity.py b/tests/test_sanity.py
index 9375963d61787a2164959f705b80cb77e076b175..742bd7a99f6af8d07859ed77b6cc1377a7e40ca0 100644 (file)
--- a/tests/test_sanity.py
+++ b/tests/test_sanity.py
@@ -40,3 +40,9 @@ def test_API_friendship_exists():
         user_a='ptttest0001', user_b='sixohsix')
     assert False == twitter.friendships.exists(
         user_a='gruber', user_b='ptttest0001')
+
+
+def test_search():
+    t_search = Twitter(domain='search.twitter.com')
+    results = t_search.search(q='foo')
+    assert results

diff --git a/twitter/api.py b/twitter/api.py
index a5be1bb9a99b3e5d9b0274450d583ddcf2d0f351..4520e354bc48fd564666b77e1f580363abe75fef 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -13,6 +13,9 @@ try:
 except ImportError:
     import simplejson as json
 
+class _DEFAULT(object):
+    pass
+
 class TwitterError(Exception):
     """
     Base Exception thrown by the Twitter object when there is a
@@ -240,7 +243,7 @@ class Twitter(TwitterCall):
     def __init__(
         self, format="json",
         domain="api.twitter.com", secure=True, auth=None,
-        api_version='1'):
+        api_version=_DEFAULT):
         """
         Create a new twitter API connector.
 
@@ -260,7 +263,7 @@ class Twitter(TwitterCall):
         HTTPS.
 
         `api_version` is used to set the base uri. By default it's
-        '1'.
+        '1'. If you are using "search.twitter.com" set this to None.
         """
         if not auth:
             auth = NoAuth()
@@ -268,6 +271,12 @@ class Twitter(TwitterCall):
         if (format not in ("json", "xml", "")):
             raise ValueError("Unknown data format '%s'" %(format))
 
+        if api_version is _DEFAULT:
+            if domain == 'api.twitter.com':
+                api_version = '1'
+            else:
+                api_version = None
+
         uriparts = ()
         if api_version:
             uriparts += (str(api_version),)

diff --git a/twitter/oauth_dance.py b/twitter/oauth_dance.py
index d6e93e36617b7fcff9c5baf26806bc74f6926016..a013c422f66992642fbb2fdcac52d58a31160fd8 100644 (file)
--- a/twitter/oauth_dance.py
+++ b/twitter/oauth_dance.py
@@ -27,7 +27,7 @@ def oauth_dance(app_name, consumer_key, consumer_secret, token_filename=None):
     If a token_filename is given, the oauth tokens will be written to
     the file.
     """
-    print(("Hi there! We're gonna get you all set up to use %s." % app_name))
+    print("Hi there! We're gonna get you all set up to use %s." % app_name)
     twitter = Twitter(
         auth=OAuth('', '', consumer_key, consumer_secret),
         format='', api_version=None)