README.markdown

@@ -44,7 +44,7 @@ Example Use
     from twython import Twython  
     
     twitter = Twython()  
-    results = twitter.searchTwitter(q="bert")  
+    results = twitter.search(q = "bert")  
     
     # More function definitions can be found by reading over twython/twitter_endpoints.py, as well  
     # as skimming the source file. Both are kept human-readable, and are pretty well documented or  
@@ -65,7 +65,7 @@ Arguments to functions are now exact keyword matches for the Twitter API documen
 whatever query parameter arguments you read on Twitter's documentation (http://dev.twitter.com/doc) gets mapped
 as a named argument to any Twitter function.
 
-For example: the search API looks for arguments under the name "q", so you pass q="query_here" to searchTwitter().
+For example: the search API looks for arguments under the name "q", so you pass q="query_here" to search().
 
 Doing this allows us to be incredibly flexible in querying the Twitter API, so changes to the API aren't held up
 from you using them by this library.

twython/twython.py

@@ -295,15 +295,15 @@ class Twython(object):
         except HTTPError, e:
             raise TwythonError("bulkUserLookup() failed with a %s error code." % `e.code`, e.code)
 
-	def searchTwitter(self, **kwargs):
+    def search(self, **kwargs):
-		"""searchTwitter(search_query, **kwargs)
+        """search(search_query, **kwargs)
 
             Returns tweets that match a specified query.
 
             Parameters:
                 See the documentation at http://dev.twitter.com/doc/get/search. Pass in the API supported arguments as named parameters.
 
-				e.g x.searchTwitter(q="jjndf", page="2")
+                e.g x.search(q="jjndf")
         """
         searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs)
         try:
@@ -312,6 +312,7 @@ class Twython(object):
         except HTTPError, e:
             raise TwythonError("getSearchTimeline() failed with a %s error code." % `e.code`, e.code)
 
+
     def searchTwitterGen(self, search_query, **kwargs):
         """searchTwitterGen(search_query, **kwargs)
 

twython3k/twython.py

@@ -235,15 +235,15 @@ class Twython(object):
 		except HTTPError as e:
 			raise TwythonError("bulkUserLookup() failed with a %s error code." % repr(e.code), e.code)
 
-	def searchTwitter(self, **kwargs):
+	def search(self, **kwargs):
-		"""searchTwitter(search_query, **kwargs)
+		"""search(search_query, **kwargs)
 
 			Returns tweets that match a specified query.
 
 			Parameters:
 				See the documentation at http://dev.twitter.com/doc/get/search. Pass in the API supported arguments as named parameters.
 
-				e.g x.searchTwitter(q="jjndf", page="2")
+				e.g x.search(q="jjndf")
 		"""
 		searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs)
 		try: