Author: rjollos
Date: Thu Sep 19 05:48:49 2013
New Revision: 1524626
URL: http://svn.apache.org/r1524626
Log:
0.8dev: Replaced instances of `has_key` with `in` operator.
Related to trac:#11306.
Modified:
bloodhound/trunk/bloodhound_multiproduct/multiproduct/config.py
bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py
Modified: bloodhound/trunk/bloodhound_multiproduct/multiproduct/config.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_multiproduct/multiproduct/config.py?rev=1524626&r1=1524625&r2=1524626&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_multiproduct/multiproduct/config.py (original)
+++ bloodhound/trunk/bloodhound_multiproduct/multiproduct/config.py Thu Sep 19
05:48:49 2013
@@ -169,7 +169,7 @@ class Section(Section):
for parent in self.config.parents:
if parent[self.name].contains(key, defaults=False):
return True
- return defaults and Option.registry.has_key((self.name, key))
+ return defaults and (self.name, key) in Option.registry
__contains__ = contains
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py
URL:
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py?rev=1524626&r1=1524625&r2=1524626&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/base.py Thu Sep 19
05:48:49 2013
@@ -131,7 +131,7 @@ class BaseBloodhoundSearchTest(unittest.
url, data, x = BloodhoundSearchModule(self.env).process_request(
self.req)
self.env.log.debug("Received url: %s data: %s", url, data)
- if data.has_key("results"):
+ if 'results' in data:
self.env.log.debug("results: %s", data["results"].__dict__)
return data
