From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Tue, 12 Apr 2011 20:25:06 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/lapilofu/philo
X-Git-Tag: philo-0.9~15^2~3
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/b3e16b23802c9bc5a99193f9e9551b4378ee1119?ds=inline;hp=-c

Merge branch 'master' of git://github.com/lapilofu/philo
---

b3e16b23802c9bc5a99193f9e9551b4378ee1119
diff --combined contrib/sobol/search.py
index 843af81,4f89e76..33603f3
--- a/contrib/sobol/search.py
+++ b/contrib/sobol/search.py
@@@ -42,9 -42,8 +42,9 @@@ class SearchRegistry(object)
  	def register(self, search, slug=None):
  		slug = slug or search.slug
  		if slug in self._registry:
 -			if self._registry[slug] != search:
 -				raise RegistrationError("A different search is already registered as `%s`")
 +			registered = self._registry[slug]
 +			if registered.__module__ != search.__module__:
 +				raise RegistrationError("A different search is already registered as `%s`" % slug)
  		else:
  			self._registry[slug] = search
  	
@@@ -362,7 -361,7 +362,7 @@@ else
  		def parse_response(self, response, limit=None):
  			strainer = self.strainer
  			soup = BeautifulSoup(response, parseOnlyThese=strainer)
- 			return self.parse_results(soup[:limit])
+ 			return self.parse_results(soup.findAll(recursive=False, limit=limit))
  		
  		def parse_results(self, results):
  			"""