Skip to content

Commit

Permalink
Fixed status view
Browse files Browse the repository at this point in the history
  • Loading branch information
kroman0 committed Jul 11, 2016
1 parent 07ada33 commit ed01452
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion openprocurement/documentservice/tests/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class SimpleTest(BaseWebTest):
def test_root(self):
response = self.app.get('/')
self.assertEqual(response.status, '204 No Content')
self.assertEqual(response.content_type, None)
self.assertEqual(response.content_type, 'text/html')

def test_register_get(self):
response = self.app.get('/register', status=404)
Expand Down
18 changes: 8 additions & 10 deletions openprocurement/documentservice/views.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
from pyramid.view import view_config
from base64 import b64encode, b64decode
from time import time
from urllib import quote, unquote
from logging import getLogger
from openprocurement.documentservice.storage import StorageRedirect, HashInvalid, KeyNotFound, NoContent, ContentUploaded
from openprocurement.documentservice.utils import error_handler, context_unpack
from logging import getLogger
from pyramid.httpexceptions import HTTPNoContent
from pyramid.view import view_config
from time import time
from urllib import quote, unquote

LOGGER = getLogger(__name__)
EXPIRES = 300


@view_config(route_name='status', renderer='json')
@view_config(route_name='status')
def status_view(request):
request.response.status = 204
request.response.content_type = ''
return HTTPNoContent()


@view_config(route_name='register', renderer='json', request_method='POST', permission='upload')
Expand Down Expand Up @@ -124,9 +124,7 @@ def get_view(request):
except KeyNotFound:
return error_handler(request, 404, {"location": "url", "name": "doc_id", "description": "Not Found"})
except NoContent:
request.response.status = 204
request.response.content_type = ''
return
return HTTPNoContent()
except StorageRedirect as e:
request.response.status = 302
request.response.headers['Location'] = e.url
Expand Down

0 comments on commit ed01452

Please sign in to comment.