From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Fri, 10 Jun 2011 19:03:33 +0000 (-0400)
Subject: Merge branch 'sobol_use_cache_hotfix' into develop
X-Git-Tag: philo-0.9.1^2~8^2~3
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/bc77a18732f275f137b7f3921d15d809b786855b

Merge branch 'sobol_use_cache_hotfix' into develop
---

bc77a18732f275f137b7f3921d15d809b786855b
diff --cc philo/contrib/sobol/search.py
index 3e30c27,eb2a333..a79030a
--- a/philo/contrib/sobol/search.py
+++ b/philo/contrib/sobol/search.py
@@@ -31,11 -30,77 +31,11 @@@ __all__ = 
  
  
  SEARCH_CACHE_SEED = 'philo_sobol_search_results'
- USE_CACHE = getattr(settings, 'SOBOL_USE_SEARCH', True)
+ USE_CACHE = getattr(settings, 'SOBOL_USE_CACHE', True)
  
  
 -class RegistrationError(Exception):
 -	"""Raised if there is a problem registering a search with a :class:`SearchRegistry`"""
 -	pass
 -
 -
 -class SearchRegistry(object):
 -	"""Holds a registry of search types by slug."""
 -	
 -	def __init__(self):
 -		self._registry = {}
 -	
 -	def register(self, search, slug=None):
 -		"""
 -		Register a search with the registry.
 -		
 -		:param search: The search class to register - generally a subclass of :class:`BaseSearch`
 -		:param slug: The slug which will be used to register the search class. If ``slug`` is ``None``, the search's default slug will be used.
 -		:raises: :class:`RegistrationError` if a different search is already registered with ``slug``.
 -		
 -		"""
 -		slug = slug or search.slug
 -		if slug in self._registry:
 -			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
 -	
 -	def unregister(self, search, slug=None):
 -		"""
 -		Unregister a search from the registry.
 -		
 -		:param search: The search class to unregister - generally a subclass of :class:`BaseSearch`
 -		:param slug: If provided, the search will only be removed if it was registered with ``slug``. If not provided, the search class will be unregistered no matter what slug it was registered with.
 -		:raises: :class:`RegistrationError` if a slug is provided but the search registered with that slug is not ``search``.
 -		
 -		"""
 -		if slug is not None:
 -			if slug in self._registry and self._registry[slug] == search:
 -				del self._registry[slug]
 -			raise RegistrationError("`%s` is not registered as `%s`" % (search, slug))
 -		else:
 -			for slug, search in self._registry.items():
 -				if search == search:
 -					del self._registry[slug]
 -	
 -	def items(self):
 -		"""Returns a list of (slug, search) items in the registry."""
 -		return self._registry.items()
 -	
 -	def iteritems(self):
 -		"""Returns an iterator over the (slug, search) pairs in the registry."""
 -		return RegistryIterator(self._registry, 'iteritems')
 -	
 -	def iterchoices(self):
 -		"""Returns an iterator over (slug, search.verbose_name) pairs for the registry."""
 -		return RegistryIterator(self._registry, 'iteritems', lambda x: (x[0], x[1].verbose_name))
 -	
 -	def __getitem__(self, key):
 -		"""Returns the search registered with ``key``."""
 -		return self._registry[key]
 -	
 -	def __iter__(self):
 -		"""Returns an iterator over the keys in the registry."""
 -		return self._registry.__iter__()
 -
 -
 -registry = SearchRegistry()
 +#: A registry for :class:`BaseSearch` subclasses that should be available in the admin.
 +registry = Registry()
  
  
  def _make_cache_key(search, search_arg):