Update to use http.HTTPStatus enums

Author: vEpiphyte

synapse/axon.py

@@ -138,7 +138,8 @@ async def _setSha256Headers(self, sha256b):
 
         self.blobsize = await self.getAxon().size(sha256b)
         if self.blobsize is None:
-            self.sendRestErr('NoSuchFile', f'SHA-256 not found: {s_common.ehex(sha256b)}', status_code=404)
+            self.sendRestErr('NoSuchFile', f'SHA-256 not found: {s_common.ehex(sha256b)}',
+                             status_code=s_httpapi.HTTPStatus.NOT_FOUND)
             return False
 
         status = 200
@@ -259,7 +260,8 @@ async def delete(self, sha256):
 
         sha256b = s_common.uhex(sha256)
         if not await self.getAxon().has(sha256b):
-            self.sendRestErr('NoSuchFile', f'SHA-256 not found: {sha256}', status_code=404)
+            self.sendRestErr('NoSuchFile', f'SHA-256 not found: {sha256}',
+                             status_code=s_httpapi.HTTPStatus.NOT_FOUND)
             return
 
         resp = await self.getAxon().del_(sha256b)

synapse/lib/aha.py

@@ -81,7 +81,7 @@ async def post(self):
             raise
         except Exception as e:
             logger.exception(f'Error provisioning {name}')
