Close s3 connections

Author: carlosribas

rnacentral/apiv1/views.py

@@ -520,7 +520,8 @@ def get(self, request, pk=None, format=None):
         s3_file = "prod/" + upi_path + self.kwargs["pk"] + ".svg.gz"
         s3_obj = s3.Object(settings.S3_SERVER["BUCKET"], s3_file)
         try:
-            s3_svg = zlib.decompress(s3_obj.get()["Body"].read(), zlib.MAX_WBITS | 32)
+            with s3_obj.get()["Body"] as s3_body:
+                s3_svg = zlib.decompress(s3_body.read(), zlib.MAX_WBITS | 32)
         except s3.meta.client.exceptions.NoSuchKey:
             return Response(status=status.HTTP_404_NOT_FOUND)
 

rnacentral/portal/models/rna.py

@@ -13,7 +13,6 @@
 
 import itertools as it
 import operator as op
-import re
 import zlib
 from collections import Counter, defaultdict
 
@@ -606,8 +605,9 @@ def get_layout_secondary(self):
         s3_file = "prod/" + upi_path + self.pk + ".svg.gz"
         s3_obj = s3.Object(settings.S3_SERVER["BUCKET"], s3_file)
         try:
-            svg = zlib.decompress(s3_obj.get()["Body"].read(), zlib.MAX_WBITS | 32)
-            svg = svg.replace(b"rgb(255, 0, 0)", b"rgb(255,0,255)")
+            with s3_obj.get()["Body"] as s3_body:
+                svg = zlib.decompress(s3_body.read(), zlib.MAX_WBITS | 32)
+                svg = svg.replace(b"rgb(255, 0, 0)", b"rgb(255,0,255)")
         except s3.meta.client.exceptions.NoSuchKey:
             svg = None