Replace structlog with logging

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/ambv/black
-    rev: 18.9b0
+    rev: 20.8b1
     hooks:
     - id: black
       args: [--line-length=88, --safe]

pyproject.toml

@@ -26,7 +26,6 @@ classifiers = [
 [tool.poetry.dependencies]
 python = "^3.7"
 attrs = ">=17.4.0"
-structlog = "^20.1.0"
 aiohttp = ">=2"
 
 [tool.poetry.dev-dependencies]

src/arsenic/connection.py

@@ -4,17 +4,17 @@
 from functools import wraps
 from io import BytesIO
 from json import JSONDecodeError
+from logging import getLogger
 from pathlib import Path
 from typing import Any, Tuple
 from urllib.parse import urlparse, urlunparse
 from zipfile import ZIP_DEFLATED, ZipFile
 
 from aiohttp import ClientSession
-from structlog import get_logger
 
 from arsenic import errors, constants
 
-log = get_logger()
+log = getLogger(__name__)
 
 
 def wrap_screen(data):
@@ -98,7 +98,8 @@ async def request(
         body = json.dumps(data) if data is not None else None
         full_url = self.prefix + url
         log.info(
-            "request", url=strip_auth(full_url), method=method, header=header, body=body
+            "request %s",
+            dict(url=strip_auth(full_url), method=method, header=header, body=body),
         )
         async with self.session.request(
             url=full_url, method=method, headers=header, data=body, timeout=timeout
@@ -107,22 +108,24 @@ async def request(
             try:
                 data = json.loads(response_body)
             except JSONDecodeError as exc:
-                log.error("json-decode", body=response_body)
+                log.error("json-decode %s", dict(body=response_body))
                 data = {"error": "!internal", "message": str(exc), "stacktrace": ""}
             wrap_screen(data)
             log.info(
-                "response",
-                url=strip_auth(full_url),
-                method=method,
-                body=body,
-                response=response,
-                data=data,
+                "response %s",
+                dict(
+                    url=strip_auth(full_url),
+                    method=method,
+                    body=body,
+                    response=response,
+                    data=data,
+                ),
             )
             check_response_error(data=data, status=response.status)
             return response.status, data
 
     async def upload_file(self, path: Path) -> Path:
-        log.info("upload-file", path=path, resolved_path=path)
+        log.info("upload-file %s", dict(path=path, resolved_path=path))
         return path
 
     def prefixed(self, prefix: str) -> "Connection":
@@ -139,5 +142,5 @@ async def upload_file(self, path: Path) -> Path:
             url="/file", method="POST", data={"file": content}
         )
         value = unwrap(data.get("value", None))
-        log.info("upload-file", path=path, resolved_path=value)
+        log.info("upload-file %s", dict(path=path, resolved_path=value))
         return Path(value)

src/arsenic/errors.py

@@ -1,8 +1,7 @@
+from logging import getLogger
 from typing import Union, Dict, Type, Any
 
-from structlog import get_logger
-
-log = get_logger()
+log = getLogger(__name__)
 
 
 class ArsenicError(Exception):
@@ -95,11 +94,13 @@ def raise_exception(data: Dict[str, Any], status: int):
     screen = data.get("screen", None)
     exception_class = get(error)
     log.error(
-        "error",
-        type=exception_class,
-        message=message,
-        stacktrace=stacktrace,
-        data=data,
-        status=status,
+        "error %s",
+        dict(
+            type=exception_class,
+            message=message,
+            stacktrace=stacktrace,
+            data=data,
+            status=status,
+        ),
     )
     raise exception_class(message, screen, stacktrace)

src/arsenic/subprocess.py

@@ -3,13 +3,11 @@
 import os
 import subprocess
 import sys
+from logging import getLogger
 from typing import List, TypeVar
 from asyncio.subprocess import DEVNULL, PIPE
 
-from structlog import get_logger
-
-log = get_logger()
-
+log = getLogger(__name__)
 
 P = TypeVar("P")
 
@@ -66,7 +64,7 @@ async def stop_process(self, process):
         try:
             await asyncio.wait_for(process.communicate(), 1)
         except asyncio.futures.TimeoutError:
-            log.warn("could not terminate process", process=process, impl=self)
+            log.warn("could not terminate process %s", dict(process=process, impl=self))
 
 
 class ThreadedSubprocessImpl(BaseSubprocessImpl):
@@ -106,7 +104,7 @@ def _stop_process(self, process: subprocess.Popen):
         try:
             process.communicate(timeout=1)
         except subprocess.TimeoutExpired:
-            log.warn("could not terminate process", process=process, impl=self)
+            log.warn("could not terminate process %s", dict(process=process, impl=self))
 
 
 def get_subprocess_impl() -> BaseSubprocessImpl: