fix up bugs

Author: AstraLuma

gqlmod_github/__init__.py

@@ -25,7 +25,7 @@ def find_directive(ast_node, name):
 
 
 def _build_accept(previews):
-    if isinstance(previews, (list, tuple)):
+    if isinstance(previews, (list, tuple, set)):
         if previews:
             return ', '.join(
                 f"application/vnd.github.{p}+json"
@@ -36,7 +36,7 @@ def _build_accept(previews):
     elif isinstance(previews, str):
         return f"application/vnd.github.{previews}+json"
     else:
-        raise TypeError("Can't handle preview {previews!r}")
+        raise TypeError(f"Can't handle preview {previews!r}")
 
 
 class GitHubBaseProvider:
@@ -84,7 +84,9 @@ def codegen_extra_kwargs(self, gast, schema):
 else:
     class GitHubSyncProvider(GitHubBaseProvider, UrllibJsonProvider):
         def build_request(self, query, variables):
-            req = super().build_request(query, variables)
+            qvars = variables.copy()
+            qvars.pop('__previews')
+            req = super().build_request(query, qvars)
             req.add_header('Accept', self._build_accept_header(variables))
             req.add_header('Authorization', self._build_authorization_header(variables))
             return req
@@ -104,3 +106,4 @@ def modify_request_args(self, variables, kwargs):
                 'Accept': self._build_accept_header(variables),
                 'Authorization': self._build_authorization_header(variables)
             })
+            kwargs['json'].pop('__previews')

gqlmod_github/app_async.py

@@ -15,6 +15,7 @@
 from ._app_base import GithubBaseApp
 
 
+@contextlib.asynccontextmanager
 async def call_rest(method, url, *, body=None, preview=None, bearer=None):
     """
     Performs an API request, in the form of GitHub v3 API.
@@ -40,7 +41,8 @@ async def call_rest(method, url, *, body=None, preview=None, bearer=None):
     if bearer:
         headers['Authorization'] = f"Bearer {bearer}"
 
-    return await aiohttp.request(method, url, headers=headers, data=data, raise_for_status=True)
+    async with aiohttp.request(method, url, headers=headers, data=data, raise_for_status=True) as resp:
+        yield resp
 
 
 async def iter_pages(url, *, preview=None, bearer=None):
@@ -53,19 +55,19 @@ async def iter_pages(url, *, preview=None, bearer=None):
     """
     nextpage = url
     while nextpage:
-        resp = await call_rest('GET', url, preview=preview, bearer=bearer)
-        yield resp
+        async with call_rest('GET', url, preview=preview, bearer=bearer) as resp:
+            yield resp
 
-        if 'next' not in resp.links:
-            break
+            if 'next' not in resp.links:
+                break
 
-        nexts = list(resp.links['next'].keys())
-        assert 0 <= len(nexts) <= 1
+            nexts = list(resp.links['next'].keys())
+            assert 0 <= len(nexts) <= 1
 
-        if nexts:
-            nextpage = nexts[0]
-        else:
-            break
+            if nexts:
+                nextpage = nexts[0]
+            else:
+                break
 
 
 class GithubApp(GithubBaseApp):
@@ -80,21 +82,21 @@ async def get_app(self, slug):
 
         https://developer.github.com/v3/apps/#get-a-single-github-app
         """
-        resp = await call_rest(
+        async with call_rest(
             'GET', f'/apps/{slug}', bearer=self.token, preview='machine-man-preview'
-        )
-        return await resp.json(content_type=False)
+        ) as resp:
+            return await resp.json(content_type=False)
 
     async def get_this_app(self):
         """
         Get the app information for the current app
 
         https://developer.github.com/v3/apps/#get-the-authenticated-github-app
         """
-        resp = await call_rest(
+        async with call_rest(
             'GET', '/app', bearer=self.token, preview='machine-man-preview',
-        )
-        return await resp.json(content_type=False)
+        ) as resp:
+            return await resp.json(content_type=False)
 
     async def iter_installations(self):
         """
@@ -116,23 +118,23 @@ async def get_installation(self, installation_id):
 
         https://developer.github.com/v3/apps/#get-an-installation
         """
-        resp = await call_rest(
+        async with await call_rest(
             'GET', f'/app/installations/{installation_id}',
             bearer=self.token, preview='machine-man-preview',
-        )
-        return await resp.json(content_type=False)
+        ) as resp:
+            return await resp.json(content_type=False)
 
     async def delete_installation(self, installation_id):
         """
         Delete an installation, by ID.
 
         https://developer.github.com/v3/apps/#delete-an-installation
         """
-        resp = await call_rest(
+        async with await call_rest(
             'DELETE', f'/app/installations/{installation_id}',
             bearer=self.token, preview=['machine-man-preview', 'gambit-preview'],
-        )
-        assert resp.status == 204
+        ) as resp:
+            assert resp.status == 204
 
     async def make_installation_token(self, installation_id, *, repository_ids=None, permissions=None):
         """
@@ -148,51 +150,51 @@ async def make_installation_token(self, installation_id, *, repository_ids=None,
             params['repository_ids'] = repository_ids
         if permissions:
             params['permissions'] = permissions
-        resp = await call_rest(
+        async with call_rest(
             'POST', f'/app/installations/{installation_id}/access_tokens',
             body=params, bearer=self.token, preview='machine-man-preview',
-        )
-        assert resp.status == 201
-        return await resp.json(content_type=False)
+        ) as resp:
+            assert resp.status == 201
+            return await resp.json(content_type=False)
 
     async def get_org_installation(self, org):
         """
         Get an installation, by organization.
 
         https://developer.github.com/v3/apps/#get-an-organization-installation
         """
-        resp = await call_rest(
+        async with call_rest(
             'GET', f'/orgs/{org}/installation',
             bearer=self.token, preview='machine-man-preview',
-        )
-        assert resp.status == 200
-        return await resp.json(content_type=False)
+        ) as resp:
+            assert resp.status == 200
+            return await resp.json(content_type=False)
 
     async def get_repo_installation(self, owner, repo):
         """
         Get an installation, by owner and repository.
 
         https://developer.github.com/v3/apps/#get-a-repository-installation
         """
-        resp = await call_rest(
+        async with call_rest(
             'GET', f'/repos/{owner}/{repo}/installation',
             bearer=self.token, preview='machine-man-preview',
-        )
-        assert resp.status == 200
-        return await resp.json(content_type=False)
+        ) as resp:
+            assert resp.status == 200
+            return await resp.json(content_type=False)
 
     async def get_user_installation(self, username):
         """
         Get an installation, by user
 
         https://developer.github.com/v3/apps/#get-a-user-installation
         """
-        resp = await call_rest(
+        async with call_rest(
             'GET', f'/users/{username}/installation',
             bearer=self.token, preview='machine-man-preview',
-        )
-        assert resp.status == 200
-        return await resp.json(content_type=False)
+        ) as resp:
+            assert resp.status == 200
+            return await resp.json(content_type=False)
 
     @staticmethod
     async def create_app_from_manifest(code):
@@ -201,12 +203,12 @@ async def create_app_from_manifest(code):
 
         https://developer.github.com/v3/apps/#create-a-github-app-from-a-manifest
         """
-        resp = await call_rest(
+        async with call_rest(
             'POST', f'/app-manifests/{code}/conversions',
             preview='fury-preview',
-        )
-        assert resp.status == 200
-        return await resp.json(content_type=False)
+        ) as resp:
+            assert resp.status == 200
+            return await resp.json(content_type=False)
 
     async def token_for_repo(self, owner_or_repo, repo=None, *, repo_id=None, permissions=None):
         """