diff options
| author | kyleknap <kyleknap@amazon.com> | 2014-10-08 12:41:04 -0700 |
|---|---|---|
| committer | kyleknap <kyleknap@amazon.com> | 2014-10-08 12:41:04 -0700 |
| commit | 2517f660f8ef9012708d46da3a36ab967993d2f6 (patch) | |
| tree | d90281aecdf962a2c7342938ac0a20d57fb74088 /boto/cloudsearch2/search.py | |
| parent | ff3d8159af3c816303785e023a4182aacb6aabf5 (diff) | |
| parent | 8f500ce75fea1ba1446195b26dddbe90b52223d8 (diff) | |
| download | boto-2.33.0.tar.gz | |
Merge branch 'release-2.33.0'2.33.0
Diffstat (limited to 'boto/cloudsearch2/search.py')
| -rw-r--r-- | boto/cloudsearch2/search.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/boto/cloudsearch2/search.py b/boto/cloudsearch2/search.py index 78ffc168..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) @@ -152,6 +152,10 @@ class SearchConnection(object): self.endpoint = endpoint self.session = requests.Session() + # Copy proxy settings from connection + if self.domain and self.domain.layer1 and self.domain.layer1.use_proxy: + self.session.proxies['http'] = self.domain.layer1.get_proxy_url_with_auth() + if not endpoint: self.endpoint = domain.search_service_endpoint |