Merge pull request #343 from mathstuf/no-atomicwrites

Author: lucc

.github/workflows/ci.yml

@@ -18,6 +18,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
+        sudo apt-get update
         sudo apt-get install -y locales-all
         python -m pip install --upgrade pip
         python -m pip install flake8
@@ -37,11 +38,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install .[typing]
-    - name: Ignore a strange type error that only happens in CI
-      # This error only happens in CI and I can not reproduce it in the nix
-      # check or locally:
-      # khard/khard.py:658: error: Argument "policy" to "message_from_string" has incompatible type "EmailPolicy[EmailMessage]"; expected "Policy[Message[str, str]]"  [arg-type]
-      run: "sed -i '/message = message_from_string/s/$/#type: ignore[arg-type]/' khard/khard.py"
     - name: Run the type checker
       run: mypy
 

flake.nix

@@ -16,19 +16,7 @@
       doc ? true,
       typing ? false,
     }: let
-      packageOverrides = final: prev: {
-        types-atomicwrites = python3.pkgs.buildPythonPackage rec {
-          pname = "types-atomicwrites";
-          version = "1.4.5.1";
-          src = pkgs.fetchPypi {
-            inherit pname version;
-            hash = "sha256-np8JI+v5NSSyi87OWiOsjDgg85sGDfKfZxk20uS8BLw=";
-          };
-        };
-      };
-      attrs = project.renderers.buildPythonPackage {
-        python = python3.override {inherit packageOverrides;};
-      };
+      attrs = project.renderers.buildPythonPackage {python = python3;};
       overrides = {
         version = "0.dev+${self.shortRev or self.dirtyShortRev}";
         build-system =

khard/contacts.py

@@ -11,18 +11,19 @@
 - device: https://tools.ietf.org/html/rfc6869
 """
 
+import contextlib
 import copy
 import datetime
 import io
 import locale
 import logging
 import os
 import re
+import tempfile
 import time
-from typing import Any, Callable, Literal, Optional, TypeVar, Union, \
-    Sequence, overload
+from typing import Any, Callable, IO, Iterator, Literal, Optional, TypeVar, \
+    Union, Sequence, overload
 
-from atomicwrites import atomic_write
 from ruamel import yaml
 from ruamel.yaml import YAML
 import vobject
@@ -1342,6 +1343,35 @@ def to_yaml(self) -> str:
         return stream.getvalue() + "\n"
 
 
+@contextlib.contextmanager
+def atomic_write(dest: str, overwrite: bool = False) -> Iterator[IO[str]]:
+    """Atomically write to the destination file.
+
+    Optionally overwrite the path (using rename) rather than using `os.link`.
+    """
+    fd, src = tempfile.mkstemp(prefix=os.path.basename(dest), dir=os.path.dirname(dest))
+    file = os.fdopen(fd, mode='w')
+    try:
+        yield file
+    except Exception:
+        try:
+            file.close()
+            os.unlink(src)
+        except Exception:
+            pass
+        raise
+    else:
+        file.flush()
+        file.close()
+        if overwrite:
+            os.rename(src, dest)
+        else:
+            try:
+                os.link(src, dest)
+            finally:
+                os.unlink(src)
+
+
 class Contact(YAMLEditable):
 
     def __init__(self, vcard: vobject.base.Component,

pyproject.toml

@@ -23,7 +23,6 @@ keywords = ["vcard", "console", "addressbook"]
 license = {text = "GPL"}
 
 dependencies = [
-    "atomicwrites == 1.4.1",
     "configobj == 5.*, >= 5.0.6",
     "ruamel.yaml >= 0.17.0",
     "vobject ~= 0.9.7",
@@ -38,7 +37,6 @@ doc = [
 ]
 typing = [
     "mypy",
-    "types-atomicwrites",
     # vobject does fancy dynamic stuff that is hard to type-check
     #"types-vobject",
 ]