WIP - respond to Rob's comment

backdrop/core/repository.py

@@ -69,12 +69,16 @@ def retrieve(self, name):
         data_set_url = ('{url}/data-sets/{data_set_name}'.format(
                         url=self._stagecraft_url,
                         data_set_name=name))
-        json_response = _get_json_url(
-            data_set_url, self._stagecraft_token, swallow_404=True)
-        if json_response is not None:
-            return _make_bucket_config(_decode_json(json_response))
 
-        return None
+        try:
+            json_response = _get_json_url(data_set_url, self._stagecraft_token)
+        except requests.HTTPError as e:
+            if e.response.status_code == 404:
+                return None
+            else:
+                raise
+
+        return _make_bucket_config(_decode_json(json_response))
 
     def get_bucket_for_query(self, data_group, data_type):
         empty_vars = []
@@ -110,7 +114,7 @@ def _decode_json(string):
     return json.loads(string) if string is not None else None
 
 
-def _get_json_url(url, token, swallow_404=False):
+def _get_json_url(url, token):
     auth_header = (
         'Authorization',
         'Bearer {}'.format(token))
@@ -122,11 +126,6 @@ def _get_json_url(url, token, swallow_404=False):
     except requests.HTTPError as e:
         logger.exception(e)
         logger.error('Stagecraft said: {}'.format(response.content))
-
-        if swallow_404 and e.response.status_code == 404:
-            logger.error('Got HTTP 404 for: {}'.format(url))
-            return None
-
         raise
     return response.content
 

tests/core/test_repository.py

@@ -4,7 +4,7 @@
 from backdrop.core.bucket import BucketConfig
 from backdrop.core.repository import (BucketConfigRepository,
                                       UserConfigRepository,
-                                      _get_json_url, StagecraftHttp404)
+                                      _get_json_url)
 from hamcrest import assert_that, equal_to, is_, has_entries, match_equality
 from mock import Mock, patch
 from nose.tools import assert_raises