Handle case where self.domain isn't defined and we have to default to…

… some API version number. Use new 2013-01-01 in this case.
leezen · Apr 14, 2014 · 5ec8c7c · 5ec8c7c
1 parent 5260282
commit 5ec8c7c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/boto/cloudsearch2/document.py b/boto/cloudsearch2/document.py
@@ -189,7 +189,10 @@ def commit(self):
             index = sdf.index(': null')
             boto.log.error(sdf[index - 100:index + 100])
 
-        url = "http://%s/%s/documents/batch" % (self.endpoint, self.domain.layer1.APIVersion)
+        api_version = '2013-01-01'
+        if self.domain:
+            api_version = self.domain.layer1.APIVersion
+        url = "http://%s/%s/documents/batch" % (self.endpoint, api_version)
 
         # Keep-alive is automatic in a post-1.0 requests world.
         session = requests.Session()

diff --git a/boto/cloudsearch2/search.py b/boto/cloudsearch2/search.py
@@ -273,7 +273,10 @@ def __call__(self, query):
         :rtype: :class:`boto.cloudsearch2.search.SearchResults`
         :return: search results
         """
-        url = "http://%s/%s/search" % (self.endpoint, self.domain.layer1.APIVersion)
+        api_version = '2013-01-01'
+        if self.domain:
+            api_version = self.domain.layer1.APIVersion
+        url = "http://%s/%s/search" % (self.endpoint, api_version)
         params = query.to_params()
 
         r = requests.get(url, params=params)