Use new attrs syntax

diff --git a/src/pgwui_bulk_upload/views/bulk_upload.py b/src/pgwui_bulk_upload/views/bulk_upload.py
index a5e0264b816e923a7c051d9536ad045ef2b1e62d..633fc186dacead4c4ef925bf38b8113e08a99896 100644 (file)
--- a/src/pgwui_bulk_upload/views/bulk_upload.py
+++ b/src/pgwui_bulk_upload/views/bulk_upload.py
@@ -19,7 +19,7 @@
 #
 
 from pyramid.view import view_config
-import attr
+import attrs
 import logging
 import os
 import os.path
@@ -170,16 +170,16 @@ class UploadBulkData(UploadData):
         yield from super()._thunk()
 
 
-@attr.s
+@attrs.define(slots=False)
 class UploadDir():
     '''Uploaded archive directory
 
     It is iterable, consisting of SaveBulkLine instances
     '''
-    uf = attr.ib()
-    dentry = attr.ib()
-    map_file = attr.ib()
-    filedata = attr.ib(factory=list)
+    uf = attrs.field()
+    dentry = attrs.field()
+    map_file = attrs.field()
+    filedata = attrs.field(factory=list)
 
     def get_file_map(self, yaml_file):
         try:
@@ -403,14 +403,14 @@ class UploadDir():
             yield (fileinfo.filepath, fileinfo.lineno, fileinfo.relation)
 
 
-@attr.s
+@attrs.define(slots=False)
 class UploadArchive():
     '''Uploaded archive
 
     It is iterable, consisting of UploadDir instances
     '''
-    lineno = attr.ib(default=0)
-    updirs = attr.ib(factory=list)
+    lineno = attrs.field(default=0)
+    updirs = attrs.field(factory=list)
 
     def open(self, uf, zip_root, map_file):
         '''