diff options
| author | Yuval Oren <yuval@n3twork.com> | 2014-08-12 15:21:13 -0700 |
|---|---|---|
| committer | Yuval Oren <yuval@n3twork.com> | 2014-08-12 15:21:13 -0700 |
| commit | 5b424dbe1fffa0d515840e01a2492f09db5692b5 (patch) | |
| tree | 5601c07144d86259318df634c656df5087eecd8a | |
| parent | b9c76567f3c62a1d9774a7699e03f20456917888 (diff) | |
| parent | 1f35224454fd6296c5f716e9a90f521ecaaef6a4 (diff) | |
| download | boto-5b424dbe1fffa0d515840e01a2492f09db5692b5.tar.gz | |
Merge branch 'develop' into cloudsearch2-proxy
| -rw-r--r-- | boto/cloudsearch2/search.py | 2 | ||||
| -rw-r--r-- | docs/source/apps_built_on_boto.rst | 7 | ||||
| -rw-r--r-- | tests/unit/cloudsearch2/test_search.py | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/boto/cloudsearch2/search.py b/boto/cloudsearch2/search.py index 80e0756d..634faf85 100644 --- a/boto/cloudsearch2/search.py +++ b/boto/cloudsearch2/search.py @@ -131,7 +131,7 @@ class Query(object): params['highlight.%s' % k] = v if self.options: - params['options'] = self.options + params['q.options'] = self.options if self.return_fields: params['return'] = ','.join(self.return_fields) diff --git a/docs/source/apps_built_on_boto.rst b/docs/source/apps_built_on_boto.rst index 0fc40666..5d1bf483 100644 --- a/docs/source/apps_built_on_boto.rst +++ b/docs/source/apps_built_on_boto.rst @@ -42,3 +42,10 @@ you'd like it listed here, please submit a `pull request`_ adding it! pre-configured webservers to a cluster (including updating the load balancer), performing automated software deployments and creating backups - each with just one call from the commandline. + +**iamer** + https://pypi.python.org/pypi/iamer + IAMer dump and load your AWS IAM configuration into text files. Once + dumped, you can version the resulting json and ini files to keep track of + changes, and even ask your team mates to do Pull Requests when they want + access to something. diff --git a/tests/unit/cloudsearch2/test_search.py b/tests/unit/cloudsearch2/test_search.py index f03e7db6..a01e2074 100644 --- a/tests/unit/cloudsearch2/test_search.py +++ b/tests/unit/cloudsearch2/test_search.py @@ -116,11 +116,12 @@ class CloudSearchSearchTest(CloudSearchSearchBaseTest): def test_cloudsearch_qsearch(self): search = SearchConnection(endpoint=HOSTNAME) - search.search(q='Test') + search.search(q='Test', options='TestOptions') args = self.get_args(HTTPretty.last_request.raw_requestline) self.assertEqual(args[b'q'], [b"Test"]) + self.assertEqual(args[b'q.options'], [b"TestOptions"]) self.assertEqual(args[b'start'], [b"0"]) self.assertEqual(args[b'size'], [b"10"]) |