use attrs directly

tahoe-lafs · Feb 20, 2023 · 5b14561 · 5b14561
1 parent 464498f
commit 5b14561
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/allmydata/cli/grid_manager.py b/src/allmydata/cli/grid_manager.py
@@ -9,6 +9,7 @@
 )
 
 import click
+import attr
 
 from twisted.python.filepath import (
     FilePath,
@@ -196,7 +197,7 @@ def sign(ctx, name, expiry_days):
             "No storage-server called '{}' exists".format(name)
         )
 
-    certificate_data = json.dumps(certificate.asdict(), indent=4)
+    certificate_data = json.dumps(attr.asdict(certificate), indent=4)
     click.echo(certificate_data)
     if fp is not None:
         next_serial = 0

diff --git a/src/allmydata/grid_manager.py b/src/allmydata/grid_manager.py
@@ -19,7 +19,10 @@
     dictutil,
 )
 
-from attrs import define, asdict, Factory
+from attrs import (
+    define,
+    Factory,
+)
 
 
 @define
@@ -41,9 +44,6 @@ def load(cls, file_like):
             signature=data["signature"].encode("ascii")
         )
 
-    def asdict(self):
-        return asdict(self)
-
 
 @define
 class _GridManagerStorageServer(object):