-            return self.sendRestExc(e, status_code=400)
+            return self.sendRestExc(e, status_code=s_httpapi.HTTPStatus.BAD_REQUEST)
         return self.sendRestRetn({'url': url})
 
 _getAhaSvcSchema = {

synapse/lib/httpapi.py

@@ -1,7 +1,7 @@
 import io
 import os
 import csv
-import sys
+import http
 import base64
 import shutil
 import struct
@@ -573,46 +573,46 @@ async def runAxonTestHttp(self, axon, realaxon=None):
         # No auth - coverage
         async with self.getHttpSess() as sess:
             async with sess.get(f'{url_dl}/foobar') as resp:
-                self.eq(401, resp.status)
+                self.eq(resp.status, http.HTTPStatus.UNAUTHORIZED)
                 info = await resp.json()
                 self.eq('NotAuthenticated', info.get('code'))
             async with sess.head(f'{url_dl}/foobar') as resp:
-                self.eq(401, resp.status)
+                self.eq(resp.status, http.HTTPStatus.UNAUTHORIZED)
                 # aiohttp ignores HEAD bodies
             async with sess.delete(f'{url_dl}/foobar') as resp:
-                self.eq(401, resp.status)
+                self.eq(resp.status, http.HTTPStatus.UNAUTHORIZED)
                 info = await resp.json()
                 self.eq('NotAuthenticated', info.get('code'))
 
         # Perms
         async with self.getHttpSess(auth=('newb', 'secret'), port=port) as sess:
 
             async with sess.get(f'{url_dl}/{asdfhash_h}') as resp:
-                self.eq(403, resp.status)
+                self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
                 item = await resp.json()
                 self.eq('err', item.get('status'))
 
             async with sess.delete(f'{url_dl}/{asdfhash_h}') as resp:
-                self.eq(403, resp.status)
+                self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
                 item = await resp.json()
                 self.eq('err', item.get('status'))
 
             async with sess.get(f'{url_hs}/{asdfhash_h}') as resp:
-                self.eq(403, resp.status)
+                self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
                 item = await resp.json()
                 self.eq('err', item.get('status'))
 
             async with sess.head(f'{url_dl}/{asdfhash_h}') as resp:
-                self.eq(403, resp.status)
+                self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
                 item = await resp.json()
 
             async with sess.post(url_de) as resp:
-                self.eq(403, resp.status)
+                self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
                 item = await resp.json()
                 self.eq('err', item.get('status'))
 
             async with sess.post(url_ul, data=abuf) as resp:
-                self.eq(403, resp.status)
+                self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
                 item = await resp.json()
                 self.eq('err', item.get('status'))
 
@@ -631,27 +631,27 @@ async def runAxonTestHttp(self, axon, realaxon=None):
         # Basic
         async with self.getHttpSess(auth=('newb', 'secret'), port=port) as sess:
             async with sess.get(f'{url_dl}/foobar') as resp:
-                self.eq(404, resp.status)
+                self.eq(resp.status, http.HTTPStatus.NOT_FOUND)
                 info = await resp.json()
                 self.eq('err', info.get('status'))
                 self.eq('BadArg', info.get('code'))
                 self.eq('Hash is not a SHA-256: foobar', info.get('mesg'))
 
             async with sess.get(f'{url_dl}/{asdfhash_h}') as resp:
-                self.eq(404, resp.status)
+                self.eq(resp.status, http.HTTPStatus.NOT_FOUND)
                 info = await resp.json()
                 self.eq('err', info.get('status'))
                 self.eq('NoSuchFile', info.get('code'))
                 self.eq(f'SHA-256 not found: {asdfhash_h}', info.get('mesg'))
 
             async with sess.get(f'{url_hs}/{asdfhash_h}') as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 self.false(item.get('result'))
 
             async with sess.post(url_ul, data=abuf) as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 result = item.get('result')
@@ -661,13 +661,13 @@ async def runAxonTestHttp(self, axon, realaxon=None):
                 self.true(await realaxon.has(asdfhash))
 
             async with sess.get(f'{url_hs}/{asdfhash_h}') as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 self.true(item.get('result'))
 
             async with sess.put(url_ul, data=abuf) as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 result = item.get('result')
@@ -676,14 +676,14 @@ async def runAxonTestHttp(self, axon, realaxon=None):
                 self.true(await realaxon.has(asdfhash))
 
             async with sess.get(f'{url_dl}/{asdfhash_h}') as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 self.eq(abuf, await resp.read())
 
             # Streaming upload
             byts = io.BytesIO(bbuf)
 
             async with sess.post(url_ul, data=byts) as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 result = item.get('result')
@@ -694,7 +694,7 @@ async def runAxonTestHttp(self, axon, realaxon=None):
             byts = io.BytesIO(bbuf)
 
             async with sess.put(url_ul, data=byts) as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 result = item.get('result')
@@ -705,7 +705,7 @@ async def runAxonTestHttp(self, axon, realaxon=None):
             byts = io.BytesIO(b'')
 
             async with sess.post(url_ul, data=byts) as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 result = item.get('result')
@@ -715,7 +715,7 @@ async def runAxonTestHttp(self, axon, realaxon=None):
 
             # Streaming download
             async with sess.get(f'{url_dl}/{bbufhash_h}') as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
 
                 byts = []
                 async for bytz in resp.content.iter_chunked(1024):
@@ -726,44 +726,44 @@ async def runAxonTestHttp(self, axon, realaxon=None):
 
             # HEAD
             async with sess.head(f'{url_dl}/{bbufhash_h}') as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 self.eq('33554437', resp.headers.get('content-length'))
                 self.none(resp.headers.get('content-range'))
 
             async with sess.head(f'{url_dl}/foobar') as resp:
-                self.eq(404, resp.status)
+                self.eq(resp.status, http.HTTPStatus.NOT_FOUND)
                 self.eq('0', resp.headers.get('content-length'))
 
             # DELETE method by sha256
             async with sess.delete(f'{url_dl}/foobar') as resp:
-                self.eq(404, resp.status)
+                self.eq(resp.status, http.HTTPStatus.NOT_FOUND)
                 info = await resp.json()
                 self.eq('err', info.get('status'))
                 self.eq('BadArg', info.get('code'))
                 self.eq('Hash is not a SHA-256: foobar', info.get('mesg'))
 
             async with sess.delete(f'{url_dl}/{asdfhash_h}') as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 self.true(item.get('result'))
 
             async with sess.delete(f'{url_dl}/{asdfhash_h}') as resp:
-                self.eq(404, resp.status)
+                self.eq(resp.status, http.HTTPStatus.NOT_FOUND)
                 item = await resp.json()
                 self.eq('err', item.get('status'))
 
             # test /api/v1/axon/file/del API
             data = {'sha256s': (asdfhash_h, asdfhash_h)}
             async with sess.post(url_de, json=data) as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 self.eq(((asdfhash_h, False), (asdfhash_h, False)), item.get('result'))
 
             data = {'newp': 'newp'}
             async with sess.post(url_de, json=data) as resp:
-                self.eq(400, resp.status)
+                self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                 item = await resp.json()
                 self.eq('err', item.get('status'))
                 self.eq('SchemaViolation', item.get('code'))
@@ -783,7 +783,7 @@ def genr():
 
                 headers = {'range': 'bytes=2-4'}
                 async with sess.get(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('3', resp.headers.get('content-length'))
                     self.eq('bytes 2-4/12', resp.headers.get('content-range'))
                     buf = b''
@@ -793,7 +793,7 @@ def genr():
 
                 headers = {'range': 'bytes=,2-'}
                 async with sess.get(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('10', resp.headers.get('content-length'))
                     self.eq('bytes 2-11/12', resp.headers.get('content-range'))
                     buf = b''
@@ -803,7 +803,7 @@ def genr():
 
                 headers = {'range': 'bytes=0-11'}
                 async with sess.get(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('12', resp.headers.get('content-length'))
                     self.eq('bytes 0-11/12', resp.headers.get('content-range'))
                     buf = b''
@@ -813,7 +813,7 @@ def genr():
 
                 headers = {'range': 'bytes=10-11'}
                 async with sess.get(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('2', resp.headers.get('content-length'))
                     self.eq('bytes 10-11/12', resp.headers.get('content-range'))
                     buf = b''
@@ -823,7 +823,7 @@ def genr():
 
                 headers = {'range': 'bytes=11-11'}
                 async with sess.get(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('1', resp.headers.get('content-length'))
                     self.eq('bytes 11-11/12', resp.headers.get('content-range'))
                     buf = b''
@@ -833,7 +833,7 @@ def genr():
 
                 headers = {'range': 'bytes=2-4,8-11'}
                 async with sess.get(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('3', resp.headers.get('content-length'))
                     self.eq('bytes 2-4/12', resp.headers.get('content-range'))
                     buf = b''
@@ -844,39 +844,40 @@ def genr():
                 # HEAD tests
                 headers = {'range': 'bytes=2-4'}
                 async with sess.head(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('3', resp.headers.get('content-length'))
                     self.eq('bytes 2-4/12', resp.headers.get('content-range'))
 
                 headers = {'range': 'bytes=10-11'}
                 async with sess.head(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('2', resp.headers.get('content-length'))
                     self.eq('bytes 10-11/12', resp.headers.get('content-range'))
 
                 headers = {'range': 'bytes=11-11'}
                 async with sess.head(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('1', resp.headers.get('content-length'))
                     self.eq('bytes 11-11/12', resp.headers.get('content-range'))
 
+                # TODO - In python 3.13+ this can be HTTPStatus.RANGE_NOT_SATISFIABLE
                 # Reading past blobsize isn't valid HTTP
                 headers = {'range': 'bytes=10-20'}
                 async with sess.head(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(416, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)
 
                 headers = {'range': 'bytes=11-12'}
                 async with sess.head(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(416, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)
 
                 headers = {'range': 'bytes=20-40'}
                 async with sess.head(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(416, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)
 
                 # Negative size
                 headers = {'range': 'bytes=20-4'}
                 async with sess.head(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(416, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)
 
     async def test_axon_perms(self):
         async with self.getTestAxon() as axon: