cleanup

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/ambv/black
-    rev: stable
+    rev: 19.10b0
     hooks:
     - id: black
       language_version: python3.7

Makefile

@@ -6,15 +6,13 @@ pre-checks-deps: lint-deps
 
 pre-checks: pre-checks-deps
 	flake8 guillotina_gcloudstorage --config=setup.cfg
-	isort -c -rc guillotina_gcloudstorage
 	black --check --verbose guillotina_gcloudstorage
 	mypy -p guillotina_gcloudstorage --ignore-missing-imports
 
 lint-deps:
-	pip install "isort>=4,<5" black
+	pip install "isort>=4,<5" black==19.10b0
 
 lint:
-	isort -rc guillotina_gcloudstorage
 	black guillotina_gcloudstorage
 
 

guillotina_gcloudstorage/interfaces.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
-from zope.interface import Interface
-
 from guillotina.interfaces import IFile
 from guillotina.interfaces import IFileField
+from zope.interface import Interface
 
 
 class IGCloudFileField(IFileField):

guillotina_gcloudstorage/storage.py

@@ -1,19 +1,5 @@
 # -*- coding: utf-8 -*-
-import asyncio
-import json
-import logging
 from datetime import datetime
-from typing import AsyncIterator
-from urllib.parse import quote_plus
-import os
-
-from zope.interface import implementer
-
-import aiohttp
-import backoff
-import google.api_core.exceptions
-import google.cloud.exceptions
-import google.cloud.storage
 from guillotina import configure
 from guillotina import task_vars
 from guillotina.component import get_multi_adapter
@@ -34,12 +20,24 @@
 from guillotina.utils import apply_coroutine
 from guillotina.utils import get_authenticated_user_id
 from guillotina.utils import get_current_request
-from guillotina.utils import run_async
 from guillotina.utils import to_str
 from guillotina_gcloudstorage.interfaces import IGCloudBlobStore
 from guillotina_gcloudstorage.interfaces import IGCloudFile
 from guillotina_gcloudstorage.interfaces import IGCloudFileField
 from oauth2client.service_account import ServiceAccountCredentials
+from typing import AsyncIterator
+from urllib.parse import quote_plus
+from zope.interface import implementer
+
+import aiohttp
+import asyncio
+import backoff
+import google.api_core.exceptions
+import google.cloud.exceptions
+import google.cloud.storage
+import json
+import logging
+import os
 
 
 class IGCloudFileStorageManager(IExternalFileStorageManager):
@@ -567,11 +565,10 @@ async def iterate_bucket_page(self, page_token=None, prefix=None):
         if page_token:
             params["pageToken"] = page_token
 
+        headers = {}
         access_token = await self.get_access_token()
         if access_token:
             headers = {"AUTHORIZATION": f"Bearer {access_token}"}
-        else:
-            headers = {}
 
         async with self.session.get(url, headers=headers, params=params,) as resp:
             assert resp.status == 200

guillotina_gcloudstorage/tests/fixtures.py

@@ -1,7 +1,7 @@
-import os
-
 from guillotina import testing
 
+import os
+
 
 def base_settings_configurator(settings):
     if "applications" in settings:

guillotina_gcloudstorage/tests/test_storage.py

@@ -1,31 +1,30 @@
-import base64
 from functools import partial
-from hashlib import md5
-from urllib.parse import quote_plus
-
-from zope.interface import Interface
-
-import aiohttp
-import google.cloud.storage
-import pytest
 from guillotina import task_vars
 from guillotina.component import get_multi_adapter
 from guillotina.component import get_utility
 from guillotina.content import Container
 from guillotina.exceptions import UnRetryableRequestError
-from guillotina.files import MAX_REQUEST_CACHE_SIZE
 from guillotina.files import FileManager
+from guillotina.files import MAX_REQUEST_CACHE_SIZE
 from guillotina.files.adapter import DBDataManager
 from guillotina.interfaces import IFileNameGenerator
 from guillotina.tests.utils import create_content
 from guillotina.tests.utils import login
 from guillotina.utils import apply_coroutine
 from guillotina_gcloudstorage.interfaces import IGCloudBlobStore
 from guillotina_gcloudstorage.storage import CHUNK_SIZE
-from guillotina_gcloudstorage.storage import OBJECT_BASE_URL
-from guillotina_gcloudstorage.storage import UPLOAD_URL
 from guillotina_gcloudstorage.storage import GCloudFileField
 from guillotina_gcloudstorage.storage import GCloudFileManager
+from guillotina_gcloudstorage.storage import OBJECT_BASE_URL
+from guillotina_gcloudstorage.storage import UPLOAD_URL
+from hashlib import md5
+from urllib.parse import quote_plus
+from zope.interface import Interface
+
+import aiohttp
+import base64
+import google.cloud.storage
+import pytest
 
 
 _test_gif = base64.b64decode(