Removed is_error in Response

3 files changed, 5 insertions, 7 deletions

diff --git a/flywheel/emitters.py b/flywheel/emitters.py
index 408a65eb..4ba2d92d 100644
--- a/flywheel/emitters.py
+++ b/flywheel/emitters.py
@@ -65,7 +65,7 @@ class DocumentingTemplateEmitter(BaseEmitter):
         
         # Otherwise if this isn't an error response
         # then attempt to get a form bound to the response object
-        if not form_instance and not resource.response.is_error and resource.response.has_content_body:
+        if not form_instance and resource.response.has_content_body:
             try:
                 form_instance = resource.get_form(resource.response.raw_content)
             except:
diff --git a/flywheel/resource.py b/flywheel/resource.py
index c15f01ed..36f49792 100644
--- a/flywheel/resource.py
+++ b/flywheel/resource.py
@@ -12,11 +12,10 @@ from itertools import chain
 # TODO: Display user login in top panel: http://stackoverflow.com/questions/806835/django-redirect-to-previous-page-after-login
 # TODO: Figure how out references and named urls need to work nicely
 # TODO: POST on existing 404 URL, PUT on existing 404 URL
-# TODO: Remove is_error throughout
 #
+# NEXT: Validators to become generic, forms to move out of Resource into FormValidator
+# NEXT: Permissions to become generic, UserAllowed, Throttling
 # NEXT: Exceptions on func() -> 500, tracebacks emitted if settings.DEBUG
-# NEXT: Generic content form
-# NEXT: Remove self.blah munging  (Add a ResponseContext object?)
 # NEXT: Caching cleverness
 # NEXT: Test non-existent fields on ModelResources
 #
diff --git a/flywheel/response.py b/flywheel/response.py
index d662ef29..4f23bb0a 100644
--- a/flywheel/response.py
+++ b/flywheel/response.py
@@ -106,13 +106,12 @@ class NoContent(object):
 
 
 class Response(object):
-    def __init__(self, status, content=NoContent, headers={}, is_error=False):
+    def __init__(self, status, content=NoContent, headers={}):
         self.status = status
         self.has_content_body = not content is NoContent
         self.raw_content = content      # content prior to filtering
         self.cleaned_content = content  # content after filtering
         self.headers = headers
-        self.is_error = is_error
  
     @property
     def status_text(self):
@@ -123,4 +122,4 @@ class Response(object):
 
 class ResponseException(BaseException):
     def __init__(self, status, content=NoContent, headers={}):
-        self.response = Response(status, content=content, headers=headers, is_error=True)
+        self.response = Response(status, content=content, headers=headers)