From 808364d3fab86c0ed7ff4ccd2142d77cc97c1c32 Mon Sep 17 00:00:00 2001
From: Pierre <prrvchr@gmail.com>
Date: Sun, 4 Feb 2024 10:48:39 +0100
Subject: [PATCH] git subrepo pull (merge) uno

subrepo:
  subdir:   "uno"
  merged:   "c1e5980"
upstream:
  origin:   "https://github.com/prrvchr/uno.git"
  branch:   "main"
  commit:   "c1e5980"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
---
 uno/.gitrepo                                  |    4 +-
 uno/dialog/grid/GridWindow.xdl                |    2 +-
 uno/dialog/logger/LogDialog.xdl               |    2 +-
 uno/dialog/logger/LogWindow.xdl               |    2 +-
 uno/lib/java/beans/PropertySet.java           |    2 +-
 uno/lib/java/beans/PropertySetAdapter.java    |    2 +-
 uno/lib/java/helper/Array.java                |    2 +-
 uno/lib/java/helper/EventLogger.java          |   18 +-
 uno/lib/java/helper/OfficeResourceBundle.java |    2 +-
 uno/lib/java/helper/RegistrationHelper.java   |    2 +-
 .../java/helper/ResourceBasedEventLogger.java |   97 +-
 uno/lib/java/helper/SharedResources.java      |    2 +-
 uno/lib/java/lang/ServiceInfo.java            |    2 +-
 .../python/dateutil-2.8.2.dist-info/LICENSE   |   54 +
 .../python/dateutil-2.8.2.dist-info/METADATA  |  204 ++
 .../python/dateutil-2.8.2.dist-info/RECORD    |   25 +
 uno/lib/python/dateutil-2.8.2.dist-info/WHEEL |    6 +
 .../dateutil-2.8.2.dist-info/top_level.txt    |    1 +
 .../python/dateutil-2.8.2.dist-info/zip-safe  |    1 +
 uno/lib/python/poub/attr/__init__.py          |  132 -
 uno/lib/python/poub/attr/__init__.pyi         |  571 ----
 uno/lib/python/poub/attr/_cmp.py              |  155 -
 uno/lib/python/poub/attr/_cmp.pyi             |   13 -
 uno/lib/python/poub/attr/_compat.py           |  185 -
 uno/lib/python/poub/attr/_config.py           |   31 -
 uno/lib/python/poub/attr/_funcs.py            |  477 ---
 uno/lib/python/poub/attr/_make.py             | 2987 -----------------
 uno/lib/python/poub/attr/_next_gen.py         |  232 --
 uno/lib/python/poub/attr/_typing_compat.pyi   |   15 -
 uno/lib/python/poub/attr/_version_info.py     |   86 -
 uno/lib/python/poub/attr/_version_info.pyi    |    9 -
 uno/lib/python/poub/attr/converters.py        |  144 -
 uno/lib/python/poub/attr/converters.pyi       |   13 -
 uno/lib/python/poub/attr/exceptions.py        |   91 -
 uno/lib/python/poub/attr/exceptions.pyi       |   17 -
 uno/lib/python/poub/attr/filters.py           |   66 -
 uno/lib/python/poub/attr/filters.pyi          |    6 -
 uno/lib/python/poub/attr/py.typed             |    0
 uno/lib/python/poub/attr/setters.py           |   73 -
 uno/lib/python/poub/attr/setters.pyi          |   19 -
 uno/lib/python/poub/attr/validators.py        |  720 ----
 uno/lib/python/poub/attr/validators.pyi       |   88 -
 uno/lib/python/poub/attrs/__init__.py         |   65 -
 uno/lib/python/poub/attrs/__init__.pyi        |   67 -
 uno/lib/python/poub/attrs/converters.py       |    3 -
 uno/lib/python/poub/attrs/exceptions.py       |    3 -
 uno/lib/python/poub/attrs/filters.py          |    3 -
 uno/lib/python/poub/attrs/py.typed            |    0
 uno/lib/python/poub/attrs/setters.py          |    3 -
 uno/lib/python/poub/attrs/validators.py       |    3 -
 uno/lib/uno/card/__init__.py                  |   37 +-
 uno/lib/uno/card/card/book.py                 |    3 +-
 uno/lib/uno/card/card/database.py             |   45 +-
 uno/lib/uno/card/card/provider.py             |   53 +-
 uno/lib/uno/card/card/user.py                 |   29 +-
 uno/lib/uno/card/cardtool.py                  |   17 +-
 uno/lib/uno/card/datasource.py                |   16 +-
 uno/lib/uno/card/dbqueries.py                 |   42 +-
 uno/lib/uno/card/drvtool.py                   |   84 +
 uno/lib/uno/card/listener.py                  |    4 +-
 uno/lib/uno/card/replicator.py                |  188 +-
 .../uno/card/resource/Driver_en_US.properties |   85 +-
 .../uno/card/resource/Driver_fr_FR.properties |   89 +-
 .../card/resource/Replicator_en_US.properties |   33 +-
 .../card/resource/Replicator_fr_FR.properties |   40 +-
 uno/lib/uno/grid/gridhandler.py               |    2 +-
 uno/lib/uno/grid/gridmanagerbase.py           |    2 +-
 uno/lib/uno/grid/gridmodelbase.py             |    2 +-
 uno/lib/uno/grid/gridview.py                  |    2 +-
 uno/lib/uno/jdbcdriver/configuration.py       |    4 +-
 uno/lib/uno/logger/__init__.py                |    2 +-
 uno/lib/uno/logger/dialog/__init__.py         |    2 +-
 uno/lib/uno/logger/dialog/loghandler.py       |    2 +-
 uno/lib/uno/logger/dialog/logmanager.py       |    2 +-
 uno/lib/uno/logger/dialog/logmodel.py         |    2 +-
 uno/lib/uno/logger/dialog/logview.py          |    2 +-
 uno/lib/uno/logger/logger.py                  |    2 +-
 uno/lib/uno/logger/loggerpool.py              |    2 +-
 uno/lib/uno/logger/loghandler.py              |    2 +-
 uno/lib/uno/logger/loghelper.py               |    2 +-
 uno/lib/uno/oauth2/configuration.py           |    2 +-
 .../uno/options/addressbook/optionsmanager.py |   45 +-
 .../uno/options/addressbook/optionsmodel.py   |   30 +-
 uno/lib/uno/options/ucb/optionsmanager.py     |   39 +-
 uno/lib/uno/options/ucb/optionsmodel.py       |   83 +-
 uno/lib/uno/ucb/database.py                   |    1 +
 uno/lib/uno/ucb/replicator.py                 |   96 +-
 uno/lib/uno/ucb/ucp/provider.py               |   47 +-
 uno/lib/uno/unolib/__init__.py                |    2 +-
 uno/lib/uno/unolib/unocore.py                 |    2 +-
 uno/lib/uno/unolib/unolib.py                  |    2 +-
 uno/lib/uno/unotool/__init__.py               |    2 +-
 uno/lib/uno/unotool/unotool.py                |    2 +-
 .../idl/com/sun/star/logging/LoggerPool2.idl  |    2 +-
 uno/rdb/idl/com/sun/star/logging/XLogger2.idl |    2 +-
 .../idl/com/sun/star/logging/XLoggerPool2.idl |    2 +-
 .../ucb/ContentProvider_en_US.properties      |   13 +
 .../ucb/ContentProvider_fr_FR.properties      |   13 +
 uno/resource/ucb/Replicator_en_US.properties  |   65 +-
 uno/resource/ucb/Replicator_fr_FR.properties  |   65 +-
 100 files changed, 1154 insertions(+), 6865 deletions(-)
 create mode 100644 uno/lib/python/dateutil-2.8.2.dist-info/LICENSE
 create mode 100644 uno/lib/python/dateutil-2.8.2.dist-info/METADATA
 create mode 100644 uno/lib/python/dateutil-2.8.2.dist-info/RECORD
 create mode 100644 uno/lib/python/dateutil-2.8.2.dist-info/WHEEL
 create mode 100644 uno/lib/python/dateutil-2.8.2.dist-info/top_level.txt
 create mode 100644 uno/lib/python/dateutil-2.8.2.dist-info/zip-safe
 delete mode 100644 uno/lib/python/poub/attr/__init__.py
 delete mode 100644 uno/lib/python/poub/attr/__init__.pyi
 delete mode 100644 uno/lib/python/poub/attr/_cmp.py
 delete mode 100644 uno/lib/python/poub/attr/_cmp.pyi
 delete mode 100644 uno/lib/python/poub/attr/_compat.py
 delete mode 100644 uno/lib/python/poub/attr/_config.py
 delete mode 100644 uno/lib/python/poub/attr/_funcs.py
 delete mode 100644 uno/lib/python/poub/attr/_make.py
 delete mode 100644 uno/lib/python/poub/attr/_next_gen.py
 delete mode 100644 uno/lib/python/poub/attr/_typing_compat.pyi
 delete mode 100644 uno/lib/python/poub/attr/_version_info.py
 delete mode 100644 uno/lib/python/poub/attr/_version_info.pyi
 delete mode 100644 uno/lib/python/poub/attr/converters.py
 delete mode 100644 uno/lib/python/poub/attr/converters.pyi
 delete mode 100644 uno/lib/python/poub/attr/exceptions.py
 delete mode 100644 uno/lib/python/poub/attr/exceptions.pyi
 delete mode 100644 uno/lib/python/poub/attr/filters.py
 delete mode 100644 uno/lib/python/poub/attr/filters.pyi
 delete mode 100644 uno/lib/python/poub/attr/py.typed
 delete mode 100644 uno/lib/python/poub/attr/setters.py
 delete mode 100644 uno/lib/python/poub/attr/setters.pyi
 delete mode 100644 uno/lib/python/poub/attr/validators.py
 delete mode 100644 uno/lib/python/poub/attr/validators.pyi
 delete mode 100644 uno/lib/python/poub/attrs/__init__.py
 delete mode 100644 uno/lib/python/poub/attrs/__init__.pyi
 delete mode 100644 uno/lib/python/poub/attrs/converters.py
 delete mode 100644 uno/lib/python/poub/attrs/exceptions.py
 delete mode 100644 uno/lib/python/poub/attrs/filters.py
 delete mode 100644 uno/lib/python/poub/attrs/py.typed
 delete mode 100644 uno/lib/python/poub/attrs/setters.py
 delete mode 100644 uno/lib/python/poub/attrs/validators.py
 create mode 100644 uno/lib/uno/card/drvtool.py

diff --git a/uno/.gitrepo b/uno/.gitrepo
index 37d2de0b..bafca39e 100644
--- a/uno/.gitrepo
+++ b/uno/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/prrvchr/uno.git
 	branch = main
-	commit = 69a936c0d82e601a180a35d543b6a900847dc445
-	parent = 86172ea4e15357057b14d2162834b735ede02328
+	commit = c1e5980fe4f73a0a4805d32326812d0736dbb471
+	parent = 28f6b6d3b05929805c0be924321fbc5922afe084
 	method = merge
 	cmdver = 0.4.3
diff --git a/uno/dialog/grid/GridWindow.xdl b/uno/dialog/grid/GridWindow.xdl
index adef8da1..8578567b 100644
--- a/uno/dialog/grid/GridWindow.xdl
+++ b/uno/dialog/grid/GridWindow.xdl
@@ -2,7 +2,7 @@
 <!--
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/dialog/logger/LogDialog.xdl b/uno/dialog/logger/LogDialog.xdl
index 4146d107..ec80b79b 100644
--- a/uno/dialog/logger/LogDialog.xdl
+++ b/uno/dialog/logger/LogDialog.xdl
@@ -2,7 +2,7 @@
 <!--
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/dialog/logger/LogWindow.xdl b/uno/dialog/logger/LogWindow.xdl
index 8a41ec1b..5e0af770 100644
--- a/uno/dialog/logger/LogWindow.xdl
+++ b/uno/dialog/logger/LogWindow.xdl
@@ -2,7 +2,7 @@
 <!--
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/java/beans/PropertySet.java b/uno/lib/java/beans/PropertySet.java
index 67f621fc..f1deb2c2 100644
--- a/uno/lib/java/beans/PropertySet.java
+++ b/uno/lib/java/beans/PropertySet.java
@@ -21,7 +21,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/java/beans/PropertySetAdapter.java b/uno/lib/java/beans/PropertySetAdapter.java
index 324733a0..1f172d61 100644
--- a/uno/lib/java/beans/PropertySetAdapter.java
+++ b/uno/lib/java/beans/PropertySetAdapter.java
@@ -21,7 +21,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/java/helper/Array.java b/uno/lib/java/helper/Array.java
index f119ed6c..a08155d9 100644
--- a/uno/lib/java/helper/Array.java
+++ b/uno/lib/java/helper/Array.java
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/java/helper/EventLogger.java b/uno/lib/java/helper/EventLogger.java
index 15769541..85a50b27 100644
--- a/uno/lib/java/helper/EventLogger.java
+++ b/uno/lib/java/helper/EventLogger.java
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
@@ -293,16 +293,22 @@ public boolean logp(int level,
     }
 
     protected boolean _log(int level,
-                               String clazz,
-                               String method,
-                               String message,
-                               Object... arguments)
+                           String clazz,
+                           String method,
+                           String message,
+                           Object... arguments)
     {
         if (m_xLogger == null) {
             return false;
         }
         if (arguments.length > 0) {
-            message = String.format(message, arguments);
+            try {
+                message = String.format(message, arguments);
+            }
+            catch (java.lang.Exception e){
+                System.out.println("EventLogger._log ERROR" + message);
+                // pass
+            }
         }
         if (clazz != null && method != null) {
             m_xLogger.logp(level, clazz, method, message);
diff --git a/uno/lib/java/helper/OfficeResourceBundle.java b/uno/lib/java/helper/OfficeResourceBundle.java
index e3e9337e..32ec8dfd 100644
--- a/uno/lib/java/helper/OfficeResourceBundle.java
+++ b/uno/lib/java/helper/OfficeResourceBundle.java
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/java/helper/RegistrationHelper.java b/uno/lib/java/helper/RegistrationHelper.java
index 52854db5..2c596b63 100644
--- a/uno/lib/java/helper/RegistrationHelper.java
+++ b/uno/lib/java/helper/RegistrationHelper.java
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/java/helper/ResourceBasedEventLogger.java b/uno/lib/java/helper/ResourceBasedEventLogger.java
index c6b4253c..d37b6a16 100644
--- a/uno/lib/java/helper/ResourceBasedEventLogger.java
+++ b/uno/lib/java/helper/ResourceBasedEventLogger.java
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
@@ -84,35 +84,55 @@ public ResourceBasedEventLogger(XComponentContext context,
             throw new RuntimeException(e);
         }
     }
-    
+
     /**
-     * Logs a given resource id with its arguments, without the caller's class and method.
+     * Logs a given message, without the caller's class and method.
      * @param level the log level
-     * @param id the resource ID of the message to log
-     * @param arguments the arguments to log, which are converted to strings and replace $1$, $2$, up to $n$ in the message
+     * @param message the message to log
      * @return whether logging succeeded
      */
     public boolean log(int level,
-                       int id,
-                       Object... arguments)
+                       String message)
     {
         if (isLoggable(level)) {
-            return _log(level, null, null, loadStringMessage(id), arguments);
+            return _log(level, null, null, message);
         }
         return false;
     }
 
     /**
-     * Logs a given message, without the caller's class and method.
+     * Logs a given message with its arguments, with the caller's class and method
+     * taken from a (relatively costly!) stack trace.
      * @param level the log level
+     * @param class name who log this message
+     * @param method name who log this message
      * @param message the message to log
      * @return whether logging succeeded
      */
-    public boolean log(int level,
-                       String message)
+    public boolean logp(int level,
+                        String cls,
+                        String method,
+                        String message)
     {
         if (isLoggable(level)) {
-            return _log(level, null, null, message);
+            return _log(level, cls, method, message);
+        }
+        return false;
+    }
+
+    /**
+     * Logs a given resource bundle id with its arguments, without the caller's class and method.
+     * @param level the log level
+     * @param id the resource ID of the message to log
+     * @param arguments the arguments to log, which are converted to strings and replace $1$, $2$, up to $n$ in the message
+     * @return whether logging succeeded
+     */
+    public boolean logrb(int level,
+                         int id,
+                         Object... arguments)
+    {
+        if (isLoggable(level)) {
+            return _log(level, null, null, loadStringMessage(id), arguments);
         }
         return false;
     }
@@ -125,7 +145,7 @@ public boolean log(int level,
      * @param arguments the arguments to log, which are converted to strings and replace $1$, $2$, up to $n$ in the message
      * @return whether logging succeeded
      */
-    public boolean logp(int level,
+    public boolean logprb(int level,
                         int id,
                         Object... arguments)
     {
@@ -136,10 +156,33 @@ public boolean logp(int level,
         return false;
     }
 
-    protected boolean logp(int level,
-                           StackTraceElement caller,
-                           int id,
-                           Object... arguments)
+
+    /**
+     * Logs a given message with its arguments, with the caller's class and method
+     * taken from a (relatively costly!) stack trace.
+     * @param level the log level
+     * @param class name who log this message
+     * @param method name who log this message
+     * @param id the resource string id to log
+     * @param arguments the arguments to log, which are converted to strings and replace $1$, $2$, up to $n$ in the message
+     * @return whether logging succeeded
+     */
+    public boolean logprb(int level,
+                          String cls,
+                          String method,
+                          int id,
+                          Object...arguments)
+    {
+        if (isLoggable(level)) {
+            return _log(level, cls, method, loadStringMessage(id), arguments);
+        }
+        return false;
+    }
+
+    protected boolean logprb(int level,
+                             StackTraceElement caller,
+                             int id,
+                             Object... arguments)
     {
         if (isLoggable(level)) {
             return _log(level, caller.getClassName(), caller.getMethodName(), loadStringMessage(id), arguments);
@@ -147,6 +190,20 @@ protected boolean logp(int level,
         return false;
     }
 
+    public String getStringResource(int id, Object... arguments)
+    {
+        String message = loadStringMessage(id);
+        if (arguments.length > 0) {
+            try {
+                message = String.format(message, arguments);
+            }
+            catch (java.lang.Exception e) {
+                // pass
+            }
+        }
+        return message;
+    }
+
     private String loadStringMessage(int id)
     {
         String message;
@@ -154,9 +211,9 @@ private String loadStringMessage(int id)
             message = m_Bundle.loadString(id);
         }
         catch (MissingResourceException | Exception e) {
-            StringWriter error = new StringWriter();
-            e.printStackTrace(new PrintWriter(error));
-            message = String.format("<invalid event resource: '%s:%d'>\n%s", m_basename, id, error.getBuffer().toString());
+            StringWriter writer = new StringWriter();
+            e.printStackTrace(new PrintWriter(writer));
+            message = String.format("<invalid event resource: '%s:%d'>\n%s", m_basename, id, writer.getBuffer().toString());
         }
         return message;
     }
diff --git a/uno/lib/java/helper/SharedResources.java b/uno/lib/java/helper/SharedResources.java
index 8ad3078e..15fe0238 100644
--- a/uno/lib/java/helper/SharedResources.java
+++ b/uno/lib/java/helper/SharedResources.java
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/java/lang/ServiceInfo.java b/uno/lib/java/lang/ServiceInfo.java
index 5232744a..8ea77eb7 100644
--- a/uno/lib/java/lang/ServiceInfo.java
+++ b/uno/lib/java/lang/ServiceInfo.java
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/python/dateutil-2.8.2.dist-info/LICENSE b/uno/lib/python/dateutil-2.8.2.dist-info/LICENSE
new file mode 100644
index 00000000..1e65815c
--- /dev/null
+++ b/uno/lib/python/dateutil-2.8.2.dist-info/LICENSE
@@ -0,0 +1,54 @@
+Copyright 2017- Paul Ganssle <paul@ganssle.io>
+Copyright 2017- dateutil contributors (see AUTHORS file)
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+The above license applies to all contributions after 2017-12-01, as well as
+all contributions that have been re-licensed (see AUTHORS file for the list of
+contributors who have re-licensed their code).
+--------------------------------------------------------------------------------
+dateutil - Extensions to the standard Python datetime module.
+
+Copyright (c) 2003-2011 - Gustavo Niemeyer <gustavo@niemeyer.net>
+Copyright (c) 2012-2014 - Tomi Pieviläinen <tomi.pievilainen@iki.fi>
+Copyright (c) 2014-2016 - Yaron de Leeuw <me@jarondl.net>
+Copyright (c) 2015-     - Paul Ganssle <paul@ganssle.io>
+Copyright (c) 2015-     - dateutil contributors (see AUTHORS file)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of the copyright holder nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The above BSD License Applies to all code, even that also covered by Apache 2.0.
\ No newline at end of file
diff --git a/uno/lib/python/dateutil-2.8.2.dist-info/METADATA b/uno/lib/python/dateutil-2.8.2.dist-info/METADATA
new file mode 100644
index 00000000..1e46c96a
--- /dev/null
+++ b/uno/lib/python/dateutil-2.8.2.dist-info/METADATA
@@ -0,0 +1,204 @@
+Metadata-Version: 2.1
+Name: python-dateutil
+Version: 2.8.2
+Summary: Extensions to the standard Python datetime module
+Home-page: https://github.com/dateutil/dateutil
+Author: Gustavo Niemeyer
+Author-email: gustavo@niemeyer.net
+Maintainer: Paul Ganssle
+Maintainer-email: dateutil@python.org
+License: Dual License
+Project-URL: Documentation, https://dateutil.readthedocs.io/en/stable/
+Project-URL: Source, https://github.com/dateutil/dateutil
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: BSD License
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Topic :: Software Development :: Libraries
+Requires-Python: !=3.0.*,!=3.1.*,!=3.2.*,>=2.7
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+Requires-Dist: six (>=1.5)
+
+dateutil - powerful extensions to datetime
+==========================================
+
+|pypi| |support| |licence|
+
+|gitter| |readthedocs|
+
+|travis| |appveyor| |pipelines| |coverage|
+
+.. |pypi| image:: https://img.shields.io/pypi/v/python-dateutil.svg?style=flat-square
+    :target: https://pypi.org/project/python-dateutil/
+    :alt: pypi version
+
+.. |support| image:: https://img.shields.io/pypi/pyversions/python-dateutil.svg?style=flat-square
+    :target: https://pypi.org/project/python-dateutil/
+    :alt: supported Python version
+
+.. |travis| image:: https://img.shields.io/travis/dateutil/dateutil/master.svg?style=flat-square&label=Travis%20Build
+    :target: https://travis-ci.org/dateutil/dateutil
+    :alt: travis build status
+
+.. |appveyor| image:: https://img.shields.io/appveyor/ci/dateutil/dateutil/master.svg?style=flat-square&logo=appveyor
+    :target: https://ci.appveyor.com/project/dateutil/dateutil
+    :alt: appveyor build status
+
+.. |pipelines| image:: https://dev.azure.com/pythondateutilazure/dateutil/_apis/build/status/dateutil.dateutil?branchName=master
+    :target: https://dev.azure.com/pythondateutilazure/dateutil/_build/latest?definitionId=1&branchName=master
+    :alt: azure pipelines build status
+
+.. |coverage| image:: https://codecov.io/gh/dateutil/dateutil/branch/master/graphs/badge.svg?branch=master
+    :target: https://codecov.io/gh/dateutil/dateutil?branch=master
+    :alt: Code coverage
+
+.. |gitter| image:: https://badges.gitter.im/dateutil/dateutil.svg
+   :alt: Join the chat at https://gitter.im/dateutil/dateutil
+   :target: https://gitter.im/dateutil/dateutil
+
+.. |licence| image:: https://img.shields.io/pypi/l/python-dateutil.svg?style=flat-square
+    :target: https://pypi.org/project/python-dateutil/
+    :alt: licence
+
+.. |readthedocs| image:: https://img.shields.io/readthedocs/dateutil/latest.svg?style=flat-square&label=Read%20the%20Docs
+   :alt: Read the documentation at https://dateutil.readthedocs.io/en/latest/
+   :target: https://dateutil.readthedocs.io/en/latest/
+
+The `dateutil` module provides powerful extensions to
+the standard `datetime` module, available in Python.
+
+Installation
+============
+`dateutil` can be installed from PyPI using `pip` (note that the package name is
+different from the importable name)::
+
+    pip install python-dateutil
+
+Download
+========
+dateutil is available on PyPI
+https://pypi.org/project/python-dateutil/
+
+The documentation is hosted at:
+https://dateutil.readthedocs.io/en/stable/
+
+Code
+====
+The code and issue tracker are hosted on GitHub:
+https://github.com/dateutil/dateutil/
+
+Features
+========
+
+* Computing of relative deltas (next month, next year,
+  next Monday, last week of month, etc);
+* Computing of relative deltas between two given
+  date and/or datetime objects;
+* Computing of dates based on very flexible recurrence rules,
+  using a superset of the `iCalendar <https://www.ietf.org/rfc/rfc2445.txt>`_
+  specification. Parsing of RFC strings is supported as well.
+* Generic parsing of dates in almost any string format;
+* Timezone (tzinfo) implementations for tzfile(5) format
+  files (/etc/localtime, /usr/share/zoneinfo, etc), TZ
+  environment string (in all known formats), iCalendar
+  format files, given ranges (with help from relative deltas),
+  local machine timezone, fixed offset timezone, UTC timezone,
+  and Windows registry-based time zones.
+* Internal up-to-date world timezone information based on
+  Olson's database.
+* Computing of Easter Sunday dates for any given year,
+  using Western, Orthodox or Julian algorithms;
+* A comprehensive test suite.
+
+Quick example
+=============
+Here's a snapshot, just to give an idea about the power of the
+package. For more examples, look at the documentation.
+
+Suppose you want to know how much time is left, in
+years/months/days/etc, before the next easter happening on a
+year with a Friday 13th in August, and you want to get today's
+date out of the "date" unix system command. Here is the code:
+
+.. code-block:: python3
+
+    >>> from dateutil.relativedelta import *
+    >>> from dateutil.easter import *
+    >>> from dateutil.rrule import *
+    >>> from dateutil.parser import *
+    >>> from datetime import *
+    >>> now = parse("Sat Oct 11 17:13:46 UTC 2003")
+    >>> today = now.date()
+    >>> year = rrule(YEARLY,dtstart=now,bymonth=8,bymonthday=13,byweekday=FR)[0].year
+    >>> rdelta = relativedelta(easter(year), today)
+    >>> print("Today is: %s" % today)
+    Today is: 2003-10-11
+    >>> print("Year with next Aug 13th on a Friday is: %s" % year)
+    Year with next Aug 13th on a Friday is: 2004
+    >>> print("How far is the Easter of that year: %s" % rdelta)
+    How far is the Easter of that year: relativedelta(months=+6)
+    >>> print("And the Easter of that year is: %s" % (today+rdelta))
+    And the Easter of that year is: 2004-04-11
+
+Being exactly 6 months ahead was **really** a coincidence :)
+
+Contributing
+============
+
+We welcome many types of contributions - bug reports, pull requests (code, infrastructure or documentation fixes). For more information about how to contribute to the project, see the ``CONTRIBUTING.md`` file in the repository.
+
+
+Author
+======
+The dateutil module was written by Gustavo Niemeyer <gustavo@niemeyer.net>
+in 2003.
+
+It is maintained by:
+
+* Gustavo Niemeyer <gustavo@niemeyer.net> 2003-2011
+* Tomi Pieviläinen <tomi.pievilainen@iki.fi> 2012-2014
+* Yaron de Leeuw <me@jarondl.net> 2014-2016
+* Paul Ganssle <paul@ganssle.io> 2015-
+
+Starting with version 2.4.1 and running until 2.8.2, all source and binary
+distributions will be signed by a PGP key that has, at the very least, been
+signed by the key which made the previous release. A table of release signing
+keys can be found below:
+
+===========  ============================
+Releases     Signing key fingerprint
+===========  ============================
+2.4.1-2.8.2  `6B49 ACBA DCF6 BD1C A206 67AB CD54 FCE3 D964 BEFB`_ 
+===========  ============================
+
+New releases *may* have signed tags, but binary and source distributions
+uploaded to PyPI will no longer have GPG signatures attached.
+
+Contact
+=======
+Our mailing list is available at `dateutil@python.org <https://mail.python.org/mailman/listinfo/dateutil>`_. As it is hosted by the PSF, it is subject to the `PSF code of
+conduct <https://www.python.org/psf/conduct/>`_.
+
+License
+=======
+
+All contributions after December 1, 2017 released under dual license - either `Apache 2.0 License <https://www.apache.org/licenses/LICENSE-2.0>`_ or the `BSD 3-Clause License <https://opensource.org/licenses/BSD-3-Clause>`_. Contributions before December 1, 2017 - except those those explicitly relicensed - are released only under the BSD 3-Clause License.
+
+
+.. _6B49 ACBA DCF6 BD1C A206 67AB CD54 FCE3 D964 BEFB:
+   https://pgp.mit.edu/pks/lookup?op=vindex&search=0xCD54FCE3D964BEFB
+
+
diff --git a/uno/lib/python/dateutil-2.8.2.dist-info/RECORD b/uno/lib/python/dateutil-2.8.2.dist-info/RECORD
new file mode 100644
index 00000000..d03ea8c3
--- /dev/null
+++ b/uno/lib/python/dateutil-2.8.2.dist-info/RECORD
@@ -0,0 +1,25 @@
+dateutil/__init__.py,sha256=lXElASqwYGwqlrSWSeX19JwF5Be9tNecDa9ebk-0gmk,222
+dateutil/_common.py,sha256=77w0yytkrxlYbSn--lDVPUMabUXRR9I3lBv_vQRUqUY,932
+dateutil/_version.py,sha256=awyHv2PYvDR84dxjrHyzmm8nieFwMjcuuShPh-QNkM4,142
+dateutil/easter.py,sha256=dyBi-lKvimH1u_k6p7Z0JJK72QhqVtVBsqByvpEPKvc,2678
+dateutil/relativedelta.py,sha256=GjVxqpAVWnG67rdbf7pkoIlJvQqmju9NSfGCcqblc7U,24904
+dateutil/rrule.py,sha256=b6GVV4MpZDbBhJ5qitQKRyx8-_OKyeAbk57or2A8AYU,66556
+dateutil/tzwin.py,sha256=7Ar4vdQCnnM0mKR3MUjbIKsZrBVfHgdwsJZc_mGYRew,59
+dateutil/utils.py,sha256=dKCchEw8eObi0loGTx91unBxm_7UGlU3v_FjFMdqwYM,1965
+dateutil/parser/__init__.py,sha256=wWk6GFuxTpjoggCGtgkceJoti4pVjl4_fHQXpNOaSYg,1766
+dateutil/parser/_parser.py,sha256=7klDdyicksQB_Xgl-3UAmBwzCYor1AIZqklIcT6dH_8,58796
+dateutil/parser/isoparser.py,sha256=EtLY7w22HWx-XJpTWxJD3XNs6LBHRCps77tCdLnYad8,13247
+dateutil/tz/__init__.py,sha256=F-Mz13v6jYseklQf9Te9J6nzcLDmq47gORa61K35_FA,444
+dateutil/tz/_common.py,sha256=cgzDTANsOXvEc86cYF77EsliuSab8Puwpsl5-bX3_S4,12977
+dateutil/tz/_factories.py,sha256=unb6XQNXrPMveksTCU-Ag8jmVZs4SojoPUcAHpWnrvU,2569
+dateutil/tz/tz.py,sha256=JotVjDcF16hzoouQ0kZW-5mCYu7Xj67NI-VQgnWapKE,62857
+dateutil/tz/win.py,sha256=xJszWgSwE1xPx_HJj4ZkepyukC_hNy016WMcXhbRaB8,12935
+dateutil/zoneinfo/__init__.py,sha256=KYg0pthCMjcp5MXSEiBJn3nMjZeNZav7rlJw5-tz1S4,5889
+dateutil/zoneinfo/dateutil-zoneinfo.tar.gz,sha256=AkcdBx3XkEZwMSpS_TmOEfrEFHLvgxPNDVIwGVxTVaI,174394
+dateutil/zoneinfo/rebuild.py,sha256=MiqYzCIHvNbMH-LdRYLv-4T0EIA7hDKt5GLR0IRTLdI,2392
+python_dateutil-2.8.2.dist-info/LICENSE,sha256=ugD1Gg2SgjtaHN4n2LW50jIeZ-2NqbwWPv-W1eF-V34,2889
+python_dateutil-2.8.2.dist-info/METADATA,sha256=RDHtGo7BnYRjmYxot_wlu_W3N2CyvPtvchbtyIlKKPA,8218
+python_dateutil-2.8.2.dist-info/WHEEL,sha256=Z-nyYpwrcSqxfdux5Mbn_DQ525iP7J2DG3JgGvOYyTQ,110
+python_dateutil-2.8.2.dist-info/top_level.txt,sha256=4tjdWkhRZvF7LA_BYe_L9gB2w_p2a-z5y6ArjaRkot8,9
+python_dateutil-2.8.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+python_dateutil-2.8.2.dist-info/RECORD,,
diff --git a/uno/lib/python/dateutil-2.8.2.dist-info/WHEEL b/uno/lib/python/dateutil-2.8.2.dist-info/WHEEL
new file mode 100644
index 00000000..01b8fc7d
--- /dev/null
+++ b/uno/lib/python/dateutil-2.8.2.dist-info/WHEEL
@@ -0,0 +1,6 @@
+Wheel-Version: 1.0
+Generator: bdist_wheel (0.36.2)
+Root-Is-Purelib: true
+Tag: py2-none-any
+Tag: py3-none-any
+
diff --git a/uno/lib/python/dateutil-2.8.2.dist-info/top_level.txt b/uno/lib/python/dateutil-2.8.2.dist-info/top_level.txt
new file mode 100644
index 00000000..66501480
--- /dev/null
+++ b/uno/lib/python/dateutil-2.8.2.dist-info/top_level.txt
@@ -0,0 +1 @@
+dateutil
diff --git a/uno/lib/python/dateutil-2.8.2.dist-info/zip-safe b/uno/lib/python/dateutil-2.8.2.dist-info/zip-safe
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/uno/lib/python/dateutil-2.8.2.dist-info/zip-safe
@@ -0,0 +1 @@
+
diff --git a/uno/lib/python/poub/attr/__init__.py b/uno/lib/python/poub/attr/__init__.py
deleted file mode 100644
index 7cfa792f..00000000
--- a/uno/lib/python/poub/attr/__init__.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-"""
-Classes Without Boilerplate
-"""
-
-from functools import partial
-from typing import Callable
-
-from . import converters, exceptions, filters, setters, validators
-from ._cmp import cmp_using
-from ._config import get_run_validators, set_run_validators
-from ._funcs import asdict, assoc, astuple, evolve, has, resolve_types
-from ._make import (
-    NOTHING,
-    Attribute,
-    Factory,
-    attrib,
-    attrs,
-    fields,
-    fields_dict,
-    make_class,
-    validate,
-)
-from ._next_gen import define, field, frozen, mutable
-from ._version_info import VersionInfo
-
-
-s = attributes = attrs
-ib = attr = attrib
-dataclass = partial(attrs, auto_attribs=True)  # happy Easter ;)
-
-
-class AttrsInstance:
-    pass
-
-
-__all__ = [
-    "Attribute",
-    "AttrsInstance",
-    "Factory",
-    "NOTHING",
-    "asdict",
-    "assoc",
-    "astuple",
-    "attr",
-    "attrib",
-    "attributes",
-    "attrs",
-    "cmp_using",
-    "converters",
-    "define",
-    "evolve",
-    "exceptions",
-    "field",
-    "fields",
-    "fields_dict",
-    "filters",
-    "frozen",
-    "get_run_validators",
-    "has",
-    "ib",
-    "make_class",
-    "mutable",
-    "resolve_types",
-    "s",
-    "set_run_validators",
-    "setters",
-    "validate",
-    "validators",
-]
-
-
-def _make_getattr(mod_name: str) -> Callable:
-    """
-    Create a metadata proxy for packaging information that uses *mod_name* in
-    its warnings and errors.
-    """
-
-    def __getattr__(name: str) -> str:
-        dunder_to_metadata = {
-            "__title__": "Name",
-            "__copyright__": "",
-            "__version__": "version",
-            "__version_info__": "version",
-            "__description__": "summary",
-            "__uri__": "",
-            "__url__": "",
-            "__author__": "",
-            "__email__": "",
-            "__license__": "license",
-        }
-        if name not in dunder_to_metadata.keys():
-            raise AttributeError(f"module {mod_name} has no attribute {name}")
-
-        import sys
-        import warnings
-
-        if sys.version_info < (3, 8):
-            from importlib_metadata import metadata
-        else:
-            from importlib.metadata import metadata
-
-        if name != "__version_info__":
-            warnings.warn(
-                f"Accessing {mod_name}.{name} is deprecated and will be "
-                "removed in a future release. Use importlib.metadata directly "
-                "to query for attrs's packaging metadata.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-
-        meta = metadata("attrs")
-        if name == "__license__":
-            return "MIT"
-        elif name == "__copyright__":
-            return "Copyright (c) 2015 Hynek Schlawack"
-        elif name in ("__uri__", "__url__"):
-            return meta["Project-URL"].split(" ", 1)[-1]
-        elif name == "__version_info__":
-            return VersionInfo._from_version_string(meta["version"])
-        elif name == "__author__":
-            return meta["Author-email"].rsplit(" ", 1)[0]
-        elif name == "__email__":
-            return meta["Author-email"].rsplit("<", 1)[1][:-1]
-
-        return meta[dunder_to_metadata[name]]
-
-    return __getattr__
-
-
-__getattr__ = _make_getattr(__name__)
diff --git a/uno/lib/python/poub/attr/__init__.pyi b/uno/lib/python/poub/attr/__init__.pyi
deleted file mode 100644
index ced5a3fd..00000000
--- a/uno/lib/python/poub/attr/__init__.pyi
+++ /dev/null
@@ -1,571 +0,0 @@
-import enum
-import sys
-
-from typing import (
-    Any,
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    Optional,
-    Protocol,
-    Sequence,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-    overload,
-)
-
-# `import X as X` is required to make these public
-from . import converters as converters
-from . import exceptions as exceptions
-from . import filters as filters
-from . import setters as setters
-from . import validators as validators
-from ._cmp import cmp_using as cmp_using
-from ._typing_compat import AttrsInstance_
-from ._version_info import VersionInfo
-
-if sys.version_info >= (3, 10):
-    from typing import TypeGuard
-else:
-    from typing_extensions import TypeGuard
-
-__version__: str
-__version_info__: VersionInfo
-__title__: str
-__description__: str
-__url__: str
-__uri__: str
-__author__: str
-__email__: str
-__license__: str
-__copyright__: str
-
-_T = TypeVar("_T")
-_C = TypeVar("_C", bound=type)
-
-_EqOrderType = Union[bool, Callable[[Any], Any]]
-_ValidatorType = Callable[[Any, "Attribute[_T]", _T], Any]
-_ConverterType = Callable[[Any], Any]
-_FilterType = Callable[["Attribute[_T]", _T], bool]
-_ReprType = Callable[[Any], str]
-_ReprArgType = Union[bool, _ReprType]
-_OnSetAttrType = Callable[[Any, "Attribute[Any]", Any], Any]
-_OnSetAttrArgType = Union[
-    _OnSetAttrType, List[_OnSetAttrType], setters._NoOpType
-]
-_FieldTransformer = Callable[
-    [type, List["Attribute[Any]"]], List["Attribute[Any]"]
-]
-# FIXME: in reality, if multiple validators are passed they must be in a list
-# or tuple, but those are invariant and so would prevent subtypes of
-# _ValidatorType from working when passed in a list or tuple.
-_ValidatorArgType = Union[_ValidatorType[_T], Sequence[_ValidatorType[_T]]]
-
-# We subclass this here to keep the protocol's qualified name clean.
-class AttrsInstance(AttrsInstance_, Protocol):
-    pass
-
-_A = TypeVar("_A", bound=AttrsInstance)
-# _make --
-
-class _Nothing(enum.Enum):
-    NOTHING = enum.auto()
-
-NOTHING = _Nothing.NOTHING
-
-# NOTE: Factory lies about its return type to make this possible:
-# `x: List[int] # = Factory(list)`
-# Work around mypy issue #4554 in the common case by using an overload.
-if sys.version_info >= (3, 8):
-    from typing import Literal
-    @overload
-    def Factory(factory: Callable[[], _T]) -> _T: ...
-    @overload
-    def Factory(
-        factory: Callable[[Any], _T],
-        takes_self: Literal[True],
-    ) -> _T: ...
-    @overload
-    def Factory(
-        factory: Callable[[], _T],
-        takes_self: Literal[False],
-    ) -> _T: ...
-
-else:
-    @overload
-    def Factory(factory: Callable[[], _T]) -> _T: ...
-    @overload
-    def Factory(
-        factory: Union[Callable[[Any], _T], Callable[[], _T]],
-        takes_self: bool = ...,
-    ) -> _T: ...
-
-# Static type inference support via __dataclass_transform__ implemented as per:
-# https://github.com/microsoft/pyright/blob/1.1.135/specs/dataclass_transforms.md
-# This annotation must be applied to all overloads of "define" and "attrs"
-#
-# NOTE: This is a typing construct and does not exist at runtime.  Extensions
-# wrapping attrs decorators should declare a separate __dataclass_transform__
-# signature in the extension module using the specification linked above to
-# provide pyright support.
-def __dataclass_transform__(
-    *,
-    eq_default: bool = True,
-    order_default: bool = False,
-    kw_only_default: bool = False,
-    frozen_default: bool = False,
-    field_descriptors: Tuple[Union[type, Callable[..., Any]], ...] = (()),
-) -> Callable[[_T], _T]: ...
-
-class Attribute(Generic[_T]):
-    name: str
-    default: Optional[_T]
-    validator: Optional[_ValidatorType[_T]]
-    repr: _ReprArgType
-    cmp: _EqOrderType
-    eq: _EqOrderType
-    order: _EqOrderType
-    hash: Optional[bool]
-    init: bool
-    converter: Optional[_ConverterType]
-    metadata: Dict[Any, Any]
-    type: Optional[Type[_T]]
-    kw_only: bool
-    on_setattr: _OnSetAttrType
-    alias: Optional[str]
-
-    def evolve(self, **changes: Any) -> "Attribute[Any]": ...
-
-# NOTE: We had several choices for the annotation to use for type arg:
-# 1) Type[_T]
-#   - Pros: Handles simple cases correctly
-#   - Cons: Might produce less informative errors in the case of conflicting
-#     TypeVars e.g. `attr.ib(default='bad', type=int)`
-# 2) Callable[..., _T]
-#   - Pros: Better error messages than #1 for conflicting TypeVars
-#   - Cons: Terrible error messages for validator checks.
-#   e.g. attr.ib(type=int, validator=validate_str)
-#        -> error: Cannot infer function type argument
-# 3) type (and do all of the work in the mypy plugin)
-#   - Pros: Simple here, and we could customize the plugin with our own errors.
-#   - Cons: Would need to write mypy plugin code to handle all the cases.
-# We chose option #1.
-
-# `attr` lies about its return type to make the following possible:
-#     attr()    -> Any
-#     attr(8)   -> int
-#     attr(validator=<some callable>)  -> Whatever the callable expects.
-# This makes this type of assignments possible:
-#     x: int = attr(8)
-#
-# This form catches explicit None or no default but with no other arguments
-# returns Any.
-@overload
-def attrib(
-    default: None = ...,
-    validator: None = ...,
-    repr: _ReprArgType = ...,
-    cmp: Optional[_EqOrderType] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
-    type: None = ...,
-    converter: None = ...,
-    factory: None = ...,
-    kw_only: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
-) -> Any: ...
-
-# This form catches an explicit None or no default and infers the type from the
-# other arguments.
-@overload
-def attrib(
-    default: None = ...,
-    validator: Optional[_ValidatorArgType[_T]] = ...,
-    repr: _ReprArgType = ...,
-    cmp: Optional[_EqOrderType] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
-    type: Optional[Type[_T]] = ...,
-    converter: Optional[_ConverterType] = ...,
-    factory: Optional[Callable[[], _T]] = ...,
-    kw_only: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
-) -> _T: ...
-
-# This form catches an explicit default argument.
-@overload
-def attrib(
-    default: _T,
-    validator: Optional[_ValidatorArgType[_T]] = ...,
-    repr: _ReprArgType = ...,
-    cmp: Optional[_EqOrderType] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
-    type: Optional[Type[_T]] = ...,
-    converter: Optional[_ConverterType] = ...,
-    factory: Optional[Callable[[], _T]] = ...,
-    kw_only: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
-) -> _T: ...
-
-# This form covers type=non-Type: e.g. forward references (str), Any
-@overload
-def attrib(
-    default: Optional[_T] = ...,
-    validator: Optional[_ValidatorArgType[_T]] = ...,
-    repr: _ReprArgType = ...,
-    cmp: Optional[_EqOrderType] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
-    type: object = ...,
-    converter: Optional[_ConverterType] = ...,
-    factory: Optional[Callable[[], _T]] = ...,
-    kw_only: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
-) -> Any: ...
-@overload
-def field(
-    *,
-    default: None = ...,
-    validator: None = ...,
-    repr: _ReprArgType = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
-    converter: None = ...,
-    factory: None = ...,
-    kw_only: bool = ...,
-    eq: Optional[bool] = ...,
-    order: Optional[bool] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
-    type: Optional[type] = ...,
-) -> Any: ...
-
-# This form catches an explicit None or no default and infers the type from the
-# other arguments.
-@overload
-def field(
-    *,
-    default: None = ...,
-    validator: Optional[_ValidatorArgType[_T]] = ...,
-    repr: _ReprArgType = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
-    converter: Optional[_ConverterType] = ...,
-    factory: Optional[Callable[[], _T]] = ...,
-    kw_only: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
-    type: Optional[type] = ...,
-) -> _T: ...
-
-# This form catches an explicit default argument.
-@overload
-def field(
-    *,
-    default: _T,
-    validator: Optional[_ValidatorArgType[_T]] = ...,
-    repr: _ReprArgType = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
-    converter: Optional[_ConverterType] = ...,
-    factory: Optional[Callable[[], _T]] = ...,
-    kw_only: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
-    type: Optional[type] = ...,
-) -> _T: ...
-
-# This form covers type=non-Type: e.g. forward references (str), Any
-@overload
-def field(
-    *,
-    default: Optional[_T] = ...,
-    validator: Optional[_ValidatorArgType[_T]] = ...,
-    repr: _ReprArgType = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
-    converter: Optional[_ConverterType] = ...,
-    factory: Optional[Callable[[], _T]] = ...,
-    kw_only: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
-    type: Optional[type] = ...,
-) -> Any: ...
-@overload
-@__dataclass_transform__(order_default=True, field_descriptors=(attrib, field))
-def attrs(
-    maybe_cls: _C,
-    these: Optional[Dict[str, Any]] = ...,
-    repr_ns: Optional[str] = ...,
-    repr: bool = ...,
-    cmp: Optional[_EqOrderType] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    slots: bool = ...,
-    frozen: bool = ...,
-    weakref_slot: bool = ...,
-    str: bool = ...,
-    auto_attribs: bool = ...,
-    kw_only: bool = ...,
-    cache_hash: bool = ...,
-    auto_exc: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    auto_detect: bool = ...,
-    collect_by_mro: bool = ...,
-    getstate_setstate: Optional[bool] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    field_transformer: Optional[_FieldTransformer] = ...,
-    match_args: bool = ...,
-    unsafe_hash: Optional[bool] = ...,
-) -> _C: ...
-@overload
-@__dataclass_transform__(order_default=True, field_descriptors=(attrib, field))
-def attrs(
-    maybe_cls: None = ...,
-    these: Optional[Dict[str, Any]] = ...,
-    repr_ns: Optional[str] = ...,
-    repr: bool = ...,
-    cmp: Optional[_EqOrderType] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    slots: bool = ...,
-    frozen: bool = ...,
-    weakref_slot: bool = ...,
-    str: bool = ...,
-    auto_attribs: bool = ...,
-    kw_only: bool = ...,
-    cache_hash: bool = ...,
-    auto_exc: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    auto_detect: bool = ...,
-    collect_by_mro: bool = ...,
-    getstate_setstate: Optional[bool] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    field_transformer: Optional[_FieldTransformer] = ...,
-    match_args: bool = ...,
-    unsafe_hash: Optional[bool] = ...,
-) -> Callable[[_C], _C]: ...
-@overload
-@__dataclass_transform__(field_descriptors=(attrib, field))
-def define(
-    maybe_cls: _C,
-    *,
-    these: Optional[Dict[str, Any]] = ...,
-    repr: bool = ...,
-    unsafe_hash: Optional[bool] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    slots: bool = ...,
-    frozen: bool = ...,
-    weakref_slot: bool = ...,
-    str: bool = ...,
-    auto_attribs: bool = ...,
-    kw_only: bool = ...,
-    cache_hash: bool = ...,
-    auto_exc: bool = ...,
-    eq: Optional[bool] = ...,
-    order: Optional[bool] = ...,
-    auto_detect: bool = ...,
-    getstate_setstate: Optional[bool] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    field_transformer: Optional[_FieldTransformer] = ...,
-    match_args: bool = ...,
-) -> _C: ...
-@overload
-@__dataclass_transform__(field_descriptors=(attrib, field))
-def define(
-    maybe_cls: None = ...,
-    *,
-    these: Optional[Dict[str, Any]] = ...,
-    repr: bool = ...,
-    unsafe_hash: Optional[bool] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    slots: bool = ...,
-    frozen: bool = ...,
-    weakref_slot: bool = ...,
-    str: bool = ...,
-    auto_attribs: bool = ...,
-    kw_only: bool = ...,
-    cache_hash: bool = ...,
-    auto_exc: bool = ...,
-    eq: Optional[bool] = ...,
-    order: Optional[bool] = ...,
-    auto_detect: bool = ...,
-    getstate_setstate: Optional[bool] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    field_transformer: Optional[_FieldTransformer] = ...,
-    match_args: bool = ...,
-) -> Callable[[_C], _C]: ...
-
-mutable = define
-
-@overload
-@__dataclass_transform__(
-    frozen_default=True, field_descriptors=(attrib, field)
-)
-def frozen(
-    maybe_cls: _C,
-    *,
-    these: Optional[Dict[str, Any]] = ...,
-    repr: bool = ...,
-    unsafe_hash: Optional[bool] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    slots: bool = ...,
-    frozen: bool = ...,
-    weakref_slot: bool = ...,
-    str: bool = ...,
-    auto_attribs: bool = ...,
-    kw_only: bool = ...,
-    cache_hash: bool = ...,
-    auto_exc: bool = ...,
-    eq: Optional[bool] = ...,
-    order: Optional[bool] = ...,
-    auto_detect: bool = ...,
-    getstate_setstate: Optional[bool] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    field_transformer: Optional[_FieldTransformer] = ...,
-    match_args: bool = ...,
-) -> _C: ...
-@overload
-@__dataclass_transform__(
-    frozen_default=True, field_descriptors=(attrib, field)
-)
-def frozen(
-    maybe_cls: None = ...,
-    *,
-    these: Optional[Dict[str, Any]] = ...,
-    repr: bool = ...,
-    unsafe_hash: Optional[bool] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    slots: bool = ...,
-    frozen: bool = ...,
-    weakref_slot: bool = ...,
-    str: bool = ...,
-    auto_attribs: bool = ...,
-    kw_only: bool = ...,
-    cache_hash: bool = ...,
-    auto_exc: bool = ...,
-    eq: Optional[bool] = ...,
-    order: Optional[bool] = ...,
-    auto_detect: bool = ...,
-    getstate_setstate: Optional[bool] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    field_transformer: Optional[_FieldTransformer] = ...,
-    match_args: bool = ...,
-) -> Callable[[_C], _C]: ...
-def fields(cls: Type[AttrsInstance]) -> Any: ...
-def fields_dict(cls: Type[AttrsInstance]) -> Dict[str, Attribute[Any]]: ...
-def validate(inst: AttrsInstance) -> None: ...
-def resolve_types(
-    cls: _A,
-    globalns: Optional[Dict[str, Any]] = ...,
-    localns: Optional[Dict[str, Any]] = ...,
-    attribs: Optional[List[Attribute[Any]]] = ...,
-    include_extras: bool = ...,
-) -> _A: ...
-
-# TODO: add support for returning a proper attrs class from the mypy plugin
-# we use Any instead of _CountingAttr so that e.g. `make_class('Foo',
-# [attr.ib()])` is valid
-def make_class(
-    name: str,
-    attrs: Union[List[str], Tuple[str, ...], Dict[str, Any]],
-    bases: Tuple[type, ...] = ...,
-    repr_ns: Optional[str] = ...,
-    repr: bool = ...,
-    cmp: Optional[_EqOrderType] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    slots: bool = ...,
-    frozen: bool = ...,
-    weakref_slot: bool = ...,
-    str: bool = ...,
-    auto_attribs: bool = ...,
-    kw_only: bool = ...,
-    cache_hash: bool = ...,
-    auto_exc: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    collect_by_mro: bool = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    field_transformer: Optional[_FieldTransformer] = ...,
-) -> type: ...
-
-# _funcs --
-
-# TODO: add support for returning TypedDict from the mypy plugin
-# FIXME: asdict/astuple do not honor their factory args. Waiting on one of
-# these:
-# https://github.com/python/mypy/issues/4236
-# https://github.com/python/typing/issues/253
-# XXX: remember to fix attrs.asdict/astuple too!
-def asdict(
-    inst: AttrsInstance,
-    recurse: bool = ...,
-    filter: Optional[_FilterType[Any]] = ...,
-    dict_factory: Type[Mapping[Any, Any]] = ...,
-    retain_collection_types: bool = ...,
-    value_serializer: Optional[
-        Callable[[type, Attribute[Any], Any], Any]
-    ] = ...,
-    tuple_keys: Optional[bool] = ...,
-) -> Dict[str, Any]: ...
-
-# TODO: add support for returning NamedTuple from the mypy plugin
-def astuple(
-    inst: AttrsInstance,
-    recurse: bool = ...,
-    filter: Optional[_FilterType[Any]] = ...,
-    tuple_factory: Type[Sequence[Any]] = ...,
-    retain_collection_types: bool = ...,
-) -> Tuple[Any, ...]: ...
-def has(cls: type) -> TypeGuard[Type[AttrsInstance]]: ...
-def assoc(inst: _T, **changes: Any) -> _T: ...
-def evolve(inst: _T, **changes: Any) -> _T: ...
-
-# _config --
-
-def set_run_validators(run: bool) -> None: ...
-def get_run_validators() -> bool: ...
-
-# aliases --
-
-s = attributes = attrs
-ib = attr = attrib
-dataclass = attrs  # Technically, partial(attrs, auto_attribs=True) ;)
diff --git a/uno/lib/python/poub/attr/_cmp.py b/uno/lib/python/poub/attr/_cmp.py
deleted file mode 100644
index d9cbe22c..00000000
--- a/uno/lib/python/poub/attr/_cmp.py
+++ /dev/null
@@ -1,155 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-
-import functools
-import types
-
-from ._make import _make_ne
-
-
-_operation_names = {"eq": "==", "lt": "<", "le": "<=", "gt": ">", "ge": ">="}
-
-
-def cmp_using(
-    eq=None,
-    lt=None,
-    le=None,
-    gt=None,
-    ge=None,
-    require_same_type=True,
-    class_name="Comparable",
-):
-    """
-    Create a class that can be passed into `attrs.field`'s ``eq``, ``order``,
-    and ``cmp`` arguments to customize field comparison.
-
-    The resulting class will have a full set of ordering methods if at least
-    one of ``{lt, le, gt, ge}`` and ``eq``  are provided.
-
-    :param Optional[callable] eq: `callable` used to evaluate equality of two
-        objects.
-    :param Optional[callable] lt: `callable` used to evaluate whether one
-        object is less than another object.
-    :param Optional[callable] le: `callable` used to evaluate whether one
-        object is less than or equal to another object.
-    :param Optional[callable] gt: `callable` used to evaluate whether one
-        object is greater than another object.
-    :param Optional[callable] ge: `callable` used to evaluate whether one
-        object is greater than or equal to another object.
-
-    :param bool require_same_type: When `True`, equality and ordering methods
-        will return `NotImplemented` if objects are not of the same type.
-
-    :param Optional[str] class_name: Name of class. Defaults to 'Comparable'.
-
-    See `comparison` for more details.
-
-    .. versionadded:: 21.1.0
-    """
-
-    body = {
-        "__slots__": ["value"],
-        "__init__": _make_init(),
-        "_requirements": [],
-        "_is_comparable_to": _is_comparable_to,
-    }
-
-    # Add operations.
-    num_order_functions = 0
-    has_eq_function = False
-
-    if eq is not None:
-        has_eq_function = True
-        body["__eq__"] = _make_operator("eq", eq)
-        body["__ne__"] = _make_ne()
-
-    if lt is not None:
-        num_order_functions += 1
-        body["__lt__"] = _make_operator("lt", lt)
-
-    if le is not None:
-        num_order_functions += 1
-        body["__le__"] = _make_operator("le", le)
-
-    if gt is not None:
-        num_order_functions += 1
-        body["__gt__"] = _make_operator("gt", gt)
-
-    if ge is not None:
-        num_order_functions += 1
-        body["__ge__"] = _make_operator("ge", ge)
-
-    type_ = types.new_class(
-        class_name, (object,), {}, lambda ns: ns.update(body)
-    )
-
-    # Add same type requirement.
-    if require_same_type:
-        type_._requirements.append(_check_same_type)
-
-    # Add total ordering if at least one operation was defined.
-    if 0 < num_order_functions < 4:
-        if not has_eq_function:
-            # functools.total_ordering requires __eq__ to be defined,
-            # so raise early error here to keep a nice stack.
-            raise ValueError(
-                "eq must be define is order to complete ordering from "
-                "lt, le, gt, ge."
-            )
-        type_ = functools.total_ordering(type_)
-
-    return type_
-
-
-def _make_init():
-    """
-    Create __init__ method.
-    """
-
-    def __init__(self, value):
-        """
-        Initialize object with *value*.
-        """
-        self.value = value
-
-    return __init__
-
-
-def _make_operator(name, func):
-    """
-    Create operator method.
-    """
-
-    def method(self, other):
-        if not self._is_comparable_to(other):
-            return NotImplemented
-
-        result = func(self.value, other.value)
-        if result is NotImplemented:
-            return NotImplemented
-
-        return result
-
-    method.__name__ = f"__{name}__"
-    method.__doc__ = (
-        f"Return a {_operation_names[name]} b.  Computed by attrs."
-    )
-
-    return method
-
-
-def _is_comparable_to(self, other):
-    """
-    Check whether `other` is comparable to `self`.
-    """
-    for func in self._requirements:
-        if not func(self, other):
-            return False
-    return True
-
-
-def _check_same_type(self, other):
-    """
-    Return True if *self* and *other* are of the same type, False otherwise.
-    """
-    return other.value.__class__ is self.value.__class__
diff --git a/uno/lib/python/poub/attr/_cmp.pyi b/uno/lib/python/poub/attr/_cmp.pyi
deleted file mode 100644
index f3dcdc1a..00000000
--- a/uno/lib/python/poub/attr/_cmp.pyi
+++ /dev/null
@@ -1,13 +0,0 @@
-from typing import Any, Callable, Optional, Type
-
-_CompareWithType = Callable[[Any, Any], bool]
-
-def cmp_using(
-    eq: Optional[_CompareWithType] = ...,
-    lt: Optional[_CompareWithType] = ...,
-    le: Optional[_CompareWithType] = ...,
-    gt: Optional[_CompareWithType] = ...,
-    ge: Optional[_CompareWithType] = ...,
-    require_same_type: bool = ...,
-    class_name: str = ...,
-) -> Type: ...
diff --git a/uno/lib/python/poub/attr/_compat.py b/uno/lib/python/poub/attr/_compat.py
deleted file mode 100644
index c3bf5e33..00000000
--- a/uno/lib/python/poub/attr/_compat.py
+++ /dev/null
@@ -1,185 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-
-import inspect
-import platform
-import sys
-import threading
-import types
-import warnings
-
-from collections.abc import Mapping, Sequence  # noqa
-from typing import _GenericAlias
-
-
-PYPY = platform.python_implementation() == "PyPy"
-PY_3_9_PLUS = sys.version_info[:2] >= (3, 9)
-PY310 = sys.version_info[:2] >= (3, 10)
-PY_3_12_PLUS = sys.version_info[:2] >= (3, 12)
-
-
-def just_warn(*args, **kw):
-    warnings.warn(
-        "Running interpreter doesn't sufficiently support code object "
-        "introspection.  Some features like bare super() or accessing "
-        "__class__ will not work with slotted classes.",
-        RuntimeWarning,
-        stacklevel=2,
-    )
-
-
-class _AnnotationExtractor:
-    """
-    Extract type annotations from a callable, returning None whenever there
-    is none.
-    """
-
-    __slots__ = ["sig"]
-
-    def __init__(self, callable):
-        try:
-            self.sig = inspect.signature(callable)
-        except (ValueError, TypeError):  # inspect failed
-            self.sig = None
-
-    def get_first_param_type(self):
-        """
-        Return the type annotation of the first argument if it's not empty.
-        """
-        if not self.sig:
-            return None
-
-        params = list(self.sig.parameters.values())
-        if params and params[0].annotation is not inspect.Parameter.empty:
-            return params[0].annotation
-
-        return None
-
-    def get_return_type(self):
-        """
-        Return the return type if it's not empty.
-        """
-        if (
-            self.sig
-            and self.sig.return_annotation is not inspect.Signature.empty
-        ):
-            return self.sig.return_annotation
-
-        return None
-
-
-def make_set_closure_cell():
-    """Return a function of two arguments (cell, value) which sets
-    the value stored in the closure cell `cell` to `value`.
-    """
-    # pypy makes this easy. (It also supports the logic below, but
-    # why not do the easy/fast thing?)
-    if PYPY:
-
-        def set_closure_cell(cell, value):
-            cell.__setstate__((value,))
-
-        return set_closure_cell
-
-    # Otherwise gotta do it the hard way.
-
-    try:
-        if sys.version_info >= (3, 8):
-
-            def set_closure_cell(cell, value):
-                cell.cell_contents = value
-
-        else:
-            # Create a function that will set its first cellvar to `value`.
-            def set_first_cellvar_to(value):
-                x = value
-                return
-
-                # This function will be eliminated as dead code, but
-                # not before its reference to `x` forces `x` to be
-                # represented as a closure cell rather than a local.
-                def force_x_to_be_a_cell():  # pragma: no cover
-                    return x
-
-            # Extract the code object and make sure our assumptions about
-            # the closure behavior are correct.
-            co = set_first_cellvar_to.__code__
-            if co.co_cellvars != ("x",) or co.co_freevars != ():
-                raise AssertionError  # pragma: no cover
-
-            # Convert this code object to a code object that sets the
-            # function's first _freevar_ (not cellvar) to the argument.
-            args = [co.co_argcount]
-            args.append(co.co_kwonlyargcount)
-            args.extend(
-                [
-                    co.co_nlocals,
-                    co.co_stacksize,
-                    co.co_flags,
-                    co.co_code,
-                    co.co_consts,
-                    co.co_names,
-                    co.co_varnames,
-                    co.co_filename,
-                    co.co_name,
-                    co.co_firstlineno,
-                    co.co_lnotab,
-                    # These two arguments are reversed:
-                    co.co_cellvars,
-                    co.co_freevars,
-                ]
-            )
-            set_first_freevar_code = types.CodeType(*args)
-
-            def set_closure_cell(cell, value):
-                # Create a function using the set_first_freevar_code,
-                # whose first closure cell is `cell`. Calling it will
-                # change the value of that cell.
-                setter = types.FunctionType(
-                    set_first_freevar_code, {}, "setter", (), (cell,)
-                )
-                # And call it to set the cell.
-                setter(value)
-
-        # Make sure it works on this interpreter:
-        def make_func_with_cell():
-            x = None
-
-            def func():
-                return x  # pragma: no cover
-
-            return func
-
-        cell = make_func_with_cell().__closure__[0]
-        set_closure_cell(cell, 100)
-        if cell.cell_contents != 100:
-            raise AssertionError  # pragma: no cover
-
-    except Exception:
-        return just_warn
-    else:
-        return set_closure_cell
-
-
-set_closure_cell = make_set_closure_cell()
-
-# Thread-local global to track attrs instances which are already being repr'd.
-# This is needed because there is no other (thread-safe) way to pass info
-# about the instances that are already being repr'd through the call stack
-# in order to ensure we don't perform infinite recursion.
-#
-# For instance, if an instance contains a dict which contains that instance,
-# we need to know that we're already repr'ing the outside instance from within
-# the dict's repr() call.
-#
-# This lives here rather than in _make.py so that the functions in _make.py
-# don't have a direct reference to the thread-local in their globals dict.
-# If they have such a reference, it breaks cloudpickle.
-repr_context = threading.local()
-
-
-def get_generic_base(cl):
-    """If this is a generic class (A[str]), return the generic base for it."""
-    if cl.__class__ is _GenericAlias:
-        return cl.__origin__
-    return None
diff --git a/uno/lib/python/poub/attr/_config.py b/uno/lib/python/poub/attr/_config.py
deleted file mode 100644
index 96d42007..00000000
--- a/uno/lib/python/poub/attr/_config.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-
-__all__ = ["set_run_validators", "get_run_validators"]
-
-_run_validators = True
-
-
-def set_run_validators(run):
-    """
-    Set whether or not validators are run.  By default, they are run.
-
-    .. deprecated:: 21.3.0 It will not be removed, but it also will not be
-        moved to new ``attrs`` namespace. Use `attrs.validators.set_disabled()`
-        instead.
-    """
-    if not isinstance(run, bool):
-        raise TypeError("'run' must be bool.")
-    global _run_validators
-    _run_validators = run
-
-
-def get_run_validators():
-    """
-    Return whether or not validators are run.
-
-    .. deprecated:: 21.3.0 It will not be removed, but it also will not be
-        moved to new ``attrs`` namespace. Use `attrs.validators.get_disabled()`
-        instead.
-    """
-    return _run_validators
diff --git a/uno/lib/python/poub/attr/_funcs.py b/uno/lib/python/poub/attr/_funcs.py
deleted file mode 100644
index 7f5d9610..00000000
--- a/uno/lib/python/poub/attr/_funcs.py
+++ /dev/null
@@ -1,477 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-
-import copy
-
-from ._compat import PY_3_9_PLUS, get_generic_base
-from ._make import NOTHING, _obj_setattr, fields
-from .exceptions import AttrsAttributeNotFoundError
-
-
-def asdict(
-    inst,
-    recurse=True,
-    filter=None,
-    dict_factory=dict,
-    retain_collection_types=False,
-    value_serializer=None,
-):
-    """
-    Return the *attrs* attribute values of *inst* as a dict.
-
-    Optionally recurse into other *attrs*-decorated classes.
-
-    :param inst: Instance of an *attrs*-decorated class.
-    :param bool recurse: Recurse into classes that are also
-        *attrs*-decorated.
-    :param callable filter: A callable whose return code determines whether an
-        attribute or element is included (``True``) or dropped (``False``).  Is
-        called with the `attrs.Attribute` as the first argument and the
-        value as the second argument.
-    :param callable dict_factory: A callable to produce dictionaries from.  For
-        example, to produce ordered dictionaries instead of normal Python
-        dictionaries, pass in ``collections.OrderedDict``.
-    :param bool retain_collection_types: Do not convert to ``list`` when
-        encountering an attribute whose type is ``tuple`` or ``set``.  Only
-        meaningful if ``recurse`` is ``True``.
-    :param Optional[callable] value_serializer: A hook that is called for every
-        attribute or dict key/value.  It receives the current instance, field
-        and value and must return the (updated) value.  The hook is run *after*
-        the optional *filter* has been applied.
-
-    :rtype: return type of *dict_factory*
-
-    :raise attrs.exceptions.NotAnAttrsClassError: If *cls* is not an *attrs*
-        class.
-
-    ..  versionadded:: 16.0.0 *dict_factory*
-    ..  versionadded:: 16.1.0 *retain_collection_types*
-    ..  versionadded:: 20.3.0 *value_serializer*
-    ..  versionadded:: 21.3.0 If a dict has a collection for a key, it is
-        serialized as a tuple.
-    """
-    attrs = fields(inst.__class__)
-    rv = dict_factory()
-    for a in attrs:
-        v = getattr(inst, a.name)
-        if filter is not None and not filter(a, v):
-            continue
-
-        if value_serializer is not None:
-            v = value_serializer(inst, a, v)
-
-        if recurse is True:
-            if has(v.__class__):
-                rv[a.name] = asdict(
-                    v,
-                    recurse=True,
-                    filter=filter,
-                    dict_factory=dict_factory,
-                    retain_collection_types=retain_collection_types,
-                    value_serializer=value_serializer,
-                )
-            elif isinstance(v, (tuple, list, set, frozenset)):
-                cf = v.__class__ if retain_collection_types is True else list
-                rv[a.name] = cf(
-                    [
-                        _asdict_anything(
-                            i,
-                            is_key=False,
-                            filter=filter,
-                            dict_factory=dict_factory,
-                            retain_collection_types=retain_collection_types,
-                            value_serializer=value_serializer,
-                        )
-                        for i in v
-                    ]
-                )
-            elif isinstance(v, dict):
-                df = dict_factory
-                rv[a.name] = df(
-                    (
-                        _asdict_anything(
-                            kk,
-                            is_key=True,
-                            filter=filter,
-                            dict_factory=df,
-                            retain_collection_types=retain_collection_types,
-                            value_serializer=value_serializer,
-                        ),
-                        _asdict_anything(
-                            vv,
-                            is_key=False,
-                            filter=filter,
-                            dict_factory=df,
-                            retain_collection_types=retain_collection_types,
-                            value_serializer=value_serializer,
-                        ),
-                    )
-                    for kk, vv in v.items()
-                )
-            else:
-                rv[a.name] = v
-        else:
-            rv[a.name] = v
-    return rv
-
-
-def _asdict_anything(
-    val,
-    is_key,
-    filter,
-    dict_factory,
-    retain_collection_types,
-    value_serializer,
-):
-    """
-    ``asdict`` only works on attrs instances, this works on anything.
-    """
-    if getattr(val.__class__, "__attrs_attrs__", None) is not None:
-        # Attrs class.
-        rv = asdict(
-            val,
-            recurse=True,
-            filter=filter,
-            dict_factory=dict_factory,
-            retain_collection_types=retain_collection_types,
-            value_serializer=value_serializer,
-        )
-    elif isinstance(val, (tuple, list, set, frozenset)):
-        if retain_collection_types is True:
-            cf = val.__class__
-        elif is_key:
-            cf = tuple
-        else:
-            cf = list
-
-        rv = cf(
-            [
-                _asdict_anything(
-                    i,
-                    is_key=False,
-                    filter=filter,
-                    dict_factory=dict_factory,
-                    retain_collection_types=retain_collection_types,
-                    value_serializer=value_serializer,
-                )
-                for i in val
-            ]
-        )
-    elif isinstance(val, dict):
-        df = dict_factory
-        rv = df(
-            (
-                _asdict_anything(
-                    kk,
-                    is_key=True,
-                    filter=filter,
-                    dict_factory=df,
-                    retain_collection_types=retain_collection_types,
-                    value_serializer=value_serializer,
-                ),
-                _asdict_anything(
-                    vv,
-                    is_key=False,
-                    filter=filter,
-                    dict_factory=df,
-                    retain_collection_types=retain_collection_types,
-                    value_serializer=value_serializer,
-                ),
-            )
-            for kk, vv in val.items()
-        )
-    else:
-        rv = val
-        if value_serializer is not None:
-            rv = value_serializer(None, None, rv)
-
-    return rv
-
-
-def astuple(
-    inst,
-    recurse=True,
-    filter=None,
-    tuple_factory=tuple,
-    retain_collection_types=False,
-):
-    """
-    Return the *attrs* attribute values of *inst* as a tuple.
-
-    Optionally recurse into other *attrs*-decorated classes.
-
-    :param inst: Instance of an *attrs*-decorated class.
-    :param bool recurse: Recurse into classes that are also
-        *attrs*-decorated.
-    :param callable filter: A callable whose return code determines whether an
-        attribute or element is included (``True``) or dropped (``False``).  Is
-        called with the `attrs.Attribute` as the first argument and the
-        value as the second argument.
-    :param callable tuple_factory: A callable to produce tuples from.  For
-        example, to produce lists instead of tuples.
-    :param bool retain_collection_types: Do not convert to ``list``
-        or ``dict`` when encountering an attribute which type is
-        ``tuple``, ``dict`` or ``set``.  Only meaningful if ``recurse`` is
-        ``True``.
-
-    :rtype: return type of *tuple_factory*
-
-    :raise attrs.exceptions.NotAnAttrsClassError: If *cls* is not an *attrs*
-        class.
-
-    ..  versionadded:: 16.2.0
-    """
-    attrs = fields(inst.__class__)
-    rv = []
-    retain = retain_collection_types  # Very long. :/
-    for a in attrs:
-        v = getattr(inst, a.name)
-        if filter is not None and not filter(a, v):
-            continue
-        if recurse is True:
-            if has(v.__class__):
-                rv.append(
-                    astuple(
-                        v,
-                        recurse=True,
-                        filter=filter,
-                        tuple_factory=tuple_factory,
-                        retain_collection_types=retain,
-                    )
-                )
-            elif isinstance(v, (tuple, list, set, frozenset)):
-                cf = v.__class__ if retain is True else list
-                rv.append(
-                    cf(
-                        [
-                            astuple(
-                                j,
-                                recurse=True,
-                                filter=filter,
-                                tuple_factory=tuple_factory,
-                                retain_collection_types=retain,
-                            )
-                            if has(j.__class__)
-                            else j
-                            for j in v
-                        ]
-                    )
-                )
-            elif isinstance(v, dict):
-                df = v.__class__ if retain is True else dict
-                rv.append(
-                    df(
-                        (
-                            astuple(
-                                kk,
-                                tuple_factory=tuple_factory,
-                                retain_collection_types=retain,
-                            )
-                            if has(kk.__class__)
-                            else kk,
-                            astuple(
-                                vv,
-                                tuple_factory=tuple_factory,
-                                retain_collection_types=retain,
-                            )
-                            if has(vv.__class__)
-                            else vv,
-                        )
-                        for kk, vv in v.items()
-                    )
-                )
-            else:
-                rv.append(v)
-        else:
-            rv.append(v)
-
-    return rv if tuple_factory is list else tuple_factory(rv)
-
-
-def has(cls):
-    """
-    Check whether *cls* is a class with *attrs* attributes.
-
-    :param type cls: Class to introspect.
-    :raise TypeError: If *cls* is not a class.
-
-    :rtype: bool
-    """
-    attrs = getattr(cls, "__attrs_attrs__", None)
-    if attrs is not None:
-        return True
-
-    # No attrs, maybe it's a specialized generic (A[str])?
-    generic_base = get_generic_base(cls)
-    if generic_base is not None:
-        generic_attrs = getattr(generic_base, "__attrs_attrs__", None)
-        if generic_attrs is not None:
-            # Stick it on here for speed next time.
-            cls.__attrs_attrs__ = generic_attrs
-        return generic_attrs is not None
-    return False
-
-
-def assoc(inst, **changes):
-    """
-    Copy *inst* and apply *changes*.
-
-    This is different from `evolve` that applies the changes to the arguments
-    that create the new instance.
-
-    `evolve`'s behavior is preferable, but there are `edge cases`_ where it
-    doesn't work. Therefore `assoc` is deprecated, but will not be removed.
-
-    .. _`edge cases`: https://github.com/python-attrs/attrs/issues/251
-
-    :param inst: Instance of a class with *attrs* attributes.
-    :param changes: Keyword changes in the new copy.
-
-    :return: A copy of inst with *changes* incorporated.
-
-    :raise attrs.exceptions.AttrsAttributeNotFoundError: If *attr_name*
-        couldn't be found on *cls*.
-    :raise attrs.exceptions.NotAnAttrsClassError: If *cls* is not an *attrs*
-        class.
-
-    ..  deprecated:: 17.1.0
-        Use `attrs.evolve` instead if you can.
-        This function will not be removed du to the slightly different approach
-        compared to `attrs.evolve`.
-    """
-    new = copy.copy(inst)
-    attrs = fields(inst.__class__)
-    for k, v in changes.items():
-        a = getattr(attrs, k, NOTHING)
-        if a is NOTHING:
-            raise AttrsAttributeNotFoundError(
-                f"{k} is not an attrs attribute on {new.__class__}."
-            )
-        _obj_setattr(new, k, v)
-    return new
-
-
-def evolve(*args, **changes):
-    """
-    Create a new instance, based on the first positional argument with
-    *changes* applied.
-
-    :param inst: Instance of a class with *attrs* attributes.
-    :param changes: Keyword changes in the new copy.
-
-    :return: A copy of inst with *changes* incorporated.
-
-    :raise TypeError: If *attr_name* couldn't be found in the class
-        ``__init__``.
-    :raise attrs.exceptions.NotAnAttrsClassError: If *cls* is not an *attrs*
-        class.
-
-    .. versionadded:: 17.1.0
-    .. deprecated:: 23.1.0
-       It is now deprecated to pass the instance using the keyword argument
-       *inst*. It will raise a warning until at least April 2024, after which
-       it will become an error. Always pass the instance as a positional
-       argument.
-    """
-    # Try to get instance by positional argument first.
-    # Use changes otherwise and warn it'll break.
-    if args:
-        try:
-            (inst,) = args
-        except ValueError:
-            raise TypeError(
-                f"evolve() takes 1 positional argument, but {len(args)} "
-                "were given"
-            ) from None
-    else:
-        try:
-            inst = changes.pop("inst")
-        except KeyError:
-            raise TypeError(
-                "evolve() missing 1 required positional argument: 'inst'"
-            ) from None
-
-        import warnings
-
-        warnings.warn(
-            "Passing the instance per keyword argument is deprecated and "
-            "will stop working in, or after, April 2024.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-
-    cls = inst.__class__
-    attrs = fields(cls)
-    for a in attrs:
-        if not a.init:
-            continue
-        attr_name = a.name  # To deal with private attributes.
-        init_name = a.alias
-        if init_name not in changes:
-            changes[init_name] = getattr(inst, attr_name)
-
-    return cls(**changes)
-
-
-def resolve_types(
-    cls, globalns=None, localns=None, attribs=None, include_extras=True
-):
-    """
-    Resolve any strings and forward annotations in type annotations.
-
-    This is only required if you need concrete types in `Attribute`'s *type*
-    field. In other words, you don't need to resolve your types if you only
-    use them for static type checking.
-
-    With no arguments, names will be looked up in the module in which the class
-    was created. If this is not what you want, e.g. if the name only exists
-    inside a method, you may pass *globalns* or *localns* to specify other
-    dictionaries in which to look up these names. See the docs of
-    `typing.get_type_hints` for more details.
-
-    :param type cls: Class to resolve.
-    :param Optional[dict] globalns: Dictionary containing global variables.
-    :param Optional[dict] localns: Dictionary containing local variables.
-    :param Optional[list] attribs: List of attribs for the given class.
-        This is necessary when calling from inside a ``field_transformer``
-        since *cls* is not an *attrs* class yet.
-    :param bool include_extras: Resolve more accurately, if possible.
-        Pass ``include_extras`` to ``typing.get_hints``, if supported by the
-        typing module. On supported Python versions (3.9+), this resolves the
-        types more accurately.
-
-    :raise TypeError: If *cls* is not a class.
-    :raise attrs.exceptions.NotAnAttrsClassError: If *cls* is not an *attrs*
-        class and you didn't pass any attribs.
-    :raise NameError: If types cannot be resolved because of missing variables.
-
-    :returns: *cls* so you can use this function also as a class decorator.
-        Please note that you have to apply it **after** `attrs.define`. That
-        means the decorator has to come in the line **before** `attrs.define`.
-
-    ..  versionadded:: 20.1.0
-    ..  versionadded:: 21.1.0 *attribs*
-    ..  versionadded:: 23.1.0 *include_extras*
-
-    """
-    # Since calling get_type_hints is expensive we cache whether we've
-    # done it already.
-    if getattr(cls, "__attrs_types_resolved__", None) != cls:
-        import typing
-
-        kwargs = {"globalns": globalns, "localns": localns}
-
-        if PY_3_9_PLUS:
-            kwargs["include_extras"] = include_extras
-
-        hints = typing.get_type_hints(cls, **kwargs)
-        for field in fields(cls) if attribs is None else attribs:
-            if field.name in hints:
-                # Since fields have been frozen we must work around it.
-                _obj_setattr(field, "type", hints[field.name])
-        # We store the class we resolved so that subclasses know they haven't
-        # been resolved.
-        cls.__attrs_types_resolved__ = cls
-
-    # Return the class so you can use it as a decorator too.
-    return cls
diff --git a/uno/lib/python/poub/attr/_make.py b/uno/lib/python/poub/attr/_make.py
deleted file mode 100644
index d72f738e..00000000
--- a/uno/lib/python/poub/attr/_make.py
+++ /dev/null
@@ -1,2987 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-import copy
-import enum
-import linecache
-import sys
-import types
-import typing
-
-from operator import itemgetter
-
-# We need to import _compat itself in addition to the _compat members to avoid
-# having the thread-local in the globals here.
-from . import _compat, _config, setters
-from ._compat import (
-    PY310,
-    _AnnotationExtractor,
-    get_generic_base,
-    set_closure_cell,
-)
-from .exceptions import (
-    DefaultAlreadySetError,
-    FrozenInstanceError,
-    NotAnAttrsClassError,
-    UnannotatedAttributeError,
-)
-
-
-# This is used at least twice, so cache it here.
-_obj_setattr = object.__setattr__
-_init_converter_pat = "__attr_converter_%s"
-_init_factory_pat = "__attr_factory_%s"
-_classvar_prefixes = (
-    "typing.ClassVar",
-    "t.ClassVar",
-    "ClassVar",
-    "typing_extensions.ClassVar",
-)
-# we don't use a double-underscore prefix because that triggers
-# name mangling when trying to create a slot for the field
-# (when slots=True)
-_hash_cache_field = "_attrs_cached_hash"
-
-_empty_metadata_singleton = types.MappingProxyType({})
-
-# Unique object for unequivocal getattr() defaults.
-_sentinel = object()
-
-_ng_default_on_setattr = setters.pipe(setters.convert, setters.validate)
-
-
-class _Nothing(enum.Enum):
-    """
-    Sentinel to indicate the lack of a value when ``None`` is ambiguous.
-
-    If extending attrs, you can use ``typing.Literal[NOTHING]`` to show
-    that a value may be ``NOTHING``.
-
-    .. versionchanged:: 21.1.0 ``bool(NOTHING)`` is now False.
-    .. versionchanged:: 22.2.0 ``NOTHING`` is now an ``enum.Enum`` variant.
-    """
-
-    NOTHING = enum.auto()
-
-    def __repr__(self):
-        return "NOTHING"
-
-    def __bool__(self):
-        return False
-
-
-NOTHING = _Nothing.NOTHING
-"""
-Sentinel to indicate the lack of a value when ``None`` is ambiguous.
-"""
-
-
-class _CacheHashWrapper(int):
-    """
-    An integer subclass that pickles / copies as None
-
-    This is used for non-slots classes with ``cache_hash=True``, to avoid
-    serializing a potentially (even likely) invalid hash value. Since ``None``
-    is the default value for uncalculated hashes, whenever this is copied,
-    the copy's value for the hash should automatically reset.
-
-    See GH #613 for more details.
-    """
-
-    def __reduce__(self, _none_constructor=type(None), _args=()):
-        return _none_constructor, _args
-
-
-def attrib(
-    default=NOTHING,
-    validator=None,
-    repr=True,
-    cmp=None,
-    hash=None,
-    init=True,
-    metadata=None,
-    type=None,
-    converter=None,
-    factory=None,
-    kw_only=False,
-    eq=None,
-    order=None,
-    on_setattr=None,
-    alias=None,
-):
-    """
-    Create a new attribute on a class.
-
-    ..  warning::
-
-        Does *not* do anything unless the class is also decorated with
-        `attr.s` / `attrs.define` / et cetera!
-
-    Please consider using `attrs.field` in new code (``attr.ib`` will *never*
-    go away, though).
-
-    :param default: A value that is used if an *attrs*-generated ``__init__``
-        is used and no value is passed while instantiating or the attribute is
-        excluded using ``init=False``.
-
-        If the value is an instance of `attrs.Factory`, its callable will be
-        used to construct a new value (useful for mutable data types like lists
-        or dicts).
-
-        If a default is not set (or set manually to `attrs.NOTHING`), a value
-        *must* be supplied when instantiating; otherwise a `TypeError`
-        will be raised.
-
-        The default can also be set using decorator notation as shown below.
-
-    :type default: Any value
-
-    :param callable factory: Syntactic sugar for
-        ``default=attr.Factory(factory)``.
-
-    :param validator: `callable` that is called by *attrs*-generated
-        ``__init__`` methods after the instance has been initialized.  They
-        receive the initialized instance, the :func:`~attrs.Attribute`, and the
-        passed value.
-
-        The return value is *not* inspected so the validator has to throw an
-        exception itself.
-
-        If a `list` is passed, its items are treated as validators and must
-        all pass.
-
-        Validators can be globally disabled and re-enabled using
-        `attrs.validators.get_disabled` / `attrs.validators.set_disabled`.
-
-        The validator can also be set using decorator notation as shown below.
-
-    :type validator: `callable` or a `list` of `callable`\\ s.
-
-    :param repr: Include this attribute in the generated ``__repr__``
-        method. If ``True``, include the attribute; if ``False``, omit it. By
-        default, the built-in ``repr()`` function is used. To override how the
-        attribute value is formatted, pass a ``callable`` that takes a single
-        value and returns a string. Note that the resulting string is used
-        as-is, i.e. it will be used directly *instead* of calling ``repr()``
-        (the default).
-    :type repr: a `bool` or a `callable` to use a custom function.
-
-    :param eq: If ``True`` (default), include this attribute in the
-        generated ``__eq__`` and ``__ne__`` methods that check two instances
-        for equality. To override how the attribute value is compared,
-        pass a ``callable`` that takes a single value and returns the value
-        to be compared.
-    :type eq: a `bool` or a `callable`.
-
-    :param order: If ``True`` (default), include this attributes in the
-        generated ``__lt__``, ``__le__``, ``__gt__`` and ``__ge__`` methods.
-        To override how the attribute value is ordered,
-        pass a ``callable`` that takes a single value and returns the value
-        to be ordered.
-    :type order: a `bool` or a `callable`.
-
-    :param cmp: Setting *cmp* is equivalent to setting *eq* and *order* to the
-        same value. Must not be mixed with *eq* or *order*.
-    :type cmp: a `bool` or a `callable`.
-
-    :param Optional[bool] hash: Include this attribute in the generated
-        ``__hash__`` method.  If ``None`` (default), mirror *eq*'s value.  This
-        is the correct behavior according the Python spec.  Setting this value
-        to anything else than ``None`` is *discouraged*.
-    :param bool init: Include this attribute in the generated ``__init__``
-        method.  It is possible to set this to ``False`` and set a default
-        value.  In that case this attributed is unconditionally initialized
-        with the specified default value or factory.
-    :param callable converter: `callable` that is called by
-        *attrs*-generated ``__init__`` methods to convert attribute's value
-        to the desired format.  It is given the passed-in value, and the
-        returned value will be used as the new value of the attribute.  The
-        value is converted before being passed to the validator, if any.
-    :param metadata: An arbitrary mapping, to be used by third-party
-        components.  See `extending-metadata`.
-
-    :param type: The type of the attribute. Nowadays, the preferred method to
-        specify the type is using a variable annotation (see :pep:`526`).
-        This argument is provided for backward compatibility.
-        Regardless of the approach used, the type will be stored on
-        ``Attribute.type``.
-
-        Please note that *attrs* doesn't do anything with this metadata by
-        itself. You can use it as part of your own code or for
-        `static type checking <types>`.
-    :param kw_only: Make this attribute keyword-only in the generated
-        ``__init__`` (if ``init`` is ``False``, this parameter is ignored).
-    :param on_setattr: Allows to overwrite the *on_setattr* setting from
-        `attr.s`. If left `None`, the *on_setattr* value from `attr.s` is used.
-        Set to `attrs.setters.NO_OP` to run **no** `setattr` hooks for this
-        attribute -- regardless of the setting in `attr.s`.
-    :type on_setattr: `callable`, or a list of callables, or `None`, or
-        `attrs.setters.NO_OP`
-    :param Optional[str] alias: Override this attribute's parameter name in the
-        generated ``__init__`` method. If left `None`, default to ``name``
-        stripped of leading underscores. See `private-attributes`.
-
-    .. versionadded:: 15.2.0 *convert*
-    .. versionadded:: 16.3.0 *metadata*
-    .. versionchanged:: 17.1.0 *validator* can be a ``list`` now.
-    .. versionchanged:: 17.1.0
-       *hash* is ``None`` and therefore mirrors *eq* by default.
-    .. versionadded:: 17.3.0 *type*
-    .. deprecated:: 17.4.0 *convert*
-    .. versionadded:: 17.4.0 *converter* as a replacement for the deprecated
-       *convert* to achieve consistency with other noun-based arguments.
-    .. versionadded:: 18.1.0
-       ``factory=f`` is syntactic sugar for ``default=attr.Factory(f)``.
-    .. versionadded:: 18.2.0 *kw_only*
-    .. versionchanged:: 19.2.0 *convert* keyword argument removed.
-    .. versionchanged:: 19.2.0 *repr* also accepts a custom callable.
-    .. deprecated:: 19.2.0 *cmp* Removal on or after 2021-06-01.
-    .. versionadded:: 19.2.0 *eq* and *order*
-    .. versionadded:: 20.1.0 *on_setattr*
-    .. versionchanged:: 20.3.0 *kw_only* backported to Python 2
-    .. versionchanged:: 21.1.0
-       *eq*, *order*, and *cmp* also accept a custom callable
-    .. versionchanged:: 21.1.0 *cmp* undeprecated
-    .. versionadded:: 22.2.0 *alias*
-    """
-    eq, eq_key, order, order_key = _determine_attrib_eq_order(
-        cmp, eq, order, True
-    )
-
-    if hash is not None and hash is not True and hash is not False:
-        raise TypeError(
-            "Invalid value for hash.  Must be True, False, or None."
-        )
-
-    if factory is not None:
-        if default is not NOTHING:
-            raise ValueError(
-                "The `default` and `factory` arguments are mutually "
-                "exclusive."
-            )
-        if not callable(factory):
-            raise ValueError("The `factory` argument must be a callable.")
-        default = Factory(factory)
-
-    if metadata is None:
-        metadata = {}
-
-    # Apply syntactic sugar by auto-wrapping.
-    if isinstance(on_setattr, (list, tuple)):
-        on_setattr = setters.pipe(*on_setattr)
-
-    if validator and isinstance(validator, (list, tuple)):
-        validator = and_(*validator)
-
-    if converter and isinstance(converter, (list, tuple)):
-        converter = pipe(*converter)
-
-    return _CountingAttr(
-        default=default,
-        validator=validator,
-        repr=repr,
-        cmp=None,
-        hash=hash,
-        init=init,
-        converter=converter,
-        metadata=metadata,
-        type=type,
-        kw_only=kw_only,
-        eq=eq,
-        eq_key=eq_key,
-        order=order,
-        order_key=order_key,
-        on_setattr=on_setattr,
-        alias=alias,
-    )
-
-
-def _compile_and_eval(script, globs, locs=None, filename=""):
-    """
-    "Exec" the script with the given global (globs) and local (locs) variables.
-    """
-    bytecode = compile(script, filename, "exec")
-    eval(bytecode, globs, locs)
-
-
-def _make_method(name, script, filename, globs):
-    """
-    Create the method with the script given and return the method object.
-    """
-    locs = {}
-
-    # In order of debuggers like PDB being able to step through the code,
-    # we add a fake linecache entry.
-    count = 1
-    base_filename = filename
-    while True:
-        linecache_tuple = (
-            len(script),
-            None,
-            script.splitlines(True),
-            filename,
-        )
-        old_val = linecache.cache.setdefault(filename, linecache_tuple)
-        if old_val == linecache_tuple:
-            break
-        else:
-            filename = f"{base_filename[:-1]}-{count}>"
-            count += 1
-
-    _compile_and_eval(script, globs, locs, filename)
-
-    return locs[name]
-
-
-def _make_attr_tuple_class(cls_name, attr_names):
-    """
-    Create a tuple subclass to hold `Attribute`s for an `attrs` class.
-
-    The subclass is a bare tuple with properties for names.
-
-    class MyClassAttributes(tuple):
-        __slots__ = ()
-        x = property(itemgetter(0))
-    """
-    attr_class_name = f"{cls_name}Attributes"
-    attr_class_template = [
-        f"class {attr_class_name}(tuple):",
-        "    __slots__ = ()",
-    ]
-    if attr_names:
-        for i, attr_name in enumerate(attr_names):
-            attr_class_template.append(
-                f"    {attr_name} = _attrs_property(_attrs_itemgetter({i}))"
-            )
-    else:
-        attr_class_template.append("    pass")
-    globs = {"_attrs_itemgetter": itemgetter, "_attrs_property": property}
-    _compile_and_eval("\n".join(attr_class_template), globs)
-    return globs[attr_class_name]
-
-
-# Tuple class for extracted attributes from a class definition.
-# `base_attrs` is a subset of `attrs`.
-_Attributes = _make_attr_tuple_class(
-    "_Attributes",
-    [
-        # all attributes to build dunder methods for
-        "attrs",
-        # attributes that have been inherited
-        "base_attrs",
-        # map inherited attributes to their originating classes
-        "base_attrs_map",
-    ],
-)
-
-
-def _is_class_var(annot):
-    """
-    Check whether *annot* is a typing.ClassVar.
-
-    The string comparison hack is used to avoid evaluating all string
-    annotations which would put attrs-based classes at a performance
-    disadvantage compared to plain old classes.
-    """
-    annot = str(annot)
-
-    # Annotation can be quoted.
-    if annot.startswith(("'", '"')) and annot.endswith(("'", '"')):
-        annot = annot[1:-1]
-
-    return annot.startswith(_classvar_prefixes)
-
-
-def _has_own_attribute(cls, attrib_name):
-    """
-    Check whether *cls* defines *attrib_name* (and doesn't just inherit it).
-    """
-    attr = getattr(cls, attrib_name, _sentinel)
-    if attr is _sentinel:
-        return False
-
-    for base_cls in cls.__mro__[1:]:
-        a = getattr(base_cls, attrib_name, None)
-        if attr is a:
-            return False
-
-    return True
-
-
-def _get_annotations(cls):
-    """
-    Get annotations for *cls*.
-    """
-    if _has_own_attribute(cls, "__annotations__"):
-        return cls.__annotations__
-
-    return {}
-
-
-def _collect_base_attrs(cls, taken_attr_names):
-    """
-    Collect attr.ibs from base classes of *cls*, except *taken_attr_names*.
-    """
-    base_attrs = []
-    base_attr_map = {}  # A dictionary of base attrs to their classes.
-
-    # Traverse the MRO and collect attributes.
-    for base_cls in reversed(cls.__mro__[1:-1]):
-        for a in getattr(base_cls, "__attrs_attrs__", []):
-            if a.inherited or a.name in taken_attr_names:
-                continue
-
-            a = a.evolve(inherited=True)
-            base_attrs.append(a)
-            base_attr_map[a.name] = base_cls
-
-    # For each name, only keep the freshest definition i.e. the furthest at the
-    # back.  base_attr_map is fine because it gets overwritten with every new
-    # instance.
-    filtered = []
-    seen = set()
-    for a in reversed(base_attrs):
-        if a.name in seen:
-            continue
-        filtered.insert(0, a)
-        seen.add(a.name)
-
-    return filtered, base_attr_map
-
-
-def _collect_base_attrs_broken(cls, taken_attr_names):
-    """
-    Collect attr.ibs from base classes of *cls*, except *taken_attr_names*.
-
-    N.B. *taken_attr_names* will be mutated.
-
-    Adhere to the old incorrect behavior.
-
-    Notably it collects from the front and considers inherited attributes which
-    leads to the buggy behavior reported in #428.
-    """
-    base_attrs = []
-    base_attr_map = {}  # A dictionary of base attrs to their classes.
-
-    # Traverse the MRO and collect attributes.
-    for base_cls in cls.__mro__[1:-1]:
-        for a in getattr(base_cls, "__attrs_attrs__", []):
-            if a.name in taken_attr_names:
-                continue
-
-            a = a.evolve(inherited=True)
-            taken_attr_names.add(a.name)
-            base_attrs.append(a)
-            base_attr_map[a.name] = base_cls
-
-    return base_attrs, base_attr_map
-
-
-def _transform_attrs(
-    cls, these, auto_attribs, kw_only, collect_by_mro, field_transformer
-):
-    """
-    Transform all `_CountingAttr`s on a class into `Attribute`s.
-
-    If *these* is passed, use that and don't look for them on the class.
-
-    *collect_by_mro* is True, collect them in the correct MRO order, otherwise
-    use the old -- incorrect -- order.  See #428.
-
-    Return an `_Attributes`.
-    """
-    cd = cls.__dict__
-    anns = _get_annotations(cls)
-
-    if these is not None:
-        ca_list = [(name, ca) for name, ca in these.items()]
-    elif auto_attribs is True:
-        ca_names = {
-            name
-            for name, attr in cd.items()
-            if isinstance(attr, _CountingAttr)
-        }
-        ca_list = []
-        annot_names = set()
-        for attr_name, type in anns.items():
-            if _is_class_var(type):
-                continue
-            annot_names.add(attr_name)
-            a = cd.get(attr_name, NOTHING)
-
-            if not isinstance(a, _CountingAttr):
-                if a is NOTHING:
-                    a = attrib()
-                else:
-                    a = attrib(default=a)
-            ca_list.append((attr_name, a))
-
-        unannotated = ca_names - annot_names
-        if len(unannotated) > 0:
-            raise UnannotatedAttributeError(
-                "The following `attr.ib`s lack a type annotation: "
-                + ", ".join(
-                    sorted(unannotated, key=lambda n: cd.get(n).counter)
-                )
-                + "."
-            )
-    else:
-        ca_list = sorted(
-            (
-                (name, attr)
-                for name, attr in cd.items()
-                if isinstance(attr, _CountingAttr)
-            ),
-            key=lambda e: e[1].counter,
-        )
-
-    own_attrs = [
-        Attribute.from_counting_attr(
-            name=attr_name, ca=ca, type=anns.get(attr_name)
-        )
-        for attr_name, ca in ca_list
-    ]
-
-    if collect_by_mro:
-        base_attrs, base_attr_map = _collect_base_attrs(
-            cls, {a.name for a in own_attrs}
-        )
-    else:
-        base_attrs, base_attr_map = _collect_base_attrs_broken(
-            cls, {a.name for a in own_attrs}
-        )
-
-    if kw_only:
-        own_attrs = [a.evolve(kw_only=True) for a in own_attrs]
-        base_attrs = [a.evolve(kw_only=True) for a in base_attrs]
-
-    attrs = base_attrs + own_attrs
-
-    # Mandatory vs non-mandatory attr order only matters when they are part of
-    # the __init__ signature and when they aren't kw_only (which are moved to
-    # the end and can be mandatory or non-mandatory in any order, as they will
-    # be specified as keyword args anyway). Check the order of those attrs:
-    had_default = False
-    for a in (a for a in attrs if a.init is not False and a.kw_only is False):
-        if had_default is True and a.default is NOTHING:
-            raise ValueError(
-                "No mandatory attributes allowed after an attribute with a "
-                f"default value or factory.  Attribute in question: {a!r}"
-            )
-
-        if had_default is False and a.default is not NOTHING:
-            had_default = True
-
-    if field_transformer is not None:
-        attrs = field_transformer(cls, attrs)
-
-    # Resolve default field alias after executing field_transformer.
-    # This allows field_transformer to differentiate between explicit vs
-    # default aliases and supply their own defaults.
-    attrs = [
-        a.evolve(alias=_default_init_alias_for(a.name)) if not a.alias else a
-        for a in attrs
-    ]
-
-    # Create AttrsClass *after* applying the field_transformer since it may
-    # add or remove attributes!
-    attr_names = [a.name for a in attrs]
-    AttrsClass = _make_attr_tuple_class(cls.__name__, attr_names)
-
-    return _Attributes((AttrsClass(attrs), base_attrs, base_attr_map))
-
-
-def _frozen_setattrs(self, name, value):
-    """
-    Attached to frozen classes as __setattr__.
-    """
-    if isinstance(self, BaseException) and name in (
-        "__cause__",
-        "__context__",
-        "__traceback__",
-    ):
-        BaseException.__setattr__(self, name, value)
-        return
-
-    raise FrozenInstanceError()
-
-
-def _frozen_delattrs(self, name):
-    """
-    Attached to frozen classes as __delattr__.
-    """
-    raise FrozenInstanceError()
-
-
-class _ClassBuilder:
-    """
-    Iteratively build *one* class.
-    """
-
-    __slots__ = (
-        "_attr_names",
-        "_attrs",
-        "_base_attr_map",
-        "_base_names",
-        "_cache_hash",
-        "_cls",
-        "_cls_dict",
-        "_delete_attribs",
-        "_frozen",
-        "_has_pre_init",
-        "_has_post_init",
-        "_is_exc",
-        "_on_setattr",
-        "_slots",
-        "_weakref_slot",
-        "_wrote_own_setattr",
-        "_has_custom_setattr",
-    )
-
-    def __init__(
-        self,
-        cls,
-        these,
-        slots,
-        frozen,
-        weakref_slot,
-        getstate_setstate,
-        auto_attribs,
-        kw_only,
-        cache_hash,
-        is_exc,
-        collect_by_mro,
-        on_setattr,
-        has_custom_setattr,
-        field_transformer,
-    ):
-        attrs, base_attrs, base_map = _transform_attrs(
-            cls,
-            these,
-            auto_attribs,
-            kw_only,
-            collect_by_mro,
-            field_transformer,
-        )
-
-        self._cls = cls
-        self._cls_dict = dict(cls.__dict__) if slots else {}
-        self._attrs = attrs
-        self._base_names = {a.name for a in base_attrs}
-        self._base_attr_map = base_map
-        self._attr_names = tuple(a.name for a in attrs)
-        self._slots = slots
-        self._frozen = frozen
-        self._weakref_slot = weakref_slot
-        self._cache_hash = cache_hash
-        self._has_pre_init = bool(getattr(cls, "__attrs_pre_init__", False))
-        self._has_post_init = bool(getattr(cls, "__attrs_post_init__", False))
-        self._delete_attribs = not bool(these)
-        self._is_exc = is_exc
-        self._on_setattr = on_setattr
-
-        self._has_custom_setattr = has_custom_setattr
-        self._wrote_own_setattr = False
-
-        self._cls_dict["__attrs_attrs__"] = self._attrs
-
-        if frozen:
-            self._cls_dict["__setattr__"] = _frozen_setattrs
-            self._cls_dict["__delattr__"] = _frozen_delattrs
-
-            self._wrote_own_setattr = True
-        elif on_setattr in (
-            _ng_default_on_setattr,
-            setters.validate,
-            setters.convert,
-        ):
-            has_validator = has_converter = False
-            for a in attrs:
-                if a.validator is not None:
-                    has_validator = True
-                if a.converter is not None:
-                    has_converter = True
-
-                if has_validator and has_converter:
-                    break
-            if (
-                (
-                    on_setattr == _ng_default_on_setattr
-                    and not (has_validator or has_converter)
-                )
-                or (on_setattr == setters.validate and not has_validator)
-                or (on_setattr == setters.convert and not has_converter)
-            ):
-                # If class-level on_setattr is set to convert + validate, but
-                # there's no field to convert or validate, pretend like there's
-                # no on_setattr.
-                self._on_setattr = None
-
-        if getstate_setstate:
-            (
-                self._cls_dict["__getstate__"],
-                self._cls_dict["__setstate__"],
-            ) = self._make_getstate_setstate()
-
-    def __repr__(self):
-        return f"<_ClassBuilder(cls={self._cls.__name__})>"
-
-    if PY310:
-        import abc
-
-        def build_class(self):
-            """
-            Finalize class based on the accumulated configuration.
-
-            Builder cannot be used after calling this method.
-            """
-            if self._slots is True:
-                return self._create_slots_class()
-
-            return self.abc.update_abstractmethods(
-                self._patch_original_class()
-            )
-
-    else:
-
-        def build_class(self):
-            """
-            Finalize class based on the accumulated configuration.
-
-            Builder cannot be used after calling this method.
-            """
-            if self._slots is True:
-                return self._create_slots_class()
-
-            return self._patch_original_class()
-
-    def _patch_original_class(self):
-        """
-        Apply accumulated methods and return the class.
-        """
-        cls = self._cls
-        base_names = self._base_names
-
-        # Clean class of attribute definitions (`attr.ib()`s).
-        if self._delete_attribs:
-            for name in self._attr_names:
-                if (
-                    name not in base_names
-                    and getattr(cls, name, _sentinel) is not _sentinel
-                ):
-                    try:
-                        delattr(cls, name)
-                    except AttributeError:
-                        # This can happen if a base class defines a class
-                        # variable and we want to set an attribute with the
-                        # same name by using only a type annotation.
-                        pass
-
-        # Attach our dunder methods.
-        for name, value in self._cls_dict.items():
-            setattr(cls, name, value)
-
-        # If we've inherited an attrs __setattr__ and don't write our own,
-        # reset it to object's.
-        if not self._wrote_own_setattr and getattr(
-            cls, "__attrs_own_setattr__", False
-        ):
-            cls.__attrs_own_setattr__ = False
-
-            if not self._has_custom_setattr:
-                cls.__setattr__ = _obj_setattr
-
-        return cls
-
-    def _create_slots_class(self):
-        """
-        Build and return a new class with a `__slots__` attribute.
-        """
-        cd = {
-            k: v
-            for k, v in self._cls_dict.items()
-            if k not in tuple(self._attr_names) + ("__dict__", "__weakref__")
-        }
-
-        # If our class doesn't have its own implementation of __setattr__
-        # (either from the user or by us), check the bases, if one of them has
-        # an attrs-made __setattr__, that needs to be reset. We don't walk the
-        # MRO because we only care about our immediate base classes.
-        # XXX: This can be confused by subclassing a slotted attrs class with
-        # XXX: a non-attrs class and subclass the resulting class with an attrs
-        # XXX: class.  See `test_slotted_confused` for details.  For now that's
-        # XXX: OK with us.
-        if not self._wrote_own_setattr:
-            cd["__attrs_own_setattr__"] = False
-
-            if not self._has_custom_setattr:
-                for base_cls in self._cls.__bases__:
-                    if base_cls.__dict__.get("__attrs_own_setattr__", False):
-                        cd["__setattr__"] = _obj_setattr
-                        break
-
-        # Traverse the MRO to collect existing slots
-        # and check for an existing __weakref__.
-        existing_slots = dict()
-        weakref_inherited = False
-        for base_cls in self._cls.__mro__[1:-1]:
-            if base_cls.__dict__.get("__weakref__", None) is not None:
-                weakref_inherited = True
-            existing_slots.update(
-                {
-                    name: getattr(base_cls, name)
-                    for name in getattr(base_cls, "__slots__", [])
-                }
-            )
-
-        base_names = set(self._base_names)
-
-        names = self._attr_names
-        if (
-            self._weakref_slot
-            and "__weakref__" not in getattr(self._cls, "__slots__", ())
-            and "__weakref__" not in names
-            and not weakref_inherited
-        ):
-            names += ("__weakref__",)
-
-        # We only add the names of attributes that aren't inherited.
-        # Setting __slots__ to inherited attributes wastes memory.
-        slot_names = [name for name in names if name not in base_names]
-        # There are slots for attributes from current class
-        # that are defined in parent classes.
-        # As their descriptors may be overridden by a child class,
-        # we collect them here and update the class dict
-        reused_slots = {
-            slot: slot_descriptor
-            for slot, slot_descriptor in existing_slots.items()
-            if slot in slot_names
-        }
-        slot_names = [name for name in slot_names if name not in reused_slots]
-        cd.update(reused_slots)
-        if self._cache_hash:
-            slot_names.append(_hash_cache_field)
-        cd["__slots__"] = tuple(slot_names)
-
-        cd["__qualname__"] = self._cls.__qualname__
-
-        # Create new class based on old class and our methods.
-        cls = type(self._cls)(self._cls.__name__, self._cls.__bases__, cd)
-
-        # The following is a fix for
-        # <https://github.com/python-attrs/attrs/issues/102>.
-        # If a method mentions `__class__` or uses the no-arg super(), the
-        # compiler will bake a reference to the class in the method itself
-        # as `method.__closure__`.  Since we replace the class with a
-        # clone, we rewrite these references so it keeps working.
-        for item in cls.__dict__.values():
-            if isinstance(item, (classmethod, staticmethod)):
-                # Class- and staticmethods hide their functions inside.
-                # These might need to be rewritten as well.
-                closure_cells = getattr(item.__func__, "__closure__", None)
-            elif isinstance(item, property):
-                # Workaround for property `super()` shortcut (PY3-only).
-                # There is no universal way for other descriptors.
-                closure_cells = getattr(item.fget, "__closure__", None)
-            else:
-                closure_cells = getattr(item, "__closure__", None)
-
-            if not closure_cells:  # Catch None or the empty list.
-                continue
-            for cell in closure_cells:
-                try:
-                    match = cell.cell_contents is self._cls
-                except ValueError:  # ValueError: Cell is empty
-                    pass
-                else:
-                    if match:
-                        set_closure_cell(cell, cls)
-
-        return cls
-
-    def add_repr(self, ns):
-        self._cls_dict["__repr__"] = self._add_method_dunders(
-            _make_repr(self._attrs, ns, self._cls)
-        )
-        return self
-
-    def add_str(self):
-        repr = self._cls_dict.get("__repr__")
-        if repr is None:
-            raise ValueError(
-                "__str__ can only be generated if a __repr__ exists."
-            )
-
-        def __str__(self):
-            return self.__repr__()
-
-        self._cls_dict["__str__"] = self._add_method_dunders(__str__)
-        return self
-
-    def _make_getstate_setstate(self):
-        """
-        Create custom __setstate__ and __getstate__ methods.
-        """
-        # __weakref__ is not writable.
-        state_attr_names = tuple(
-            an for an in self._attr_names if an != "__weakref__"
-        )
-
-        def slots_getstate(self):
-            """
-            Automatically created by attrs.
-            """
-            return {name: getattr(self, name) for name in state_attr_names}
-
-        hash_caching_enabled = self._cache_hash
-
-        def slots_setstate(self, state):
-            """
-            Automatically created by attrs.
-            """
-            __bound_setattr = _obj_setattr.__get__(self)
-            if isinstance(state, tuple):
-                # Backward compatibility with attrs instances pickled with
-                # attrs versions before v22.2.0 which stored tuples.
-                for name, value in zip(state_attr_names, state):
-                    __bound_setattr(name, value)
-            else:
-                for name in state_attr_names:
-                    if name in state:
-                        __bound_setattr(name, state[name])
-
-            # The hash code cache is not included when the object is
-            # serialized, but it still needs to be initialized to None to
-            # indicate that the first call to __hash__ should be a cache
-            # miss.
-            if hash_caching_enabled:
-                __bound_setattr(_hash_cache_field, None)
-
-        return slots_getstate, slots_setstate
-
-    def make_unhashable(self):
-        self._cls_dict["__hash__"] = None
-        return self
-
-    def add_hash(self):
-        self._cls_dict["__hash__"] = self._add_method_dunders(
-            _make_hash(
-                self._cls,
-                self._attrs,
-                frozen=self._frozen,
-                cache_hash=self._cache_hash,
-            )
-        )
-
-        return self
-
-    def add_init(self):
-        self._cls_dict["__init__"] = self._add_method_dunders(
-            _make_init(
-                self._cls,
-                self._attrs,
-                self._has_pre_init,
-                self._has_post_init,
-                self._frozen,
-                self._slots,
-                self._cache_hash,
-                self._base_attr_map,
-                self._is_exc,
-                self._on_setattr,
-                attrs_init=False,
-            )
-        )
-
-        return self
-
-    def add_match_args(self):
-        self._cls_dict["__match_args__"] = tuple(
-            field.name
-            for field in self._attrs
-            if field.init and not field.kw_only
-        )
-
-    def add_attrs_init(self):
-        self._cls_dict["__attrs_init__"] = self._add_method_dunders(
-            _make_init(
-                self._cls,
-                self._attrs,
-                self._has_pre_init,
-                self._has_post_init,
-                self._frozen,
-                self._slots,
-                self._cache_hash,
-                self._base_attr_map,
-                self._is_exc,
-                self._on_setattr,
-                attrs_init=True,
-            )
-        )
-
-        return self
-
-    def add_eq(self):
-        cd = self._cls_dict
-
-        cd["__eq__"] = self._add_method_dunders(
-            _make_eq(self._cls, self._attrs)
-        )
-        cd["__ne__"] = self._add_method_dunders(_make_ne())
-
-        return self
-
-    def add_order(self):
-        cd = self._cls_dict
-
-        cd["__lt__"], cd["__le__"], cd["__gt__"], cd["__ge__"] = (
-            self._add_method_dunders(meth)
-            for meth in _make_order(self._cls, self._attrs)
-        )
-
-        return self
-
-    def add_setattr(self):
-        if self._frozen:
-            return self
-
-        sa_attrs = {}
-        for a in self._attrs:
-            on_setattr = a.on_setattr or self._on_setattr
-            if on_setattr and on_setattr is not setters.NO_OP:
-                sa_attrs[a.name] = a, on_setattr
-
-        if not sa_attrs:
-            return self
-
-        if self._has_custom_setattr:
-            # We need to write a __setattr__ but there already is one!
-            raise ValueError(
-                "Can't combine custom __setattr__ with on_setattr hooks."
-            )
-
-        # docstring comes from _add_method_dunders
-        def __setattr__(self, name, val):
-            try:
-                a, hook = sa_attrs[name]
-            except KeyError:
-                nval = val
-            else:
-                nval = hook(self, a, val)
-
-            _obj_setattr(self, name, nval)
-
-        self._cls_dict["__attrs_own_setattr__"] = True
-        self._cls_dict["__setattr__"] = self._add_method_dunders(__setattr__)
-        self._wrote_own_setattr = True
-
-        return self
-
-    def _add_method_dunders(self, method):
-        """
-        Add __module__ and __qualname__ to a *method* if possible.
-        """
-        try:
-            method.__module__ = self._cls.__module__
-        except AttributeError:
-            pass
-
-        try:
-            method.__qualname__ = ".".join(
-                (self._cls.__qualname__, method.__name__)
-            )
-        except AttributeError:
-            pass
-
-        try:
-            method.__doc__ = (
-                "Method generated by attrs for class "
-                f"{self._cls.__qualname__}."
-            )
-        except AttributeError:
-            pass
-
-        return method
-
-
-def _determine_attrs_eq_order(cmp, eq, order, default_eq):
-    """
-    Validate the combination of *cmp*, *eq*, and *order*. Derive the effective
-    values of eq and order.  If *eq* is None, set it to *default_eq*.
-    """
-    if cmp is not None and any((eq is not None, order is not None)):
-        raise ValueError("Don't mix `cmp` with `eq' and `order`.")
-
-    # cmp takes precedence due to bw-compatibility.
-    if cmp is not None:
-        return cmp, cmp
-
-    # If left None, equality is set to the specified default and ordering
-    # mirrors equality.
-    if eq is None:
-        eq = default_eq
-
-    if order is None:
-        order = eq
-
-    if eq is False and order is True:
-        raise ValueError("`order` can only be True if `eq` is True too.")
-
-    return eq, order
-
-
-def _determine_attrib_eq_order(cmp, eq, order, default_eq):
-    """
-    Validate the combination of *cmp*, *eq*, and *order*. Derive the effective
-    values of eq and order.  If *eq* is None, set it to *default_eq*.
-    """
-    if cmp is not None and any((eq is not None, order is not None)):
-        raise ValueError("Don't mix `cmp` with `eq' and `order`.")
-
-    def decide_callable_or_boolean(value):
-        """
-        Decide whether a key function is used.
-        """
-        if callable(value):
-            value, key = True, value
-        else:
-            key = None
-        return value, key
-
-    # cmp takes precedence due to bw-compatibility.
-    if cmp is not None:
-        cmp, cmp_key = decide_callable_or_boolean(cmp)
-        return cmp, cmp_key, cmp, cmp_key
-
-    # If left None, equality is set to the specified default and ordering
-    # mirrors equality.
-    if eq is None:
-        eq, eq_key = default_eq, None
-    else:
-        eq, eq_key = decide_callable_or_boolean(eq)
-
-    if order is None:
-        order, order_key = eq, eq_key
-    else:
-        order, order_key = decide_callable_or_boolean(order)
-
-    if eq is False and order is True:
-        raise ValueError("`order` can only be True if `eq` is True too.")
-
-    return eq, eq_key, order, order_key
-
-
-def _determine_whether_to_implement(
-    cls, flag, auto_detect, dunders, default=True
-):
-    """
-    Check whether we should implement a set of methods for *cls*.
-
-    *flag* is the argument passed into @attr.s like 'init', *auto_detect* the
-    same as passed into @attr.s and *dunders* is a tuple of attribute names
-    whose presence signal that the user has implemented it themselves.
-
-    Return *default* if no reason for either for or against is found.
-    """
-    if flag is True or flag is False:
-        return flag
-
-    if flag is None and auto_detect is False:
-        return default
-
-    # Logically, flag is None and auto_detect is True here.
-    for dunder in dunders:
-        if _has_own_attribute(cls, dunder):
-            return False
-
-    return default
-
-
-def attrs(
-    maybe_cls=None,
-    these=None,
-    repr_ns=None,
-    repr=None,
-    cmp=None,
-    hash=None,
-    init=None,
-    slots=False,
-    frozen=False,
-    weakref_slot=True,
-    str=False,
-    auto_attribs=False,
-    kw_only=False,
-    cache_hash=False,
-    auto_exc=False,
-    eq=None,
-    order=None,
-    auto_detect=False,
-    collect_by_mro=False,
-    getstate_setstate=None,
-    on_setattr=None,
-    field_transformer=None,
-    match_args=True,
-    unsafe_hash=None,
-):
-    r"""
-    A class decorator that adds :term:`dunder methods` according to the
-    specified attributes using `attr.ib` or the *these* argument.
-
-    Please consider using `attrs.define` / `attrs.frozen` in new code
-    (``attr.s`` will *never* go away, though).
-
-    :param these: A dictionary of name to `attr.ib` mappings.  This is
-        useful to avoid the definition of your attributes within the class body
-        because you can't (e.g. if you want to add ``__repr__`` methods to
-        Django models) or don't want to.
-
-        If *these* is not ``None``, *attrs* will *not* search the class body
-        for attributes and will *not* remove any attributes from it.
-
-        The order is deduced from the order of the attributes inside *these*.
-
-    :type these: `dict` of `str` to `attr.ib`
-
-    :param str repr_ns: When using nested classes, there's no way in Python 2
-        to automatically detect that.  Therefore it's possible to set the
-        namespace explicitly for a more meaningful ``repr`` output.
-    :param bool auto_detect: Instead of setting the *init*, *repr*, *eq*,
-        *order*, and *hash* arguments explicitly, assume they are set to
-        ``True`` **unless any** of the involved methods for one of the
-        arguments is implemented in the *current* class (i.e. it is *not*
-        inherited from some base class).
-
-        So for example by implementing ``__eq__`` on a class yourself,
-        *attrs* will deduce ``eq=False`` and will create *neither*
-        ``__eq__`` *nor* ``__ne__`` (but Python classes come with a sensible
-        ``__ne__`` by default, so it *should* be enough to only implement
-        ``__eq__`` in most cases).
-
-        .. warning::
-
-           If you prevent *attrs* from creating the ordering methods for you
-           (``order=False``, e.g. by implementing ``__le__``), it becomes
-           *your* responsibility to make sure its ordering is sound. The best
-           way is to use the `functools.total_ordering` decorator.
-
-
-        Passing ``True`` or ``False`` to *init*, *repr*, *eq*, *order*,
-        *cmp*, or *hash* overrides whatever *auto_detect* would determine.
-
-    :param bool repr: Create a ``__repr__`` method with a human readable
-        representation of *attrs* attributes..
-    :param bool str: Create a ``__str__`` method that is identical to
-        ``__repr__``.  This is usually not necessary except for
-        `Exception`\ s.
-    :param Optional[bool] eq: If ``True`` or ``None`` (default), add ``__eq__``
-        and ``__ne__`` methods that check two instances for equality.
-
-        They compare the instances as if they were tuples of their *attrs*
-        attributes if and only if the types of both classes are *identical*!
-    :param Optional[bool] order: If ``True``, add ``__lt__``, ``__le__``,
-        ``__gt__``, and ``__ge__`` methods that behave like *eq* above and
-        allow instances to be ordered. If ``None`` (default) mirror value of
-        *eq*.
-    :param Optional[bool] cmp: Setting *cmp* is equivalent to setting *eq*
-        and *order* to the same value. Must not be mixed with *eq* or *order*.
-    :param Optional[bool] unsafe_hash: If ``None`` (default), the ``__hash__``
-        method is generated according how *eq* and *frozen* are set.
-
-        1. If *both* are True, *attrs* will generate a ``__hash__`` for you.
-        2. If *eq* is True and *frozen* is False, ``__hash__`` will be set to
-           None, marking it unhashable (which it is).
-        3. If *eq* is False, ``__hash__`` will be left untouched meaning the
-           ``__hash__`` method of the base class will be used (if base class is
-           ``object``, this means it will fall back to id-based hashing.).
-
-        Although not recommended, you can decide for yourself and force
-        *attrs* to create one (e.g. if the class is immutable even though you
-        didn't freeze it programmatically) by passing ``True`` or not.  Both of
-        these cases are rather special and should be used carefully.
-
-        See our documentation on `hashing`, Python's documentation on
-        `object.__hash__`, and the `GitHub issue that led to the default \
-        behavior <https://github.com/python-attrs/attrs/issues/136>`_ for more
-        details.
-    :param Optional[bool] hash: Alias for *unsafe_hash*. *unsafe_hash* takes
-        precedence.
-    :param bool init: Create a ``__init__`` method that initializes the
-        *attrs* attributes. Leading underscores are stripped for the argument
-        name. If a ``__attrs_pre_init__`` method exists on the class, it will
-        be called before the class is initialized. If a ``__attrs_post_init__``
-        method exists on the class, it will be called after the class is fully
-        initialized.
-
-        If ``init`` is ``False``, an ``__attrs_init__`` method will be
-        injected instead. This allows you to define a custom ``__init__``
-        method that can do pre-init work such as ``super().__init__()``,
-        and then call ``__attrs_init__()`` and ``__attrs_post_init__()``.
-    :param bool slots: Create a :term:`slotted class <slotted classes>` that's
-        more memory-efficient. Slotted classes are generally superior to the
-        default dict classes, but have some gotchas you should know about, so
-        we encourage you to read the :term:`glossary entry <slotted classes>`.
-    :param bool frozen: Make instances immutable after initialization.  If
-        someone attempts to modify a frozen instance,
-        `attrs.exceptions.FrozenInstanceError` is raised.
-
-        .. note::
-
-            1. This is achieved by installing a custom ``__setattr__`` method
-               on your class, so you can't implement your own.
-
-            2. True immutability is impossible in Python.
-
-            3. This *does* have a minor a runtime performance `impact
-               <how-frozen>` when initializing new instances.  In other words:
-               ``__init__`` is slightly slower with ``frozen=True``.
-
-            4. If a class is frozen, you cannot modify ``self`` in
-               ``__attrs_post_init__`` or a self-written ``__init__``. You can
-               circumvent that limitation by using
-               ``object.__setattr__(self, "attribute_name", value)``.
-
-            5. Subclasses of a frozen class are frozen too.
-
-    :param bool weakref_slot: Make instances weak-referenceable.  This has no
-        effect unless ``slots`` is also enabled.
-    :param bool auto_attribs: If ``True``, collect :pep:`526`-annotated
-        attributes from the class body.
-
-        In this case, you **must** annotate every field.  If *attrs*
-        encounters a field that is set to an `attr.ib` but lacks a type
-        annotation, an `attr.exceptions.UnannotatedAttributeError` is
-        raised.  Use ``field_name: typing.Any = attr.ib(...)`` if you don't
-        want to set a type.
-
-        If you assign a value to those attributes (e.g. ``x: int = 42``), that
-        value becomes the default value like if it were passed using
-        ``attr.ib(default=42)``.  Passing an instance of `attrs.Factory` also
-        works as expected in most cases (see warning below).
-
-        Attributes annotated as `typing.ClassVar`, and attributes that are
-        neither annotated nor set to an `attr.ib` are **ignored**.
-
-        .. warning::
-           For features that use the attribute name to create decorators (e.g.
-           :ref:`validators <validators>`), you still *must* assign `attr.ib`
-           to them. Otherwise Python will either not find the name or try to
-           use the default value to call e.g. ``validator`` on it.
-
-           These errors can be quite confusing and probably the most common bug
-           report on our bug tracker.
-
-    :param bool kw_only: Make all attributes keyword-only
-        in the generated ``__init__`` (if ``init`` is ``False``, this
-        parameter is ignored).
-    :param bool cache_hash: Ensure that the object's hash code is computed
-        only once and stored on the object.  If this is set to ``True``,
-        hashing must be either explicitly or implicitly enabled for this
-        class.  If the hash code is cached, avoid any reassignments of
-        fields involved in hash code computation or mutations of the objects
-        those fields point to after object creation.  If such changes occur,
-        the behavior of the object's hash code is undefined.
-    :param bool auto_exc: If the class subclasses `BaseException`
-        (which implicitly includes any subclass of any exception), the
-        following happens to behave like a well-behaved Python exceptions
-        class:
-
-        - the values for *eq*, *order*, and *hash* are ignored and the
-          instances compare and hash by the instance's ids (N.B. *attrs* will
-          *not* remove existing implementations of ``__hash__`` or the equality
-          methods. It just won't add own ones.),
-        - all attributes that are either passed into ``__init__`` or have a
-          default value are additionally available as a tuple in the ``args``
-          attribute,
-        - the value of *str* is ignored leaving ``__str__`` to base classes.
-    :param bool collect_by_mro: Setting this to `True` fixes the way *attrs*
-       collects attributes from base classes.  The default behavior is
-       incorrect in certain cases of multiple inheritance.  It should be on by
-       default but is kept off for backward-compatibility.
-
-       See issue `#428 <https://github.com/python-attrs/attrs/issues/428>`_ for
-       more details.
-
-    :param Optional[bool] getstate_setstate:
-       .. note::
-          This is usually only interesting for slotted classes and you should
-          probably just set *auto_detect* to `True`.
-
-       If `True`, ``__getstate__`` and
-       ``__setstate__`` are generated and attached to the class. This is
-       necessary for slotted classes to be pickleable. If left `None`, it's
-       `True` by default for slotted classes and ``False`` for dict classes.
-
-       If *auto_detect* is `True`, and *getstate_setstate* is left `None`,
-       and **either** ``__getstate__`` or ``__setstate__`` is detected directly
-       on the class (i.e. not inherited), it is set to `False` (this is usually
-       what you want).
-
-    :param on_setattr: A callable that is run whenever the user attempts to set
-        an attribute (either by assignment like ``i.x = 42`` or by using
-        `setattr` like ``setattr(i, "x", 42)``). It receives the same arguments
-        as validators: the instance, the attribute that is being modified, and
-        the new value.
-
-        If no exception is raised, the attribute is set to the return value of
-        the callable.
-
-        If a list of callables is passed, they're automatically wrapped in an
-        `attrs.setters.pipe`.
-    :type on_setattr: `callable`, or a list of callables, or `None`, or
-        `attrs.setters.NO_OP`
-
-    :param Optional[callable] field_transformer:
-        A function that is called with the original class object and all
-        fields right before *attrs* finalizes the class.  You can use
-        this, e.g., to automatically add converters or validators to
-        fields based on their types.  See `transform-fields` for more details.
-
-    :param bool match_args:
-        If `True` (default), set ``__match_args__`` on the class to support
-        :pep:`634` (Structural Pattern Matching). It is a tuple of all
-        non-keyword-only ``__init__`` parameter names on Python 3.10 and later.
-        Ignored on older Python versions.
-
-    .. versionadded:: 16.0.0 *slots*
-    .. versionadded:: 16.1.0 *frozen*
-    .. versionadded:: 16.3.0 *str*
-    .. versionadded:: 16.3.0 Support for ``__attrs_post_init__``.
-    .. versionchanged:: 17.1.0
-       *hash* supports ``None`` as value which is also the default now.
-    .. versionadded:: 17.3.0 *auto_attribs*
-    .. versionchanged:: 18.1.0
-       If *these* is passed, no attributes are deleted from the class body.
-    .. versionchanged:: 18.1.0 If *these* is ordered, the order is retained.
-    .. versionadded:: 18.2.0 *weakref_slot*
-    .. deprecated:: 18.2.0
-       ``__lt__``, ``__le__``, ``__gt__``, and ``__ge__`` now raise a
-       `DeprecationWarning` if the classes compared are subclasses of
-       each other. ``__eq`` and ``__ne__`` never tried to compared subclasses
-       to each other.
-    .. versionchanged:: 19.2.0
-       ``__lt__``, ``__le__``, ``__gt__``, and ``__ge__`` now do not consider
-       subclasses comparable anymore.
-    .. versionadded:: 18.2.0 *kw_only*
-    .. versionadded:: 18.2.0 *cache_hash*
-    .. versionadded:: 19.1.0 *auto_exc*
-    .. deprecated:: 19.2.0 *cmp* Removal on or after 2021-06-01.
-    .. versionadded:: 19.2.0 *eq* and *order*
-    .. versionadded:: 20.1.0 *auto_detect*
-    .. versionadded:: 20.1.0 *collect_by_mro*
-    .. versionadded:: 20.1.0 *getstate_setstate*
-    .. versionadded:: 20.1.0 *on_setattr*
-    .. versionadded:: 20.3.0 *field_transformer*
-    .. versionchanged:: 21.1.0
-       ``init=False`` injects ``__attrs_init__``
-    .. versionchanged:: 21.1.0 Support for ``__attrs_pre_init__``
-    .. versionchanged:: 21.1.0 *cmp* undeprecated
-    .. versionadded:: 21.3.0 *match_args*
-    .. versionadded:: 22.2.0
-       *unsafe_hash* as an alias for *hash* (for :pep:`681` compliance).
-    """
-    eq_, order_ = _determine_attrs_eq_order(cmp, eq, order, None)
-
-    # unsafe_hash takes precedence due to PEP 681.
-    if unsafe_hash is not None:
-        hash = unsafe_hash
-
-    if isinstance(on_setattr, (list, tuple)):
-        on_setattr = setters.pipe(*on_setattr)
-
-    def wrap(cls):
-        is_frozen = frozen or _has_frozen_base_class(cls)
-        is_exc = auto_exc is True and issubclass(cls, BaseException)
-        has_own_setattr = auto_detect and _has_own_attribute(
-            cls, "__setattr__"
-        )
-
-        if has_own_setattr and is_frozen:
-            raise ValueError("Can't freeze a class with a custom __setattr__.")
-
-        builder = _ClassBuilder(
-            cls,
-            these,
-            slots,
-            is_frozen,
-            weakref_slot,
-            _determine_whether_to_implement(
-                cls,
-                getstate_setstate,
-                auto_detect,
-                ("__getstate__", "__setstate__"),
-                default=slots,
-            ),
-            auto_attribs,
-            kw_only,
-            cache_hash,
-            is_exc,
-            collect_by_mro,
-            on_setattr,
-            has_own_setattr,
-            field_transformer,
-        )
-        if _determine_whether_to_implement(
-            cls, repr, auto_detect, ("__repr__",)
-        ):
-            builder.add_repr(repr_ns)
-        if str is True:
-            builder.add_str()
-
-        eq = _determine_whether_to_implement(
-            cls, eq_, auto_detect, ("__eq__", "__ne__")
-        )
-        if not is_exc and eq is True:
-            builder.add_eq()
-        if not is_exc and _determine_whether_to_implement(
-            cls, order_, auto_detect, ("__lt__", "__le__", "__gt__", "__ge__")
-        ):
-            builder.add_order()
-
-        builder.add_setattr()
-
-        nonlocal hash
-        if (
-            hash is None
-            and auto_detect is True
-            and _has_own_attribute(cls, "__hash__")
-        ):
-            hash = False
-
-        if hash is not True and hash is not False and hash is not None:
-            # Can't use `hash in` because 1 == True for example.
-            raise TypeError(
-                "Invalid value for hash.  Must be True, False, or None."
-            )
-        elif hash is False or (hash is None and eq is False) or is_exc:
-            # Don't do anything. Should fall back to __object__'s __hash__
-            # which is by id.
-            if cache_hash:
-                raise TypeError(
-                    "Invalid value for cache_hash.  To use hash caching,"
-                    " hashing must be either explicitly or implicitly "
-                    "enabled."
-                )
-        elif hash is True or (
-            hash is None and eq is True and is_frozen is True
-        ):
-            # Build a __hash__ if told so, or if it's safe.
-            builder.add_hash()
-        else:
-            # Raise TypeError on attempts to hash.
-            if cache_hash:
-                raise TypeError(
-                    "Invalid value for cache_hash.  To use hash caching,"
-                    " hashing must be either explicitly or implicitly "
-                    "enabled."
-                )
-            builder.make_unhashable()
-
-        if _determine_whether_to_implement(
-            cls, init, auto_detect, ("__init__",)
-        ):
-            builder.add_init()
-        else:
-            builder.add_attrs_init()
-            if cache_hash:
-                raise TypeError(
-                    "Invalid value for cache_hash.  To use hash caching,"
-                    " init must be True."
-                )
-
-        if (
-            PY310
-            and match_args
-            and not _has_own_attribute(cls, "__match_args__")
-        ):
-            builder.add_match_args()
-
-        return builder.build_class()
-
-    # maybe_cls's type depends on the usage of the decorator.  It's a class
-    # if it's used as `@attrs` but ``None`` if used as `@attrs()`.
-    if maybe_cls is None:
-        return wrap
-    else:
-        return wrap(maybe_cls)
-
-
-_attrs = attrs
-"""
-Internal alias so we can use it in functions that take an argument called
-*attrs*.
-"""
-
-
-def _has_frozen_base_class(cls):
-    """
-    Check whether *cls* has a frozen ancestor by looking at its
-    __setattr__.
-    """
-    return cls.__setattr__ is _frozen_setattrs
-
-
-def _generate_unique_filename(cls, func_name):
-    """
-    Create a "filename" suitable for a function being generated.
-    """
-    return (
-        f"<attrs generated {func_name} {cls.__module__}."
-        f"{getattr(cls, '__qualname__', cls.__name__)}>"
-    )
-
-
-def _make_hash(cls, attrs, frozen, cache_hash):
-    attrs = tuple(
-        a for a in attrs if a.hash is True or (a.hash is None and a.eq is True)
-    )
-
-    tab = "        "
-
-    unique_filename = _generate_unique_filename(cls, "hash")
-    type_hash = hash(unique_filename)
-    # If eq is custom generated, we need to include the functions in globs
-    globs = {}
-
-    hash_def = "def __hash__(self"
-    hash_func = "hash(("
-    closing_braces = "))"
-    if not cache_hash:
-        hash_def += "):"
-    else:
-        hash_def += ", *"
-
-        hash_def += (
-            ", _cache_wrapper="
-            + "__import__('attr._make')._make._CacheHashWrapper):"
-        )
-        hash_func = "_cache_wrapper(" + hash_func
-        closing_braces += ")"
-
-    method_lines = [hash_def]
-
-    def append_hash_computation_lines(prefix, indent):
-        """
-        Generate the code for actually computing the hash code.
-        Below this will either be returned directly or used to compute
-        a value which is then cached, depending on the value of cache_hash
-        """
-
-        method_lines.extend(
-            [
-                indent + prefix + hash_func,
-                indent + f"        {type_hash},",
-            ]
-        )
-
-        for a in attrs:
-            if a.eq_key:
-                cmp_name = f"_{a.name}_key"
-                globs[cmp_name] = a.eq_key
-                method_lines.append(
-                    indent + f"        {cmp_name}(self.{a.name}),"
-                )
-            else:
-                method_lines.append(indent + f"        self.{a.name},")
-
-        method_lines.append(indent + "    " + closing_braces)
-
-    if cache_hash:
-        method_lines.append(tab + f"if self.{_hash_cache_field} is None:")
-        if frozen:
-            append_hash_computation_lines(
-                f"object.__setattr__(self, '{_hash_cache_field}', ", tab * 2
-            )
-            method_lines.append(tab * 2 + ")")  # close __setattr__
-        else:
-            append_hash_computation_lines(
-                f"self.{_hash_cache_field} = ", tab * 2
-            )
-        method_lines.append(tab + f"return self.{_hash_cache_field}")
-    else:
-        append_hash_computation_lines("return ", tab)
-
-    script = "\n".join(method_lines)
-    return _make_method("__hash__", script, unique_filename, globs)
-
-
-def _add_hash(cls, attrs):
-    """
-    Add a hash method to *cls*.
-    """
-    cls.__hash__ = _make_hash(cls, attrs, frozen=False, cache_hash=False)
-    return cls
-
-
-def _make_ne():
-    """
-    Create __ne__ method.
-    """
-
-    def __ne__(self, other):
-        """
-        Check equality and either forward a NotImplemented or
-        return the result negated.
-        """
-        result = self.__eq__(other)
-        if result is NotImplemented:
-            return NotImplemented
-
-        return not result
-
-    return __ne__
-
-
-def _make_eq(cls, attrs):
-    """
-    Create __eq__ method for *cls* with *attrs*.
-    """
-    attrs = [a for a in attrs if a.eq]
-
-    unique_filename = _generate_unique_filename(cls, "eq")
-    lines = [
-        "def __eq__(self, other):",
-        "    if other.__class__ is not self.__class__:",
-        "        return NotImplemented",
-    ]
-
-    # We can't just do a big self.x = other.x and... clause due to
-    # irregularities like nan == nan is false but (nan,) == (nan,) is true.
-    globs = {}
-    if attrs:
-        lines.append("    return  (")
-        others = ["    ) == ("]
-        for a in attrs:
-            if a.eq_key:
-                cmp_name = f"_{a.name}_key"
-                # Add the key function to the global namespace
-                # of the evaluated function.
-                globs[cmp_name] = a.eq_key
-                lines.append(f"        {cmp_name}(self.{a.name}),")
-                others.append(f"        {cmp_name}(other.{a.name}),")
-            else:
-                lines.append(f"        self.{a.name},")
-                others.append(f"        other.{a.name},")
-
-        lines += others + ["    )"]
-    else:
-        lines.append("    return True")
-
-    script = "\n".join(lines)
-
-    return _make_method("__eq__", script, unique_filename, globs)
-
-
-def _make_order(cls, attrs):
-    """
-    Create ordering methods for *cls* with *attrs*.
-    """
-    attrs = [a for a in attrs if a.order]
-
-    def attrs_to_tuple(obj):
-        """
-        Save us some typing.
-        """
-        return tuple(
-            key(value) if key else value
-            for value, key in (
-                (getattr(obj, a.name), a.order_key) for a in attrs
-            )
-        )
-
-    def __lt__(self, other):
-        """
-        Automatically created by attrs.
-        """
-        if other.__class__ is self.__class__:
-            return attrs_to_tuple(self) < attrs_to_tuple(other)
-
-        return NotImplemented
-
-    def __le__(self, other):
-        """
-        Automatically created by attrs.
-        """
-        if other.__class__ is self.__class__:
-            return attrs_to_tuple(self) <= attrs_to_tuple(other)
-
-        return NotImplemented
-
-    def __gt__(self, other):
-        """
-        Automatically created by attrs.
-        """
-        if other.__class__ is self.__class__:
-            return attrs_to_tuple(self) > attrs_to_tuple(other)
-
-        return NotImplemented
-
-    def __ge__(self, other):
-        """
-        Automatically created by attrs.
-        """
-        if other.__class__ is self.__class__:
-            return attrs_to_tuple(self) >= attrs_to_tuple(other)
-
-        return NotImplemented
-
-    return __lt__, __le__, __gt__, __ge__
-
-
-def _add_eq(cls, attrs=None):
-    """
-    Add equality methods to *cls* with *attrs*.
-    """
-    if attrs is None:
-        attrs = cls.__attrs_attrs__
-
-    cls.__eq__ = _make_eq(cls, attrs)
-    cls.__ne__ = _make_ne()
-
-    return cls
-
-
-def _make_repr(attrs, ns, cls):
-    unique_filename = _generate_unique_filename(cls, "repr")
-    # Figure out which attributes to include, and which function to use to
-    # format them. The a.repr value can be either bool or a custom
-    # callable.
-    attr_names_with_reprs = tuple(
-        (a.name, (repr if a.repr is True else a.repr), a.init)
-        for a in attrs
-        if a.repr is not False
-    )
-    globs = {
-        name + "_repr": r for name, r, _ in attr_names_with_reprs if r != repr
-    }
-    globs["_compat"] = _compat
-    globs["AttributeError"] = AttributeError
-    globs["NOTHING"] = NOTHING
-    attribute_fragments = []
-    for name, r, i in attr_names_with_reprs:
-        accessor = (
-            "self." + name if i else 'getattr(self, "' + name + '", NOTHING)'
-        )
-        fragment = (
-            "%s={%s!r}" % (name, accessor)
-            if r == repr
-            else "%s={%s_repr(%s)}" % (name, name, accessor)
-        )
-        attribute_fragments.append(fragment)
-    repr_fragment = ", ".join(attribute_fragments)
-
-    if ns is None:
-        cls_name_fragment = '{self.__class__.__qualname__.rsplit(">.", 1)[-1]}'
-    else:
-        cls_name_fragment = ns + ".{self.__class__.__name__}"
-
-    lines = [
-        "def __repr__(self):",
-        "  try:",
-        "    already_repring = _compat.repr_context.already_repring",
-        "  except AttributeError:",
-        "    already_repring = {id(self),}",
-        "    _compat.repr_context.already_repring = already_repring",
-        "  else:",
-        "    if id(self) in already_repring:",
-        "      return '...'",
-        "    else:",
-        "      already_repring.add(id(self))",
-        "  try:",
-        f"    return f'{cls_name_fragment}({repr_fragment})'",
-        "  finally:",
-        "    already_repring.remove(id(self))",
-    ]
-
-    return _make_method(
-        "__repr__", "\n".join(lines), unique_filename, globs=globs
-    )
-
-
-def _add_repr(cls, ns=None, attrs=None):
-    """
-    Add a repr method to *cls*.
-    """
-    if attrs is None:
-        attrs = cls.__attrs_attrs__
-
-    cls.__repr__ = _make_repr(attrs, ns, cls)
-    return cls
-
-
-def fields(cls):
-    """
-    Return the tuple of *attrs* attributes for a class.
-
-    The tuple also allows accessing the fields by their names (see below for
-    examples).
-
-    :param type cls: Class to introspect.
-
-    :raise TypeError: If *cls* is not a class.
-    :raise attrs.exceptions.NotAnAttrsClassError: If *cls* is not an *attrs*
-        class.
-
-    :rtype: tuple (with name accessors) of `attrs.Attribute`
-
-    .. versionchanged:: 16.2.0 Returned tuple allows accessing the fields
-       by name.
-    .. versionchanged:: 23.1.0 Add support for generic classes.
-    """
-    generic_base = get_generic_base(cls)
-
-    if generic_base is None and not isinstance(cls, type):
-        raise TypeError("Passed object must be a class.")
-
-    attrs = getattr(cls, "__attrs_attrs__", None)
-
-    if attrs is None:
-        if generic_base is not None:
-            attrs = getattr(generic_base, "__attrs_attrs__", None)
-            if attrs is not None:
-                # Even though this is global state, stick it on here to speed
-                # it up. We rely on `cls` being cached for this to be
-                # efficient.
-                cls.__attrs_attrs__ = attrs
-                return attrs
-        raise NotAnAttrsClassError(f"{cls!r} is not an attrs-decorated class.")
-
-    return attrs
-
-
-def fields_dict(cls):
-    """
-    Return an ordered dictionary of *attrs* attributes for a class, whose
-    keys are the attribute names.
-
-    :param type cls: Class to introspect.
-
-    :raise TypeError: If *cls* is not a class.
-    :raise attrs.exceptions.NotAnAttrsClassError: If *cls* is not an *attrs*
-        class.
-
-    :rtype: dict
-
-    .. versionadded:: 18.1.0
-    """
-    if not isinstance(cls, type):
-        raise TypeError("Passed object must be a class.")
-    attrs = getattr(cls, "__attrs_attrs__", None)
-    if attrs is None:
-        raise NotAnAttrsClassError(f"{cls!r} is not an attrs-decorated class.")
-    return {a.name: a for a in attrs}
-
-
-def validate(inst):
-    """
-    Validate all attributes on *inst* that have a validator.
-
-    Leaves all exceptions through.
-
-    :param inst: Instance of a class with *attrs* attributes.
-    """
-    if _config._run_validators is False:
-        return
-
-    for a in fields(inst.__class__):
-        v = a.validator
-        if v is not None:
-            v(inst, a, getattr(inst, a.name))
-
-
-def _is_slot_cls(cls):
-    return "__slots__" in cls.__dict__
-
-
-def _is_slot_attr(a_name, base_attr_map):
-    """
-    Check if the attribute name comes from a slot class.
-    """
-    return a_name in base_attr_map and _is_slot_cls(base_attr_map[a_name])
-
-
-def _make_init(
-    cls,
-    attrs,
-    pre_init,
-    post_init,
-    frozen,
-    slots,
-    cache_hash,
-    base_attr_map,
-    is_exc,
-    cls_on_setattr,
-    attrs_init,
-):
-    has_cls_on_setattr = (
-        cls_on_setattr is not None and cls_on_setattr is not setters.NO_OP
-    )
-
-    if frozen and has_cls_on_setattr:
-        raise ValueError("Frozen classes can't use on_setattr.")
-
-    needs_cached_setattr = cache_hash or frozen
-    filtered_attrs = []
-    attr_dict = {}
-    for a in attrs:
-        if not a.init and a.default is NOTHING:
-            continue
-
-        filtered_attrs.append(a)
-        attr_dict[a.name] = a
-
-        if a.on_setattr is not None:
-            if frozen is True:
-                raise ValueError("Frozen classes can't use on_setattr.")
-
-            needs_cached_setattr = True
-        elif has_cls_on_setattr and a.on_setattr is not setters.NO_OP:
-            needs_cached_setattr = True
-
-    unique_filename = _generate_unique_filename(cls, "init")
-
-    script, globs, annotations = _attrs_to_init_script(
-        filtered_attrs,
-        frozen,
-        slots,
-        pre_init,
-        post_init,
-        cache_hash,
-        base_attr_map,
-        is_exc,
-        needs_cached_setattr,
-        has_cls_on_setattr,
-        attrs_init,
-    )
-    if cls.__module__ in sys.modules:
-        # This makes typing.get_type_hints(CLS.__init__) resolve string types.
-        globs.update(sys.modules[cls.__module__].__dict__)
-
-    globs.update({"NOTHING": NOTHING, "attr_dict": attr_dict})
-
-    if needs_cached_setattr:
-        # Save the lookup overhead in __init__ if we need to circumvent
-        # setattr hooks.
-        globs["_cached_setattr_get"] = _obj_setattr.__get__
-
-    init = _make_method(
-        "__attrs_init__" if attrs_init else "__init__",
-        script,
-        unique_filename,
-        globs,
-    )
-    init.__annotations__ = annotations
-
-    return init
-
-
-def _setattr(attr_name, value_var, has_on_setattr):
-    """
-    Use the cached object.setattr to set *attr_name* to *value_var*.
-    """
-    return f"_setattr('{attr_name}', {value_var})"
-
-
-def _setattr_with_converter(attr_name, value_var, has_on_setattr):
-    """
-    Use the cached object.setattr to set *attr_name* to *value_var*, but run
-    its converter first.
-    """
-    return "_setattr('%s', %s(%s))" % (
-        attr_name,
-        _init_converter_pat % (attr_name,),
-        value_var,
-    )
-
-
-def _assign(attr_name, value, has_on_setattr):
-    """
-    Unless *attr_name* has an on_setattr hook, use normal assignment. Otherwise
-    relegate to _setattr.
-    """
-    if has_on_setattr:
-        return _setattr(attr_name, value, True)
-
-    return f"self.{attr_name} = {value}"
-
-
-def _assign_with_converter(attr_name, value_var, has_on_setattr):
-    """
-    Unless *attr_name* has an on_setattr hook, use normal assignment after
-    conversion. Otherwise relegate to _setattr_with_converter.
-    """
-    if has_on_setattr:
-        return _setattr_with_converter(attr_name, value_var, True)
-
-    return "self.%s = %s(%s)" % (
-        attr_name,
-        _init_converter_pat % (attr_name,),
-        value_var,
-    )
-
-
-def _attrs_to_init_script(
-    attrs,
-    frozen,
-    slots,
-    pre_init,
-    post_init,
-    cache_hash,
-    base_attr_map,
-    is_exc,
-    needs_cached_setattr,
-    has_cls_on_setattr,
-    attrs_init,
-):
-    """
-    Return a script of an initializer for *attrs* and a dict of globals.
-
-    The globals are expected by the generated script.
-
-    If *frozen* is True, we cannot set the attributes directly so we use
-    a cached ``object.__setattr__``.
-    """
-    lines = []
-    if pre_init:
-        lines.append("self.__attrs_pre_init__()")
-
-    if needs_cached_setattr:
-        lines.append(
-            # Circumvent the __setattr__ descriptor to save one lookup per
-            # assignment.
-            # Note _setattr will be used again below if cache_hash is True
-            "_setattr = _cached_setattr_get(self)"
-        )
-
-    if frozen is True:
-        if slots is True:
-            fmt_setter = _setattr
-            fmt_setter_with_converter = _setattr_with_converter
-        else:
-            # Dict frozen classes assign directly to __dict__.
-            # But only if the attribute doesn't come from an ancestor slot
-            # class.
-            # Note _inst_dict will be used again below if cache_hash is True
-            lines.append("_inst_dict = self.__dict__")
-
-            def fmt_setter(attr_name, value_var, has_on_setattr):
-                if _is_slot_attr(attr_name, base_attr_map):
-                    return _setattr(attr_name, value_var, has_on_setattr)
-
-                return f"_inst_dict['{attr_name}'] = {value_var}"
-
-            def fmt_setter_with_converter(
-                attr_name, value_var, has_on_setattr
-            ):
-                if has_on_setattr or _is_slot_attr(attr_name, base_attr_map):
-                    return _setattr_with_converter(
-                        attr_name, value_var, has_on_setattr
-                    )
-
-                return "_inst_dict['%s'] = %s(%s)" % (
-                    attr_name,
-                    _init_converter_pat % (attr_name,),
-                    value_var,
-                )
-
-    else:
-        # Not frozen.
-        fmt_setter = _assign
-        fmt_setter_with_converter = _assign_with_converter
-
-    args = []
-    kw_only_args = []
-    attrs_to_validate = []
-
-    # This is a dictionary of names to validator and converter callables.
-    # Injecting this into __init__ globals lets us avoid lookups.
-    names_for_globals = {}
-    annotations = {"return": None}
-
-    for a in attrs:
-        if a.validator:
-            attrs_to_validate.append(a)
-
-        attr_name = a.name
-        has_on_setattr = a.on_setattr is not None or (
-            a.on_setattr is not setters.NO_OP and has_cls_on_setattr
-        )
-        # a.alias is set to maybe-mangled attr_name in _ClassBuilder if not
-        # explicitly provided
-        arg_name = a.alias
-
-        has_factory = isinstance(a.default, Factory)
-        if has_factory and a.default.takes_self:
-            maybe_self = "self"
-        else:
-            maybe_self = ""
-
-        if a.init is False:
-            if has_factory:
-                init_factory_name = _init_factory_pat % (a.name,)
-                if a.converter is not None:
-                    lines.append(
-                        fmt_setter_with_converter(
-                            attr_name,
-                            init_factory_name + f"({maybe_self})",
-                            has_on_setattr,
-                        )
-                    )
-                    conv_name = _init_converter_pat % (a.name,)
-                    names_for_globals[conv_name] = a.converter
-                else:
-                    lines.append(
-                        fmt_setter(
-                            attr_name,
-                            init_factory_name + f"({maybe_self})",
-                            has_on_setattr,
-                        )
-                    )
-                names_for_globals[init_factory_name] = a.default.factory
-            else:
-                if a.converter is not None:
-                    lines.append(
-                        fmt_setter_with_converter(
-                            attr_name,
-                            f"attr_dict['{attr_name}'].default",
-                            has_on_setattr,
-                        )
-                    )
-                    conv_name = _init_converter_pat % (a.name,)
-                    names_for_globals[conv_name] = a.converter
-                else:
-                    lines.append(
-                        fmt_setter(
-                            attr_name,
-                            f"attr_dict['{attr_name}'].default",
-                            has_on_setattr,
-                        )
-                    )
-        elif a.default is not NOTHING and not has_factory:
-            arg = f"{arg_name}=attr_dict['{attr_name}'].default"
-            if a.kw_only:
-                kw_only_args.append(arg)
-            else:
-                args.append(arg)
-
-            if a.converter is not None:
-                lines.append(
-                    fmt_setter_with_converter(
-                        attr_name, arg_name, has_on_setattr
-                    )
-                )
-                names_for_globals[
-                    _init_converter_pat % (a.name,)
-                ] = a.converter
-            else:
-                lines.append(fmt_setter(attr_name, arg_name, has_on_setattr))
-
-        elif has_factory:
-            arg = f"{arg_name}=NOTHING"
-            if a.kw_only:
-                kw_only_args.append(arg)
-            else:
-                args.append(arg)
-            lines.append(f"if {arg_name} is not NOTHING:")
-
-            init_factory_name = _init_factory_pat % (a.name,)
-            if a.converter is not None:
-                lines.append(
-                    "    "
-                    + fmt_setter_with_converter(
-                        attr_name, arg_name, has_on_setattr
-                    )
-                )
-                lines.append("else:")
-                lines.append(
-                    "    "
-                    + fmt_setter_with_converter(
-                        attr_name,
-                        init_factory_name + "(" + maybe_self + ")",
-                        has_on_setattr,
-                    )
-                )
-                names_for_globals[
-                    _init_converter_pat % (a.name,)
-                ] = a.converter
-            else:
-                lines.append(
-                    "    " + fmt_setter(attr_name, arg_name, has_on_setattr)
-                )
-                lines.append("else:")
-                lines.append(
-                    "    "
-                    + fmt_setter(
-                        attr_name,
-                        init_factory_name + "(" + maybe_self + ")",
-                        has_on_setattr,
-                    )
-                )
-            names_for_globals[init_factory_name] = a.default.factory
-        else:
-            if a.kw_only:
-                kw_only_args.append(arg_name)
-            else:
-                args.append(arg_name)
-
-            if a.converter is not None:
-                lines.append(
-                    fmt_setter_with_converter(
-                        attr_name, arg_name, has_on_setattr
-                    )
-                )
-                names_for_globals[
-                    _init_converter_pat % (a.name,)
-                ] = a.converter
-            else:
-                lines.append(fmt_setter(attr_name, arg_name, has_on_setattr))
-
-        if a.init is True:
-            if a.type is not None and a.converter is None:
-                annotations[arg_name] = a.type
-            elif a.converter is not None:
-                # Try to get the type from the converter.
-                t = _AnnotationExtractor(a.converter).get_first_param_type()
-                if t:
-                    annotations[arg_name] = t
-
-    if attrs_to_validate:  # we can skip this if there are no validators.
-        names_for_globals["_config"] = _config
-        lines.append("if _config._run_validators is True:")
-        for a in attrs_to_validate:
-            val_name = "__attr_validator_" + a.name
-            attr_name = "__attr_" + a.name
-            lines.append(f"    {val_name}(self, {attr_name}, self.{a.name})")
-            names_for_globals[val_name] = a.validator
-            names_for_globals[attr_name] = a
-
-    if post_init:
-        lines.append("self.__attrs_post_init__()")
-
-    # because this is set only after __attrs_post_init__ is called, a crash
-    # will result if post-init tries to access the hash code.  This seemed
-    # preferable to setting this beforehand, in which case alteration to
-    # field values during post-init combined with post-init accessing the
-    # hash code would result in silent bugs.
-    if cache_hash:
-        if frozen:
-            if slots:
-                # if frozen and slots, then _setattr defined above
-                init_hash_cache = "_setattr('%s', %s)"
-            else:
-                # if frozen and not slots, then _inst_dict defined above
-                init_hash_cache = "_inst_dict['%s'] = %s"
-        else:
-            init_hash_cache = "self.%s = %s"
-        lines.append(init_hash_cache % (_hash_cache_field, "None"))
-
-    # For exceptions we rely on BaseException.__init__ for proper
-    # initialization.
-    if is_exc:
-        vals = ",".join(f"self.{a.name}" for a in attrs if a.init)
-
-        lines.append(f"BaseException.__init__(self, {vals})")
-
-    args = ", ".join(args)
-    if kw_only_args:
-        args += "%s*, %s" % (
-            ", " if args else "",  # leading comma
-            ", ".join(kw_only_args),  # kw_only args
-        )
-
-    return (
-        "def %s(self, %s):\n    %s\n"
-        % (
-            ("__attrs_init__" if attrs_init else "__init__"),
-            args,
-            "\n    ".join(lines) if lines else "pass",
-        ),
-        names_for_globals,
-        annotations,
-    )
-
-
-def _default_init_alias_for(name: str) -> str:
-    """
-    The default __init__ parameter name for a field.
-
-    This performs private-name adjustment via leading-unscore stripping,
-    and is the default value of Attribute.alias if not provided.
-    """
-
-    return name.lstrip("_")
-
-
-class Attribute:
-    """
-    *Read-only* representation of an attribute.
-
-    .. warning::
-
-       You should never instantiate this class yourself.
-
-    The class has *all* arguments of `attr.ib` (except for ``factory``
-    which is only syntactic sugar for ``default=Factory(...)`` plus the
-    following:
-
-    - ``name`` (`str`): The name of the attribute.
-    - ``alias`` (`str`): The __init__ parameter name of the attribute, after
-      any explicit overrides and default private-attribute-name handling.
-    - ``inherited`` (`bool`): Whether or not that attribute has been inherited
-      from a base class.
-    - ``eq_key`` and ``order_key`` (`typing.Callable` or `None`): The callables
-      that are used for comparing and ordering objects by this attribute,
-      respectively. These are set by passing a callable to `attr.ib`'s ``eq``,
-      ``order``, or ``cmp`` arguments. See also :ref:`comparison customization
-      <custom-comparison>`.
-
-    Instances of this class are frequently used for introspection purposes
-    like:
-
-    - `fields` returns a tuple of them.
-    - Validators get them passed as the first argument.
-    - The :ref:`field transformer <transform-fields>` hook receives a list of
-      them.
-    - The ``alias`` property exposes the __init__ parameter name of the field,
-      with any overrides and default private-attribute handling applied.
-
-
-    .. versionadded:: 20.1.0 *inherited*
-    .. versionadded:: 20.1.0 *on_setattr*
-    .. versionchanged:: 20.2.0 *inherited* is not taken into account for
-        equality checks and hashing anymore.
-    .. versionadded:: 21.1.0 *eq_key* and *order_key*
-    .. versionadded:: 22.2.0 *alias*
-
-    For the full version history of the fields, see `attr.ib`.
-    """
-
-    __slots__ = (
-        "name",
-        "default",
-        "validator",
-        "repr",
-        "eq",
-        "eq_key",
-        "order",
-        "order_key",
-        "hash",
-        "init",
-        "metadata",
-        "type",
-        "converter",
-        "kw_only",
-        "inherited",
-        "on_setattr",
-        "alias",
-    )
-
-    def __init__(
-        self,
-        name,
-        default,
-        validator,
-        repr,
-        cmp,  # XXX: unused, remove along with other cmp code.
-        hash,
-        init,
-        inherited,
-        metadata=None,
-        type=None,
-        converter=None,
-        kw_only=False,
-        eq=None,
-        eq_key=None,
-        order=None,
-        order_key=None,
-        on_setattr=None,
-        alias=None,
-    ):
-        eq, eq_key, order, order_key = _determine_attrib_eq_order(
-            cmp, eq_key or eq, order_key or order, True
-        )
-
-        # Cache this descriptor here to speed things up later.
-        bound_setattr = _obj_setattr.__get__(self)
-
-        # Despite the big red warning, people *do* instantiate `Attribute`
-        # themselves.
-        bound_setattr("name", name)
-        bound_setattr("default", default)
-        bound_setattr("validator", validator)
-        bound_setattr("repr", repr)
-        bound_setattr("eq", eq)
-        bound_setattr("eq_key", eq_key)
-        bound_setattr("order", order)
-        bound_setattr("order_key", order_key)
-        bound_setattr("hash", hash)
-        bound_setattr("init", init)
-        bound_setattr("converter", converter)
-        bound_setattr(
-            "metadata",
-            (
-                types.MappingProxyType(dict(metadata))  # Shallow copy
-                if metadata
-                else _empty_metadata_singleton
-            ),
-        )
-        bound_setattr("type", type)
-        bound_setattr("kw_only", kw_only)
-        bound_setattr("inherited", inherited)
-        bound_setattr("on_setattr", on_setattr)
-        bound_setattr("alias", alias)
-
-    def __setattr__(self, name, value):
-        raise FrozenInstanceError()
-
-    @classmethod
-    def from_counting_attr(cls, name, ca, type=None):
-        # type holds the annotated value. deal with conflicts:
-        if type is None:
-            type = ca.type
-        elif ca.type is not None:
-            raise ValueError(
-                "Type annotation and type argument cannot both be present"
-            )
-        inst_dict = {
-            k: getattr(ca, k)
-            for k in Attribute.__slots__
-            if k
-            not in (
-                "name",
-                "validator",
-                "default",
-                "type",
-                "inherited",
-            )  # exclude methods and deprecated alias
-        }
-        return cls(
-            name=name,
-            validator=ca._validator,
-            default=ca._default,
-            type=type,
-            cmp=None,
-            inherited=False,
-            **inst_dict,
-        )
-
-    # Don't use attrs.evolve since fields(Attribute) doesn't work
-    def evolve(self, **changes):
-        """
-        Copy *self* and apply *changes*.
-
-        This works similarly to `attrs.evolve` but that function does not work
-        with `Attribute`.
-
-        It is mainly meant to be used for `transform-fields`.
-
-        .. versionadded:: 20.3.0
-        """
-        new = copy.copy(self)
-
-        new._setattrs(changes.items())
-
-        return new
-
-    # Don't use _add_pickle since fields(Attribute) doesn't work
-    def __getstate__(self):
-        """
-        Play nice with pickle.
-        """
-        return tuple(
-            getattr(self, name) if name != "metadata" else dict(self.metadata)
-            for name in self.__slots__
-        )
-
-    def __setstate__(self, state):
-        """
-        Play nice with pickle.
-        """
-        self._setattrs(zip(self.__slots__, state))
-
-    def _setattrs(self, name_values_pairs):
-        bound_setattr = _obj_setattr.__get__(self)
-        for name, value in name_values_pairs:
-            if name != "metadata":
-                bound_setattr(name, value)
-            else:
-                bound_setattr(
-                    name,
-                    types.MappingProxyType(dict(value))
-                    if value
-                    else _empty_metadata_singleton,
-                )
-
-
-_a = [
-    Attribute(
-        name=name,
-        default=NOTHING,
-        validator=None,
-        repr=True,
-        cmp=None,
-        eq=True,
-        order=False,
-        hash=(name != "metadata"),
-        init=True,
-        inherited=False,
-        alias=_default_init_alias_for(name),
-    )
-    for name in Attribute.__slots__
-]
-
-Attribute = _add_hash(
-    _add_eq(
-        _add_repr(Attribute, attrs=_a),
-        attrs=[a for a in _a if a.name != "inherited"],
-    ),
-    attrs=[a for a in _a if a.hash and a.name != "inherited"],
-)
-
-
-class _CountingAttr:
-    """
-    Intermediate representation of attributes that uses a counter to preserve
-    the order in which the attributes have been defined.
-
-    *Internal* data structure of the attrs library.  Running into is most
-    likely the result of a bug like a forgotten `@attr.s` decorator.
-    """
-
-    __slots__ = (
-        "counter",
-        "_default",
-        "repr",
-        "eq",
-        "eq_key",
-        "order",
-        "order_key",
-        "hash",
-        "init",
-        "metadata",
-        "_validator",
-        "converter",
-        "type",
-        "kw_only",
-        "on_setattr",
-        "alias",
-    )
-    __attrs_attrs__ = tuple(
-        Attribute(
-            name=name,
-            alias=_default_init_alias_for(name),
-            default=NOTHING,
-            validator=None,
-            repr=True,
-            cmp=None,
-            hash=True,
-            init=True,
-            kw_only=False,
-            eq=True,
-            eq_key=None,
-            order=False,
-            order_key=None,
-            inherited=False,
-            on_setattr=None,
-        )
-        for name in (
-            "counter",
-            "_default",
-            "repr",
-            "eq",
-            "order",
-            "hash",
-            "init",
-            "on_setattr",
-            "alias",
-        )
-    ) + (
-        Attribute(
-            name="metadata",
-            alias="metadata",
-            default=None,
-            validator=None,
-            repr=True,
-            cmp=None,
-            hash=False,
-            init=True,
-            kw_only=False,
-            eq=True,
-            eq_key=None,
-            order=False,
-            order_key=None,
-            inherited=False,
-            on_setattr=None,
-        ),
-    )
-    cls_counter = 0
-
-    def __init__(
-        self,
-        default,
-        validator,
-        repr,
-        cmp,
-        hash,
-        init,
-        converter,
-        metadata,
-        type,
-        kw_only,
-        eq,
-        eq_key,
-        order,
-        order_key,
-        on_setattr,
-        alias,
-    ):
-        _CountingAttr.cls_counter += 1
-        self.counter = _CountingAttr.cls_counter
-        self._default = default
-        self._validator = validator
-        self.converter = converter
-        self.repr = repr
-        self.eq = eq
-        self.eq_key = eq_key
-        self.order = order
-        self.order_key = order_key
-        self.hash = hash
-        self.init = init
-        self.metadata = metadata
-        self.type = type
-        self.kw_only = kw_only
-        self.on_setattr = on_setattr
-        self.alias = alias
-
-    def validator(self, meth):
-        """
-        Decorator that adds *meth* to the list of validators.
-
-        Returns *meth* unchanged.
-
-        .. versionadded:: 17.1.0
-        """
-        if self._validator is None:
-            self._validator = meth
-        else:
-            self._validator = and_(self._validator, meth)
-        return meth
-
-    def default(self, meth):
-        """
-        Decorator that allows to set the default for an attribute.
-
-        Returns *meth* unchanged.
-
-        :raises DefaultAlreadySetError: If default has been set before.
-
-        .. versionadded:: 17.1.0
-        """
-        if self._default is not NOTHING:
-            raise DefaultAlreadySetError()
-
-        self._default = Factory(meth, takes_self=True)
-
-        return meth
-
-
-_CountingAttr = _add_eq(_add_repr(_CountingAttr))
-
-
-class Factory:
-    """
-    Stores a factory callable.
-
-    If passed as the default value to `attrs.field`, the factory is used to
-    generate a new value.
-
-    :param callable factory: A callable that takes either none or exactly one
-        mandatory positional argument depending on *takes_self*.
-    :param bool takes_self: Pass the partially initialized instance that is
-        being initialized as a positional argument.
-
-    .. versionadded:: 17.1.0  *takes_self*
-    """
-
-    __slots__ = ("factory", "takes_self")
-
-    def __init__(self, factory, takes_self=False):
-        self.factory = factory
-        self.takes_self = takes_self
-
-    def __getstate__(self):
-        """
-        Play nice with pickle.
-        """
-        return tuple(getattr(self, name) for name in self.__slots__)
-
-    def __setstate__(self, state):
-        """
-        Play nice with pickle.
-        """
-        for name, value in zip(self.__slots__, state):
-            setattr(self, name, value)
-
-
-_f = [
-    Attribute(
-        name=name,
-        default=NOTHING,
-        validator=None,
-        repr=True,
-        cmp=None,
-        eq=True,
-        order=False,
-        hash=True,
-        init=True,
-        inherited=False,
-    )
-    for name in Factory.__slots__
-]
-
-Factory = _add_hash(_add_eq(_add_repr(Factory, attrs=_f), attrs=_f), attrs=_f)
-
-
-def make_class(name, attrs, bases=(object,), **attributes_arguments):
-    r"""
-    A quick way to create a new class called *name* with *attrs*.
-
-    :param str name: The name for the new class.
-
-    :param attrs: A list of names or a dictionary of mappings of names to
-        `attr.ib`\ s / `attrs.field`\ s.
-
-        The order is deduced from the order of the names or attributes inside
-        *attrs*.  Otherwise the order of the definition of the attributes is
-        used.
-    :type attrs: `list` or `dict`
-
-    :param tuple bases: Classes that the new class will subclass.
-
-    :param attributes_arguments: Passed unmodified to `attr.s`.
-
-    :return: A new class with *attrs*.
-    :rtype: type
-
-    .. versionadded:: 17.1.0 *bases*
-    .. versionchanged:: 18.1.0 If *attrs* is ordered, the order is retained.
-    """
-    if isinstance(attrs, dict):
-        cls_dict = attrs
-    elif isinstance(attrs, (list, tuple)):
-        cls_dict = {a: attrib() for a in attrs}
-    else:
-        raise TypeError("attrs argument must be a dict or a list.")
-
-    pre_init = cls_dict.pop("__attrs_pre_init__", None)
-    post_init = cls_dict.pop("__attrs_post_init__", None)
-    user_init = cls_dict.pop("__init__", None)
-
-    body = {}
-    if pre_init is not None:
-        body["__attrs_pre_init__"] = pre_init
-    if post_init is not None:
-        body["__attrs_post_init__"] = post_init
-    if user_init is not None:
-        body["__init__"] = user_init
-
-    type_ = types.new_class(name, bases, {}, lambda ns: ns.update(body))
-
-    # For pickling to work, the __module__ variable needs to be set to the
-    # frame where the class is created.  Bypass this step in environments where
-    # sys._getframe is not defined (Jython for example) or sys._getframe is not
-    # defined for arguments greater than 0 (IronPython).
-    try:
-        type_.__module__ = sys._getframe(1).f_globals.get(
-            "__name__", "__main__"
-        )
-    except (AttributeError, ValueError):
-        pass
-
-    # We do it here for proper warnings with meaningful stacklevel.
-    cmp = attributes_arguments.pop("cmp", None)
-    (
-        attributes_arguments["eq"],
-        attributes_arguments["order"],
-    ) = _determine_attrs_eq_order(
-        cmp,
-        attributes_arguments.get("eq"),
-        attributes_arguments.get("order"),
-        True,
-    )
-
-    return _attrs(these=cls_dict, **attributes_arguments)(type_)
-
-
-# These are required by within this module so we define them here and merely
-# import into .validators / .converters.
-
-
-@attrs(slots=True, hash=True)
-class _AndValidator:
-    """
-    Compose many validators to a single one.
-    """
-
-    _validators = attrib()
-
-    def __call__(self, inst, attr, value):
-        for v in self._validators:
-            v(inst, attr, value)
-
-
-def and_(*validators):
-    """
-    A validator that composes multiple validators into one.
-
-    When called on a value, it runs all wrapped validators.
-
-    :param callables validators: Arbitrary number of validators.
-
-    .. versionadded:: 17.1.0
-    """
-    vals = []
-    for validator in validators:
-        vals.extend(
-            validator._validators
-            if isinstance(validator, _AndValidator)
-            else [validator]
-        )
-
-    return _AndValidator(tuple(vals))
-
-
-def pipe(*converters):
-    """
-    A converter that composes multiple converters into one.
-
-    When called on a value, it runs all wrapped converters, returning the
-    *last* value.
-
-    Type annotations will be inferred from the wrapped converters', if
-    they have any.
-
-    :param callables converters: Arbitrary number of converters.
-
-    .. versionadded:: 20.1.0
-    """
-
-    def pipe_converter(val):
-        for converter in converters:
-            val = converter(val)
-
-        return val
-
-    if not converters:
-        # If the converter list is empty, pipe_converter is the identity.
-        A = typing.TypeVar("A")
-        pipe_converter.__annotations__ = {"val": A, "return": A}
-    else:
-        # Get parameter type from first converter.
-        t = _AnnotationExtractor(converters[0]).get_first_param_type()
-        if t:
-            pipe_converter.__annotations__["val"] = t
-
-        # Get return type from last converter.
-        rt = _AnnotationExtractor(converters[-1]).get_return_type()
-        if rt:
-            pipe_converter.__annotations__["return"] = rt
-
-    return pipe_converter
diff --git a/uno/lib/python/poub/attr/_next_gen.py b/uno/lib/python/poub/attr/_next_gen.py
deleted file mode 100644
index 8f7c0b9a..00000000
--- a/uno/lib/python/poub/attr/_next_gen.py
+++ /dev/null
@@ -1,232 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-"""
-These are keyword-only APIs that call `attr.s` and `attr.ib` with different
-default values.
-"""
-
-
-from functools import partial
-
-from . import setters
-from ._funcs import asdict as _asdict
-from ._funcs import astuple as _astuple
-from ._make import (
-    NOTHING,
-    _frozen_setattrs,
-    _ng_default_on_setattr,
-    attrib,
-    attrs,
-)
-from .exceptions import UnannotatedAttributeError
-
-
-def define(
-    maybe_cls=None,
-    *,
-    these=None,
-    repr=None,
-    unsafe_hash=None,
-    hash=None,
-    init=None,
-    slots=True,
-    frozen=False,
-    weakref_slot=True,
-    str=False,
-    auto_attribs=None,
-    kw_only=False,
-    cache_hash=False,
-    auto_exc=True,
-    eq=None,
-    order=False,
-    auto_detect=True,
-    getstate_setstate=None,
-    on_setattr=None,
-    field_transformer=None,
-    match_args=True,
-):
-    r"""
-    Define an *attrs* class.
-
-    Differences to the classic `attr.s` that it uses underneath:
-
-    - Automatically detect whether or not *auto_attribs* should be `True` (c.f.
-      *auto_attribs* parameter).
-    - If *frozen* is `False`, run converters and validators when setting an
-      attribute by default.
-    - *slots=True*
-
-      .. caution::
-
-         Usually this has only upsides and few visible effects in everyday
-         programming. But it *can* lead to some suprising behaviors, so please
-         make sure to read :term:`slotted classes`.
-    - *auto_exc=True*
-    - *auto_detect=True*
-    - *order=False*
-    - Some options that were only relevant on Python 2 or were kept around for
-      backwards-compatibility have been removed.
-
-    Please note that these are all defaults and you can change them as you
-    wish.
-
-    :param Optional[bool] auto_attribs: If set to `True` or `False`, it behaves
-       exactly like `attr.s`. If left `None`, `attr.s` will try to guess:
-
-       1. If any attributes are annotated and no unannotated `attrs.fields`\ s
-          are found, it assumes *auto_attribs=True*.
-       2. Otherwise it assumes *auto_attribs=False* and tries to collect
-          `attrs.fields`\ s.
-
-    For now, please refer to `attr.s` for the rest of the parameters.
-
-    .. versionadded:: 20.1.0
-    .. versionchanged:: 21.3.0 Converters are also run ``on_setattr``.
-    .. versionadded:: 22.2.0
-       *unsafe_hash* as an alias for *hash* (for :pep:`681` compliance).
-    """
-
-    def do_it(cls, auto_attribs):
-        return attrs(
-            maybe_cls=cls,
-            these=these,
-            repr=repr,
-            hash=hash,
-            unsafe_hash=unsafe_hash,
-            init=init,
-            slots=slots,
-            frozen=frozen,
-            weakref_slot=weakref_slot,
-            str=str,
-            auto_attribs=auto_attribs,
-            kw_only=kw_only,
-            cache_hash=cache_hash,
-            auto_exc=auto_exc,
-            eq=eq,
-            order=order,
-            auto_detect=auto_detect,
-            collect_by_mro=True,
-            getstate_setstate=getstate_setstate,
-            on_setattr=on_setattr,
-            field_transformer=field_transformer,
-            match_args=match_args,
-        )
-
-    def wrap(cls):
-        """
-        Making this a wrapper ensures this code runs during class creation.
-
-        We also ensure that frozen-ness of classes is inherited.
-        """
-        nonlocal frozen, on_setattr
-
-        had_on_setattr = on_setattr not in (None, setters.NO_OP)
-
-        # By default, mutable classes convert & validate on setattr.
-        if frozen is False and on_setattr is None:
-            on_setattr = _ng_default_on_setattr
-
-        # However, if we subclass a frozen class, we inherit the immutability
-        # and disable on_setattr.
-        for base_cls in cls.__bases__:
-            if base_cls.__setattr__ is _frozen_setattrs:
-                if had_on_setattr:
-                    raise ValueError(
-                        "Frozen classes can't use on_setattr "
-                        "(frozen-ness was inherited)."
-                    )
-
-                on_setattr = setters.NO_OP
-                break
-
-        if auto_attribs is not None:
-            return do_it(cls, auto_attribs)
-
-        try:
-            return do_it(cls, True)
-        except UnannotatedAttributeError:
-            return do_it(cls, False)
-
-    # maybe_cls's type depends on the usage of the decorator.  It's a class
-    # if it's used as `@attrs` but ``None`` if used as `@attrs()`.
-    if maybe_cls is None:
-        return wrap
-    else:
-        return wrap(maybe_cls)
-
-
-mutable = define
-frozen = partial(define, frozen=True, on_setattr=None)
-
-
-def field(
-    *,
-    default=NOTHING,
-    validator=None,
-    repr=True,
-    hash=None,
-    init=True,
-    metadata=None,
-    type=None,
-    converter=None,
-    factory=None,
-    kw_only=False,
-    eq=None,
-    order=None,
-    on_setattr=None,
-    alias=None,
-):
-    """
-    Identical to `attr.ib`, except keyword-only and with some arguments
-    removed.
-
-    .. versionadded:: 23.1.0
-       The *type* parameter has been re-added; mostly for
-       {func}`attrs.make_class`. Please note that type checkers ignore this
-       metadata.
-    .. versionadded:: 20.1.0
-    """
-    return attrib(
-        default=default,
-        validator=validator,
-        repr=repr,
-        hash=hash,
-        init=init,
-        metadata=metadata,
-        type=type,
-        converter=converter,
-        factory=factory,
-        kw_only=kw_only,
-        eq=eq,
-        order=order,
-        on_setattr=on_setattr,
-        alias=alias,
-    )
-
-
-def asdict(inst, *, recurse=True, filter=None, value_serializer=None):
-    """
-    Same as `attr.asdict`, except that collections types are always retained
-    and dict is always used as *dict_factory*.
-
-    .. versionadded:: 21.3.0
-    """
-    return _asdict(
-        inst=inst,
-        recurse=recurse,
-        filter=filter,
-        value_serializer=value_serializer,
-        retain_collection_types=True,
-    )
-
-
-def astuple(inst, *, recurse=True, filter=None):
-    """
-    Same as `attr.astuple`, except that collections types are always retained
-    and `tuple` is always used as the *tuple_factory*.
-
-    .. versionadded:: 21.3.0
-    """
-    return _astuple(
-        inst=inst, recurse=recurse, filter=filter, retain_collection_types=True
-    )
diff --git a/uno/lib/python/poub/attr/_typing_compat.pyi b/uno/lib/python/poub/attr/_typing_compat.pyi
deleted file mode 100644
index ca7b71e9..00000000
--- a/uno/lib/python/poub/attr/_typing_compat.pyi
+++ /dev/null
@@ -1,15 +0,0 @@
-from typing import Any, ClassVar, Protocol
-
-# MYPY is a special constant in mypy which works the same way as `TYPE_CHECKING`.
-MYPY = False
-
-if MYPY:
-    # A protocol to be able to statically accept an attrs class.
-    class AttrsInstance_(Protocol):
-        __attrs_attrs__: ClassVar[Any]
-
-else:
-    # For type checkers without plug-in support use an empty protocol that
-    # will (hopefully) be combined into a union.
-    class AttrsInstance_(Protocol):
-        pass
diff --git a/uno/lib/python/poub/attr/_version_info.py b/uno/lib/python/poub/attr/_version_info.py
deleted file mode 100644
index 51a1312f..00000000
--- a/uno/lib/python/poub/attr/_version_info.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-
-from functools import total_ordering
-
-from ._funcs import astuple
-from ._make import attrib, attrs
-
-
-@total_ordering
-@attrs(eq=False, order=False, slots=True, frozen=True)
-class VersionInfo:
-    """
-    A version object that can be compared to tuple of length 1--4:
-
-    >>> attr.VersionInfo(19, 1, 0, "final")  <= (19, 2)
-    True
-    >>> attr.VersionInfo(19, 1, 0, "final") < (19, 1, 1)
-    True
-    >>> vi = attr.VersionInfo(19, 2, 0, "final")
-    >>> vi < (19, 1, 1)
-    False
-    >>> vi < (19,)
-    False
-    >>> vi == (19, 2,)
-    True
-    >>> vi == (19, 2, 1)
-    False
-
-    .. versionadded:: 19.2
-    """
-
-    year = attrib(type=int)
-    minor = attrib(type=int)
-    micro = attrib(type=int)
-    releaselevel = attrib(type=str)
-
-    @classmethod
-    def _from_version_string(cls, s):
-        """
-        Parse *s* and return a _VersionInfo.
-        """
-        v = s.split(".")
-        if len(v) == 3:
-            v.append("final")
-
-        return cls(
-            year=int(v[0]), minor=int(v[1]), micro=int(v[2]), releaselevel=v[3]
-        )
-
-    def _ensure_tuple(self, other):
-        """
-        Ensure *other* is a tuple of a valid length.
-
-        Returns a possibly transformed *other* and ourselves as a tuple of
-        the same length as *other*.
-        """
-
-        if self.__class__ is other.__class__:
-            other = astuple(other)
-
-        if not isinstance(other, tuple):
-            raise NotImplementedError
-
-        if not (1 <= len(other) <= 4):
-            raise NotImplementedError
-
-        return astuple(self)[: len(other)], other
-
-    def __eq__(self, other):
-        try:
-            us, them = self._ensure_tuple(other)
-        except NotImplementedError:
-            return NotImplemented
-
-        return us == them
-
-    def __lt__(self, other):
-        try:
-            us, them = self._ensure_tuple(other)
-        except NotImplementedError:
-            return NotImplemented
-
-        # Since alphabetically "dev0" < "final" < "post1" < "post2", we don't
-        # have to do anything special with releaselevel for now.
-        return us < them
diff --git a/uno/lib/python/poub/attr/_version_info.pyi b/uno/lib/python/poub/attr/_version_info.pyi
deleted file mode 100644
index 45ced086..00000000
--- a/uno/lib/python/poub/attr/_version_info.pyi
+++ /dev/null
@@ -1,9 +0,0 @@
-class VersionInfo:
-    @property
-    def year(self) -> int: ...
-    @property
-    def minor(self) -> int: ...
-    @property
-    def micro(self) -> int: ...
-    @property
-    def releaselevel(self) -> str: ...
diff --git a/uno/lib/python/poub/attr/converters.py b/uno/lib/python/poub/attr/converters.py
deleted file mode 100644
index 4cada106..00000000
--- a/uno/lib/python/poub/attr/converters.py
+++ /dev/null
@@ -1,144 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-"""
-Commonly useful converters.
-"""
-
-
-import typing
-
-from ._compat import _AnnotationExtractor
-from ._make import NOTHING, Factory, pipe
-
-
-__all__ = [
-    "default_if_none",
-    "optional",
-    "pipe",
-    "to_bool",
-]
-
-
-def optional(converter):
-    """
-    A converter that allows an attribute to be optional. An optional attribute
-    is one which can be set to ``None``.
-
-    Type annotations will be inferred from the wrapped converter's, if it
-    has any.
-
-    :param callable converter: the converter that is used for non-``None``
-        values.
-
-    .. versionadded:: 17.1.0
-    """
-
-    def optional_converter(val):
-        if val is None:
-            return None
-        return converter(val)
-
-    xtr = _AnnotationExtractor(converter)
-
-    t = xtr.get_first_param_type()
-    if t:
-        optional_converter.__annotations__["val"] = typing.Optional[t]
-
-    rt = xtr.get_return_type()
-    if rt:
-        optional_converter.__annotations__["return"] = typing.Optional[rt]
-
-    return optional_converter
-
-
-def default_if_none(default=NOTHING, factory=None):
-    """
-    A converter that allows to replace ``None`` values by *default* or the
-    result of *factory*.
-
-    :param default: Value to be used if ``None`` is passed. Passing an instance
-       of `attrs.Factory` is supported, however the ``takes_self`` option
-       is *not*.
-    :param callable factory: A callable that takes no parameters whose result
-       is used if ``None`` is passed.
-
-    :raises TypeError: If **neither** *default* or *factory* is passed.
-    :raises TypeError: If **both** *default* and *factory* are passed.
-    :raises ValueError: If an instance of `attrs.Factory` is passed with
-       ``takes_self=True``.
-
-    .. versionadded:: 18.2.0
-    """
-    if default is NOTHING and factory is None:
-        raise TypeError("Must pass either `default` or `factory`.")
-
-    if default is not NOTHING and factory is not None:
-        raise TypeError(
-            "Must pass either `default` or `factory` but not both."
-        )
-
-    if factory is not None:
-        default = Factory(factory)
-
-    if isinstance(default, Factory):
-        if default.takes_self:
-            raise ValueError(
-                "`takes_self` is not supported by default_if_none."
-            )
-
-        def default_if_none_converter(val):
-            if val is not None:
-                return val
-
-            return default.factory()
-
-    else:
-
-        def default_if_none_converter(val):
-            if val is not None:
-                return val
-
-            return default
-
-    return default_if_none_converter
-
-
-def to_bool(val):
-    """
-    Convert "boolean" strings (e.g., from env. vars.) to real booleans.
-
-    Values mapping to :code:`True`:
-
-    - :code:`True`
-    - :code:`"true"` / :code:`"t"`
-    - :code:`"yes"` / :code:`"y"`
-    - :code:`"on"`
-    - :code:`"1"`
-    - :code:`1`
-
-    Values mapping to :code:`False`:
-
-    - :code:`False`
-    - :code:`"false"` / :code:`"f"`
-    - :code:`"no"` / :code:`"n"`
-    - :code:`"off"`
-    - :code:`"0"`
-    - :code:`0`
-
-    :raises ValueError: for any other value.
-
-    .. versionadded:: 21.3.0
-    """
-    if isinstance(val, str):
-        val = val.lower()
-    truthy = {True, "true", "t", "yes", "y", "on", "1", 1}
-    falsy = {False, "false", "f", "no", "n", "off", "0", 0}
-    try:
-        if val in truthy:
-            return True
-        if val in falsy:
-            return False
-    except TypeError:
-        # Raised when "val" is not hashable (e.g., lists)
-        pass
-    raise ValueError(f"Cannot convert value to bool: {val}")
diff --git a/uno/lib/python/poub/attr/converters.pyi b/uno/lib/python/poub/attr/converters.pyi
deleted file mode 100644
index 5abb49f6..00000000
--- a/uno/lib/python/poub/attr/converters.pyi
+++ /dev/null
@@ -1,13 +0,0 @@
-from typing import Callable, TypeVar, overload
-
-from . import _ConverterType
-
-_T = TypeVar("_T")
-
-def pipe(*validators: _ConverterType) -> _ConverterType: ...
-def optional(converter: _ConverterType) -> _ConverterType: ...
-@overload
-def default_if_none(default: _T) -> _ConverterType: ...
-@overload
-def default_if_none(*, factory: Callable[[], _T]) -> _ConverterType: ...
-def to_bool(val: str) -> bool: ...
diff --git a/uno/lib/python/poub/attr/exceptions.py b/uno/lib/python/poub/attr/exceptions.py
deleted file mode 100644
index 28834930..00000000
--- a/uno/lib/python/poub/attr/exceptions.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-
-class FrozenError(AttributeError):
-    """
-    A frozen/immutable instance or attribute have been attempted to be
-    modified.
-
-    It mirrors the behavior of ``namedtuples`` by using the same error message
-    and subclassing `AttributeError`.
-
-    .. versionadded:: 20.1.0
-    """
-
-    msg = "can't set attribute"
-    args = [msg]
-
-
-class FrozenInstanceError(FrozenError):
-    """
-    A frozen instance has been attempted to be modified.
-
-    .. versionadded:: 16.1.0
-    """
-
-
-class FrozenAttributeError(FrozenError):
-    """
-    A frozen attribute has been attempted to be modified.
-
-    .. versionadded:: 20.1.0
-    """
-
-
-class AttrsAttributeNotFoundError(ValueError):
-    """
-    An *attrs* function couldn't find an attribute that the user asked for.
-
-    .. versionadded:: 16.2.0
-    """
-
-
-class NotAnAttrsClassError(ValueError):
-    """
-    A non-*attrs* class has been passed into an *attrs* function.
-
-    .. versionadded:: 16.2.0
-    """
-
-
-class DefaultAlreadySetError(RuntimeError):
-    """
-    A default has been set when defining the field and is attempted to be reset
-    using the decorator.
-
-    .. versionadded:: 17.1.0
-    """
-
-
-class UnannotatedAttributeError(RuntimeError):
-    """
-    A class with ``auto_attribs=True`` has a field without a type annotation.
-
-    .. versionadded:: 17.3.0
-    """
-
-
-class PythonTooOldError(RuntimeError):
-    """
-    It was attempted to use an *attrs* feature that requires a newer Python
-    version.
-
-    .. versionadded:: 18.2.0
-    """
-
-
-class NotCallableError(TypeError):
-    """
-    A field requiring a callable has been set with a value that is not
-    callable.
-
-    .. versionadded:: 19.2.0
-    """
-
-    def __init__(self, msg, value):
-        super(TypeError, self).__init__(msg, value)
-        self.msg = msg
-        self.value = value
-
-    def __str__(self):
-        return str(self.msg)
diff --git a/uno/lib/python/poub/attr/exceptions.pyi b/uno/lib/python/poub/attr/exceptions.pyi
deleted file mode 100644
index f2680118..00000000
--- a/uno/lib/python/poub/attr/exceptions.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-from typing import Any
-
-class FrozenError(AttributeError):
-    msg: str = ...
-
-class FrozenInstanceError(FrozenError): ...
-class FrozenAttributeError(FrozenError): ...
-class AttrsAttributeNotFoundError(ValueError): ...
-class NotAnAttrsClassError(ValueError): ...
-class DefaultAlreadySetError(RuntimeError): ...
-class UnannotatedAttributeError(RuntimeError): ...
-class PythonTooOldError(RuntimeError): ...
-
-class NotCallableError(TypeError):
-    msg: str = ...
-    value: Any = ...
-    def __init__(self, msg: str, value: Any) -> None: ...
diff --git a/uno/lib/python/poub/attr/filters.py b/uno/lib/python/poub/attr/filters.py
deleted file mode 100644
index a1e40c98..00000000
--- a/uno/lib/python/poub/attr/filters.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-"""
-Commonly useful filters for `attr.asdict`.
-"""
-
-from ._make import Attribute
-
-
-def _split_what(what):
-    """
-    Returns a tuple of `frozenset`s of classes and attributes.
-    """
-    return (
-        frozenset(cls for cls in what if isinstance(cls, type)),
-        frozenset(cls for cls in what if isinstance(cls, str)),
-        frozenset(cls for cls in what if isinstance(cls, Attribute)),
-    )
-
-
-def include(*what):
-    """
-    Include *what*.
-
-    :param what: What to include.
-    :type what: `list` of classes `type`, field names `str` or
-        `attrs.Attribute`\\ s
-
-    :rtype: `callable`
-
-    .. versionchanged:: 23.1.0 Accept strings with field names.
-    """
-    cls, names, attrs = _split_what(what)
-
-    def include_(attribute, value):
-        return (
-            value.__class__ in cls
-            or attribute.name in names
-            or attribute in attrs
-        )
-
-    return include_
-
-
-def exclude(*what):
-    """
-    Exclude *what*.
-
-    :param what: What to exclude.
-    :type what: `list` of classes `type`, field names `str` or
-        `attrs.Attribute`\\ s.
-
-    :rtype: `callable`
-
-    .. versionchanged:: 23.3.0 Accept field name string as input argument
-    """
-    cls, names, attrs = _split_what(what)
-
-    def exclude_(attribute, value):
-        return not (
-            value.__class__ in cls
-            or attribute.name in names
-            or attribute in attrs
-        )
-
-    return exclude_
diff --git a/uno/lib/python/poub/attr/filters.pyi b/uno/lib/python/poub/attr/filters.pyi
deleted file mode 100644
index 8a02fa0f..00000000
--- a/uno/lib/python/poub/attr/filters.pyi
+++ /dev/null
@@ -1,6 +0,0 @@
-from typing import Any, Union
-
-from . import Attribute, _FilterType
-
-def include(*what: Union[type, str, Attribute[Any]]) -> _FilterType[Any]: ...
-def exclude(*what: Union[type, str, Attribute[Any]]) -> _FilterType[Any]: ...
diff --git a/uno/lib/python/poub/attr/py.typed b/uno/lib/python/poub/attr/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/uno/lib/python/poub/attr/setters.py b/uno/lib/python/poub/attr/setters.py
deleted file mode 100644
index 12ed6750..00000000
--- a/uno/lib/python/poub/attr/setters.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-"""
-Commonly used hooks for on_setattr.
-"""
-
-
-from . import _config
-from .exceptions import FrozenAttributeError
-
-
-def pipe(*setters):
-    """
-    Run all *setters* and return the return value of the last one.
-
-    .. versionadded:: 20.1.0
-    """
-
-    def wrapped_pipe(instance, attrib, new_value):
-        rv = new_value
-
-        for setter in setters:
-            rv = setter(instance, attrib, rv)
-
-        return rv
-
-    return wrapped_pipe
-
-
-def frozen(_, __, ___):
-    """
-    Prevent an attribute to be modified.
-
-    .. versionadded:: 20.1.0
-    """
-    raise FrozenAttributeError()
-
-
-def validate(instance, attrib, new_value):
-    """
-    Run *attrib*'s validator on *new_value* if it has one.
-
-    .. versionadded:: 20.1.0
-    """
-    if _config._run_validators is False:
-        return new_value
-
-    v = attrib.validator
-    if not v:
-        return new_value
-
-    v(instance, attrib, new_value)
-
-    return new_value
-
-
-def convert(instance, attrib, new_value):
-    """
-    Run *attrib*'s converter -- if it has one --  on *new_value* and return the
-    result.
-
-    .. versionadded:: 20.1.0
-    """
-    c = attrib.converter
-    if c:
-        return c(new_value)
-
-    return new_value
-
-
-# Sentinel for disabling class-wide *on_setattr* hooks for certain attributes.
-# autodata stopped working, so the docstring is inlined in the API docs.
-NO_OP = object()
diff --git a/uno/lib/python/poub/attr/setters.pyi b/uno/lib/python/poub/attr/setters.pyi
deleted file mode 100644
index 72f7ce47..00000000
--- a/uno/lib/python/poub/attr/setters.pyi
+++ /dev/null
@@ -1,19 +0,0 @@
-from typing import Any, NewType, NoReturn, TypeVar
-
-from . import Attribute, _OnSetAttrType
-
-_T = TypeVar("_T")
-
-def frozen(
-    instance: Any, attribute: Attribute[Any], new_value: Any
-) -> NoReturn: ...
-def pipe(*setters: _OnSetAttrType) -> _OnSetAttrType: ...
-def validate(instance: Any, attribute: Attribute[_T], new_value: _T) -> _T: ...
-
-# convert is allowed to return Any, because they can be chained using pipe.
-def convert(
-    instance: Any, attribute: Attribute[Any], new_value: Any
-) -> Any: ...
-
-_NoOpType = NewType("_NoOpType", object)
-NO_OP: _NoOpType
diff --git a/uno/lib/python/poub/attr/validators.py b/uno/lib/python/poub/attr/validators.py
deleted file mode 100644
index 1488554f..00000000
--- a/uno/lib/python/poub/attr/validators.py
+++ /dev/null
@@ -1,720 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-"""
-Commonly useful validators.
-"""
-
-
-import operator
-import re
-
-from contextlib import contextmanager
-from re import Pattern
-
-from ._config import get_run_validators, set_run_validators
-from ._make import _AndValidator, and_, attrib, attrs
-from .converters import default_if_none
-from .exceptions import NotCallableError
-
-
-__all__ = [
-    "and_",
-    "deep_iterable",
-    "deep_mapping",
-    "disabled",
-    "ge",
-    "get_disabled",
-    "gt",
-    "in_",
-    "instance_of",
-    "is_callable",
-    "le",
-    "lt",
-    "matches_re",
-    "max_len",
-    "min_len",
-    "not_",
-    "optional",
-    "provides",
-    "set_disabled",
-]
-
-
-def set_disabled(disabled):
-    """
-    Globally disable or enable running validators.
-
-    By default, they are run.
-
-    :param disabled: If ``True``, disable running all validators.
-    :type disabled: bool
-
-    .. warning::
-
-        This function is not thread-safe!
-
-    .. versionadded:: 21.3.0
-    """
-    set_run_validators(not disabled)
-
-
-def get_disabled():
-    """
-    Return a bool indicating whether validators are currently disabled or not.
-
-    :return: ``True`` if validators are currently disabled.
-    :rtype: bool
-
-    .. versionadded:: 21.3.0
-    """
-    return not get_run_validators()
-
-
-@contextmanager
-def disabled():
-    """
-    Context manager that disables running validators within its context.
-
-    .. warning::
-
-        This context manager is not thread-safe!
-
-    .. versionadded:: 21.3.0
-    """
-    set_run_validators(False)
-    try:
-        yield
-    finally:
-        set_run_validators(True)
-
-
-@attrs(repr=False, slots=True, hash=True)
-class _InstanceOfValidator:
-    type = attrib()
-
-    def __call__(self, inst, attr, value):
-        """
-        We use a callable class to be able to change the ``__repr__``.
-        """
-        if not isinstance(value, self.type):
-            raise TypeError(
-                "'{name}' must be {type!r} (got {value!r} that is a "
-                "{actual!r}).".format(
-                    name=attr.name,
-                    type=self.type,
-                    actual=value.__class__,
-                    value=value,
-                ),
-                attr,
-                self.type,
-                value,
-            )
-
-    def __repr__(self):
-        return "<instance_of validator for type {type!r}>".format(
-            type=self.type
-        )
-
-
-def instance_of(type):
-    """
-    A validator that raises a `TypeError` if the initializer is called
-    with a wrong type for this particular attribute (checks are performed using
-    `isinstance` therefore it's also valid to pass a tuple of types).
-
-    :param type: The type to check for.
-    :type type: type or tuple of type
-
-    :raises TypeError: With a human readable error message, the attribute
-        (of type `attrs.Attribute`), the expected type, and the value it
-        got.
-    """
-    return _InstanceOfValidator(type)
-
-
-@attrs(repr=False, frozen=True, slots=True)
-class _MatchesReValidator:
-    pattern = attrib()
-    match_func = attrib()
-
-    def __call__(self, inst, attr, value):
-        """
-        We use a callable class to be able to change the ``__repr__``.
-        """
-        if not self.match_func(value):
-            raise ValueError(
-                "'{name}' must match regex {pattern!r}"
-                " ({value!r} doesn't)".format(
-                    name=attr.name, pattern=self.pattern.pattern, value=value
-                ),
-                attr,
-                self.pattern,
-                value,
-            )
-
-    def __repr__(self):
-        return "<matches_re validator for pattern {pattern!r}>".format(
-            pattern=self.pattern
-        )
-
-
-def matches_re(regex, flags=0, func=None):
-    r"""
-    A validator that raises `ValueError` if the initializer is called
-    with a string that doesn't match *regex*.
-
-    :param regex: a regex string or precompiled pattern to match against
-    :param int flags: flags that will be passed to the underlying re function
-        (default 0)
-    :param callable func: which underlying `re` function to call. Valid options
-        are `re.fullmatch`, `re.search`, and `re.match`; the default ``None``
-        means `re.fullmatch`. For performance reasons, the pattern is always
-        precompiled using `re.compile`.
-
-    .. versionadded:: 19.2.0
-    .. versionchanged:: 21.3.0 *regex* can be a pre-compiled pattern.
-    """
-    valid_funcs = (re.fullmatch, None, re.search, re.match)
-    if func not in valid_funcs:
-        raise ValueError(
-            "'func' must be one of {}.".format(
-                ", ".join(
-                    sorted(
-                        e and e.__name__ or "None" for e in set(valid_funcs)
-                    )
-                )
-            )
-        )
-
-    if isinstance(regex, Pattern):
-        if flags:
-            raise TypeError(
-                "'flags' can only be used with a string pattern; "
-                "pass flags to re.compile() instead"
-            )
-        pattern = regex
-    else:
-        pattern = re.compile(regex, flags)
-
-    if func is re.match:
-        match_func = pattern.match
-    elif func is re.search:
-        match_func = pattern.search
-    else:
-        match_func = pattern.fullmatch
-
-    return _MatchesReValidator(pattern, match_func)
-
-
-@attrs(repr=False, slots=True, hash=True)
-class _ProvidesValidator:
-    interface = attrib()
-
-    def __call__(self, inst, attr, value):
-        """
-        We use a callable class to be able to change the ``__repr__``.
-        """
-        if not self.interface.providedBy(value):
-            raise TypeError(
-                "'{name}' must provide {interface!r} which {value!r} "
-                "doesn't.".format(
-                    name=attr.name, interface=self.interface, value=value
-                ),
-                attr,
-                self.interface,
-                value,
-            )
-
-    def __repr__(self):
-        return "<provides validator for interface {interface!r}>".format(
-            interface=self.interface
-        )
-
-
-def provides(interface):
-    """
-    A validator that raises a `TypeError` if the initializer is called
-    with an object that does not provide the requested *interface* (checks are
-    performed using ``interface.providedBy(value)`` (see `zope.interface
-    <https://zopeinterface.readthedocs.io/en/latest/>`_).
-
-    :param interface: The interface to check for.
-    :type interface: ``zope.interface.Interface``
-
-    :raises TypeError: With a human readable error message, the attribute
-        (of type `attrs.Attribute`), the expected interface, and the
-        value it got.
-
-    .. deprecated:: 23.1.0
-    """
-    import warnings
-
-    warnings.warn(
-        "attrs's zope-interface support is deprecated and will be removed in, "
-        "or after, April 2024.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    return _ProvidesValidator(interface)
-
-
-@attrs(repr=False, slots=True, hash=True)
-class _OptionalValidator:
-    validator = attrib()
-
-    def __call__(self, inst, attr, value):
-        if value is None:
-            return
-
-        self.validator(inst, attr, value)
-
-    def __repr__(self):
-        return "<optional validator for {what} or None>".format(
-            what=repr(self.validator)
-        )
-
-
-def optional(validator):
-    """
-    A validator that makes an attribute optional.  An optional attribute is one
-    which can be set to ``None`` in addition to satisfying the requirements of
-    the sub-validator.
-
-    :param Callable | tuple[Callable] | list[Callable] validator: A validator
-        (or validators) that is used for non-``None`` values.
-
-    .. versionadded:: 15.1.0
-    .. versionchanged:: 17.1.0 *validator* can be a list of validators.
-    .. versionchanged:: 23.1.0 *validator* can also be a tuple of validators.
-    """
-    if isinstance(validator, (list, tuple)):
-        return _OptionalValidator(_AndValidator(validator))
-
-    return _OptionalValidator(validator)
-
-
-@attrs(repr=False, slots=True, hash=True)
-class _InValidator:
-    options = attrib()
-
-    def __call__(self, inst, attr, value):
-        try:
-            in_options = value in self.options
-        except TypeError:  # e.g. `1 in "abc"`
-            in_options = False
-
-        if not in_options:
-            raise ValueError(
-                "'{name}' must be in {options!r} (got {value!r})".format(
-                    name=attr.name, options=self.options, value=value
-                ),
-                attr,
-                self.options,
-                value,
-            )
-
-    def __repr__(self):
-        return "<in_ validator with options {options!r}>".format(
-            options=self.options
-        )
-
-
-def in_(options):
-    """
-    A validator that raises a `ValueError` if the initializer is called
-    with a value that does not belong in the options provided.  The check is
-    performed using ``value in options``.
-
-    :param options: Allowed options.
-    :type options: list, tuple, `enum.Enum`, ...
-
-    :raises ValueError: With a human readable error message, the attribute (of
-       type `attrs.Attribute`), the expected options, and the value it
-       got.
-
-    .. versionadded:: 17.1.0
-    .. versionchanged:: 22.1.0
-       The ValueError was incomplete until now and only contained the human
-       readable error message. Now it contains all the information that has
-       been promised since 17.1.0.
-    """
-    return _InValidator(options)
-
-
-@attrs(repr=False, slots=False, hash=True)
-class _IsCallableValidator:
-    def __call__(self, inst, attr, value):
-        """
-        We use a callable class to be able to change the ``__repr__``.
-        """
-        if not callable(value):
-            message = (
-                "'{name}' must be callable "
-                "(got {value!r} that is a {actual!r})."
-            )
-            raise NotCallableError(
-                msg=message.format(
-                    name=attr.name, value=value, actual=value.__class__
-                ),
-                value=value,
-            )
-
-    def __repr__(self):
-        return "<is_callable validator>"
-
-
-def is_callable():
-    """
-    A validator that raises a `attrs.exceptions.NotCallableError` if the
-    initializer is called with a value for this particular attribute
-    that is not callable.
-
-    .. versionadded:: 19.1.0
-
-    :raises attrs.exceptions.NotCallableError: With a human readable error
-        message containing the attribute (`attrs.Attribute`) name,
-        and the value it got.
-    """
-    return _IsCallableValidator()
-
-
-@attrs(repr=False, slots=True, hash=True)
-class _DeepIterable:
-    member_validator = attrib(validator=is_callable())
-    iterable_validator = attrib(
-        default=None, validator=optional(is_callable())
-    )
-
-    def __call__(self, inst, attr, value):
-        """
-        We use a callable class to be able to change the ``__repr__``.
-        """
-        if self.iterable_validator is not None:
-            self.iterable_validator(inst, attr, value)
-
-        for member in value:
-            self.member_validator(inst, attr, member)
-
-    def __repr__(self):
-        iterable_identifier = (
-            ""
-            if self.iterable_validator is None
-            else f" {self.iterable_validator!r}"
-        )
-        return (
-            "<deep_iterable validator for{iterable_identifier}"
-            " iterables of {member!r}>"
-        ).format(
-            iterable_identifier=iterable_identifier,
-            member=self.member_validator,
-        )
-
-
-def deep_iterable(member_validator, iterable_validator=None):
-    """
-    A validator that performs deep validation of an iterable.
-
-    :param member_validator: Validator(s) to apply to iterable members
-    :param iterable_validator: Validator to apply to iterable itself
-        (optional)
-
-    .. versionadded:: 19.1.0
-
-    :raises TypeError: if any sub-validators fail
-    """
-    if isinstance(member_validator, (list, tuple)):
-        member_validator = and_(*member_validator)
-    return _DeepIterable(member_validator, iterable_validator)
-
-
-@attrs(repr=False, slots=True, hash=True)
-class _DeepMapping:
-    key_validator = attrib(validator=is_callable())
-    value_validator = attrib(validator=is_callable())
-    mapping_validator = attrib(default=None, validator=optional(is_callable()))
-
-    def __call__(self, inst, attr, value):
-        """
-        We use a callable class to be able to change the ``__repr__``.
-        """
-        if self.mapping_validator is not None:
-            self.mapping_validator(inst, attr, value)
-
-        for key in value:
-            self.key_validator(inst, attr, key)
-            self.value_validator(inst, attr, value[key])
-
-    def __repr__(self):
-        return (
-            "<deep_mapping validator for objects mapping {key!r} to {value!r}>"
-        ).format(key=self.key_validator, value=self.value_validator)
-
-
-def deep_mapping(key_validator, value_validator, mapping_validator=None):
-    """
-    A validator that performs deep validation of a dictionary.
-
-    :param key_validator: Validator to apply to dictionary keys
-    :param value_validator: Validator to apply to dictionary values
-    :param mapping_validator: Validator to apply to top-level mapping
-        attribute (optional)
-
-    .. versionadded:: 19.1.0
-
-    :raises TypeError: if any sub-validators fail
-    """
-    return _DeepMapping(key_validator, value_validator, mapping_validator)
-
-
-@attrs(repr=False, frozen=True, slots=True)
-class _NumberValidator:
-    bound = attrib()
-    compare_op = attrib()
-    compare_func = attrib()
-
-    def __call__(self, inst, attr, value):
-        """
-        We use a callable class to be able to change the ``__repr__``.
-        """
-        if not self.compare_func(value, self.bound):
-            raise ValueError(
-                "'{name}' must be {op} {bound}: {value}".format(
-                    name=attr.name,
-                    op=self.compare_op,
-                    bound=self.bound,
-                    value=value,
-                )
-            )
-
-    def __repr__(self):
-        return "<Validator for x {op} {bound}>".format(
-            op=self.compare_op, bound=self.bound
-        )
-
-
-def lt(val):
-    """
-    A validator that raises `ValueError` if the initializer is called
-    with a number larger or equal to *val*.
-
-    :param val: Exclusive upper bound for values
-
-    .. versionadded:: 21.3.0
-    """
-    return _NumberValidator(val, "<", operator.lt)
-
-
-def le(val):
-    """
-    A validator that raises `ValueError` if the initializer is called
-    with a number greater than *val*.
-
-    :param val: Inclusive upper bound for values
-
-    .. versionadded:: 21.3.0
-    """
-    return _NumberValidator(val, "<=", operator.le)
-
-
-def ge(val):
-    """
-    A validator that raises `ValueError` if the initializer is called
-    with a number smaller than *val*.
-
-    :param val: Inclusive lower bound for values
-
-    .. versionadded:: 21.3.0
-    """
-    return _NumberValidator(val, ">=", operator.ge)
-
-
-def gt(val):
-    """
-    A validator that raises `ValueError` if the initializer is called
-    with a number smaller or equal to *val*.
-
-    :param val: Exclusive lower bound for values
-
-    .. versionadded:: 21.3.0
-    """
-    return _NumberValidator(val, ">", operator.gt)
-
-
-@attrs(repr=False, frozen=True, slots=True)
-class _MaxLengthValidator:
-    max_length = attrib()
-
-    def __call__(self, inst, attr, value):
-        """
-        We use a callable class to be able to change the ``__repr__``.
-        """
-        if len(value) > self.max_length:
-            raise ValueError(
-                "Length of '{name}' must be <= {max}: {len}".format(
-                    name=attr.name, max=self.max_length, len=len(value)
-                )
-            )
-
-    def __repr__(self):
-        return f"<max_len validator for {self.max_length}>"
-
-
-def max_len(length):
-    """
-    A validator that raises `ValueError` if the initializer is called
-    with a string or iterable that is longer than *length*.
-
-    :param int length: Maximum length of the string or iterable
-
-    .. versionadded:: 21.3.0
-    """
-    return _MaxLengthValidator(length)
-
-
-@attrs(repr=False, frozen=True, slots=True)
-class _MinLengthValidator:
-    min_length = attrib()
-
-    def __call__(self, inst, attr, value):
-        """
-        We use a callable class to be able to change the ``__repr__``.
-        """
-        if len(value) < self.min_length:
-            raise ValueError(
-                "Length of '{name}' must be => {min}: {len}".format(
-                    name=attr.name, min=self.min_length, len=len(value)
-                )
-            )
-
-    def __repr__(self):
-        return f"<min_len validator for {self.min_length}>"
-
-
-def min_len(length):
-    """
-    A validator that raises `ValueError` if the initializer is called
-    with a string or iterable that is shorter than *length*.
-
-    :param int length: Minimum length of the string or iterable
-
-    .. versionadded:: 22.1.0
-    """
-    return _MinLengthValidator(length)
-
-
-@attrs(repr=False, slots=True, hash=True)
-class _SubclassOfValidator:
-    type = attrib()
-
-    def __call__(self, inst, attr, value):
-        """
-        We use a callable class to be able to change the ``__repr__``.
-        """
-        if not issubclass(value, self.type):
-            raise TypeError(
-                "'{name}' must be a subclass of {type!r} "
-                "(got {value!r}).".format(
-                    name=attr.name,
-                    type=self.type,
-                    value=value,
-                ),
-                attr,
-                self.type,
-                value,
-            )
-
-    def __repr__(self):
-        return "<subclass_of validator for type {type!r}>".format(
-            type=self.type
-        )
-
-
-def _subclass_of(type):
-    """
-    A validator that raises a `TypeError` if the initializer is called
-    with a wrong type for this particular attribute (checks are performed using
-    `issubclass` therefore it's also valid to pass a tuple of types).
-
-    :param type: The type to check for.
-    :type type: type or tuple of types
-
-    :raises TypeError: With a human readable error message, the attribute
-        (of type `attrs.Attribute`), the expected type, and the value it
-        got.
-    """
-    return _SubclassOfValidator(type)
-
-
-@attrs(repr=False, slots=True, hash=True)
-class _NotValidator:
-    validator = attrib()
-    msg = attrib(
-        converter=default_if_none(
-            "not_ validator child '{validator!r}' "
-            "did not raise a captured error"
-        )
-    )
-    exc_types = attrib(
-        validator=deep_iterable(
-            member_validator=_subclass_of(Exception),
-            iterable_validator=instance_of(tuple),
-        ),
-    )
-
-    def __call__(self, inst, attr, value):
-        try:
-            self.validator(inst, attr, value)
-        except self.exc_types:
-            pass  # suppress error to invert validity
-        else:
-            raise ValueError(
-                self.msg.format(
-                    validator=self.validator,
-                    exc_types=self.exc_types,
-                ),
-                attr,
-                self.validator,
-                value,
-                self.exc_types,
-            )
-
-    def __repr__(self):
-        return (
-            "<not_ validator wrapping {what!r}, " "capturing {exc_types!r}>"
-        ).format(
-            what=self.validator,
-            exc_types=self.exc_types,
-        )
-
-
-def not_(validator, *, msg=None, exc_types=(ValueError, TypeError)):
-    """
-    A validator that wraps and logically 'inverts' the validator passed to it.
-    It will raise a `ValueError` if the provided validator *doesn't* raise a
-    `ValueError` or `TypeError` (by default), and will suppress the exception
-    if the provided validator *does*.
-
-    Intended to be used with existing validators to compose logic without
-    needing to create inverted variants, for example, ``not_(in_(...))``.
-
-    :param validator: A validator to be logically inverted.
-    :param msg: Message to raise if validator fails.
-        Formatted with keys ``exc_types`` and ``validator``.
-    :type msg: str
-    :param exc_types: Exception type(s) to capture.
-        Other types raised by child validators will not be intercepted and
-        pass through.
-
-    :raises ValueError: With a human readable error message,
-        the attribute (of type `attrs.Attribute`),
-        the validator that failed to raise an exception,
-        the value it got,
-        and the expected exception types.
-
-    .. versionadded:: 22.2.0
-    """
-    try:
-        exc_types = tuple(exc_types)
-    except TypeError:
-        exc_types = (exc_types,)
-    return _NotValidator(validator, msg, exc_types)
diff --git a/uno/lib/python/poub/attr/validators.pyi b/uno/lib/python/poub/attr/validators.pyi
deleted file mode 100644
index d194a75a..00000000
--- a/uno/lib/python/poub/attr/validators.pyi
+++ /dev/null
@@ -1,88 +0,0 @@
-from typing import (
-    Any,
-    AnyStr,
-    Callable,
-    Container,
-    ContextManager,
-    Iterable,
-    List,
-    Mapping,
-    Match,
-    Optional,
-    Pattern,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-    overload,
-)
-
-from . import _ValidatorType
-from . import _ValidatorArgType
-
-_T = TypeVar("_T")
-_T1 = TypeVar("_T1")
-_T2 = TypeVar("_T2")
-_T3 = TypeVar("_T3")
-_I = TypeVar("_I", bound=Iterable)
-_K = TypeVar("_K")
-_V = TypeVar("_V")
-_M = TypeVar("_M", bound=Mapping)
-
-def set_disabled(run: bool) -> None: ...
-def get_disabled() -> bool: ...
-def disabled() -> ContextManager[None]: ...
-
-# To be more precise on instance_of use some overloads.
-# If there are more than 3 items in the tuple then we fall back to Any
-@overload
-def instance_of(type: Type[_T]) -> _ValidatorType[_T]: ...
-@overload
-def instance_of(type: Tuple[Type[_T]]) -> _ValidatorType[_T]: ...
-@overload
-def instance_of(
-    type: Tuple[Type[_T1], Type[_T2]]
-) -> _ValidatorType[Union[_T1, _T2]]: ...
-@overload
-def instance_of(
-    type: Tuple[Type[_T1], Type[_T2], Type[_T3]]
-) -> _ValidatorType[Union[_T1, _T2, _T3]]: ...
-@overload
-def instance_of(type: Tuple[type, ...]) -> _ValidatorType[Any]: ...
-def provides(interface: Any) -> _ValidatorType[Any]: ...
-def optional(
-    validator: Union[
-        _ValidatorType[_T], List[_ValidatorType[_T]], Tuple[_ValidatorType[_T]]
-    ]
-) -> _ValidatorType[Optional[_T]]: ...
-def in_(options: Container[_T]) -> _ValidatorType[_T]: ...
-def and_(*validators: _ValidatorType[_T]) -> _ValidatorType[_T]: ...
-def matches_re(
-    regex: Union[Pattern[AnyStr], AnyStr],
-    flags: int = ...,
-    func: Optional[
-        Callable[[AnyStr, AnyStr, int], Optional[Match[AnyStr]]]
-    ] = ...,
-) -> _ValidatorType[AnyStr]: ...
-def deep_iterable(
-    member_validator: _ValidatorArgType[_T],
-    iterable_validator: Optional[_ValidatorType[_I]] = ...,
-) -> _ValidatorType[_I]: ...
-def deep_mapping(
-    key_validator: _ValidatorType[_K],
-    value_validator: _ValidatorType[_V],
-    mapping_validator: Optional[_ValidatorType[_M]] = ...,
-) -> _ValidatorType[_M]: ...
-def is_callable() -> _ValidatorType[_T]: ...
-def lt(val: _T) -> _ValidatorType[_T]: ...
-def le(val: _T) -> _ValidatorType[_T]: ...
-def ge(val: _T) -> _ValidatorType[_T]: ...
-def gt(val: _T) -> _ValidatorType[_T]: ...
-def max_len(length: int) -> _ValidatorType[_T]: ...
-def min_len(length: int) -> _ValidatorType[_T]: ...
-def not_(
-    validator: _ValidatorType[_T],
-    *,
-    msg: Optional[str] = None,
-    exc_types: Union[Type[Exception], Iterable[Type[Exception]]] = ...,
-) -> _ValidatorType[_T]: ...
diff --git a/uno/lib/python/poub/attrs/__init__.py b/uno/lib/python/poub/attrs/__init__.py
deleted file mode 100644
index 0c248156..00000000
--- a/uno/lib/python/poub/attrs/__init__.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-from attr import (
-    NOTHING,
-    Attribute,
-    AttrsInstance,
-    Factory,
-    _make_getattr,
-    assoc,
-    cmp_using,
-    define,
-    evolve,
-    field,
-    fields,
-    fields_dict,
-    frozen,
-    has,
-    make_class,
-    mutable,
-    resolve_types,
-    validate,
-)
-from attr._next_gen import asdict, astuple
-
-from . import converters, exceptions, filters, setters, validators
-
-
-__all__ = [
-    "__author__",
-    "__copyright__",
-    "__description__",
-    "__doc__",
-    "__email__",
-    "__license__",
-    "__title__",
-    "__url__",
-    "__version__",
-    "__version_info__",
-    "asdict",
-    "assoc",
-    "astuple",
-    "Attribute",
-    "AttrsInstance",
-    "cmp_using",
-    "converters",
-    "define",
-    "evolve",
-    "exceptions",
-    "Factory",
-    "field",
-    "fields_dict",
-    "fields",
-    "filters",
-    "frozen",
-    "has",
-    "make_class",
-    "mutable",
-    "NOTHING",
-    "resolve_types",
-    "setters",
-    "validate",
-    "validators",
-]
-
-__getattr__ = _make_getattr(__name__)
diff --git a/uno/lib/python/poub/attrs/__init__.pyi b/uno/lib/python/poub/attrs/__init__.pyi
deleted file mode 100644
index 9372cfea..00000000
--- a/uno/lib/python/poub/attrs/__init__.pyi
+++ /dev/null
@@ -1,67 +0,0 @@
-from typing import (
-    Any,
-    Callable,
-    Dict,
-    Mapping,
-    Optional,
-    Sequence,
-    Tuple,
-    Type,
-)
-
-# Because we need to type our own stuff, we have to make everything from
-# attr explicitly public too.
-from attr import __author__ as __author__
-from attr import __copyright__ as __copyright__
-from attr import __description__ as __description__
-from attr import __email__ as __email__
-from attr import __license__ as __license__
-from attr import __title__ as __title__
-from attr import __url__ as __url__
-from attr import __version__ as __version__
-from attr import __version_info__ as __version_info__
-from attr import _FilterType
-from attr import assoc as assoc
-from attr import Attribute as Attribute
-from attr import AttrsInstance as AttrsInstance
-from attr import cmp_using as cmp_using
-from attr import converters as converters
-from attr import define as define
-from attr import evolve as evolve
-from attr import exceptions as exceptions
-from attr import Factory as Factory
-from attr import field as field
-from attr import fields as fields
-from attr import fields_dict as fields_dict
-from attr import filters as filters
-from attr import frozen as frozen
-from attr import has as has
-from attr import make_class as make_class
-from attr import mutable as mutable
-from attr import NOTHING as NOTHING
-from attr import resolve_types as resolve_types
-from attr import setters as setters
-from attr import validate as validate
-from attr import validators as validators
-
-# TODO: see definition of attr.asdict/astuple
-def asdict(
-    inst: AttrsInstance,
-    recurse: bool = ...,
-    filter: Optional[_FilterType[Any]] = ...,
-    dict_factory: Type[Mapping[Any, Any]] = ...,
-    retain_collection_types: bool = ...,
-    value_serializer: Optional[
-        Callable[[type, Attribute[Any], Any], Any]
-    ] = ...,
-    tuple_keys: bool = ...,
-) -> Dict[str, Any]: ...
-
-# TODO: add support for returning NamedTuple from the mypy plugin
-def astuple(
-    inst: AttrsInstance,
-    recurse: bool = ...,
-    filter: Optional[_FilterType[Any]] = ...,
-    tuple_factory: Type[Sequence[Any]] = ...,
-    retain_collection_types: bool = ...,
-) -> Tuple[Any, ...]: ...
diff --git a/uno/lib/python/poub/attrs/converters.py b/uno/lib/python/poub/attrs/converters.py
deleted file mode 100644
index edfa8d3c..00000000
--- a/uno/lib/python/poub/attrs/converters.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-from attr.converters import *  # noqa
diff --git a/uno/lib/python/poub/attrs/exceptions.py b/uno/lib/python/poub/attrs/exceptions.py
deleted file mode 100644
index bd9efed2..00000000
--- a/uno/lib/python/poub/attrs/exceptions.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-from attr.exceptions import *  # noqa
diff --git a/uno/lib/python/poub/attrs/filters.py b/uno/lib/python/poub/attrs/filters.py
deleted file mode 100644
index 52959005..00000000
--- a/uno/lib/python/poub/attrs/filters.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-from attr.filters import *  # noqa
diff --git a/uno/lib/python/poub/attrs/py.typed b/uno/lib/python/poub/attrs/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/uno/lib/python/poub/attrs/setters.py b/uno/lib/python/poub/attrs/setters.py
deleted file mode 100644
index 9b507708..00000000
--- a/uno/lib/python/poub/attrs/setters.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-from attr.setters import *  # noqa
diff --git a/uno/lib/python/poub/attrs/validators.py b/uno/lib/python/poub/attrs/validators.py
deleted file mode 100644
index ab2c9b30..00000000
--- a/uno/lib/python/poub/attrs/validators.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-from attr.validators import *  # noqa
diff --git a/uno/lib/uno/card/__init__.py b/uno/lib/uno/card/__init__.py
index 9db0376e..bd92aa0c 100644
--- a/uno/lib/uno/card/__init__.py
+++ b/uno/lib/uno/card/__init__.py
@@ -27,47 +27,22 @@
 ╚════════════════════════════════════════════════════════════════════════════════════╝
 """
 
-from .database import DataBase
-
-from .datasource import DataSource
-
 from .options import OptionsManager
 
-from .oauth2 import getOAuth2Version
-
 from .logger import getLogger
 
-from .dbtool import getConnectionUrl
+from .drvtool import getDataSource
+
+from .cardtool import getLogException
+
 from .dbtool import getDriverPropertyInfos
-from .dbtool import getSqlException
 
-from .unotool import checkVersion
-from .unotool import createMessageBox
-from .unotool import createService
-from .unotool import getDesktop
-from .unotool import getDialog
-from .unotool import getExtensionVersion
-from .unotool import getFileSequence
-from .unotool import getResourceLocation
-from .unotool import getSimpleFile
-from .unotool import getStringResource
 # FIXME Import necessary exclusively for vCardOOo
 from .unotool import getUrl
 
-from .oauth2 import g_extension as g_oauth2ext
-from .oauth2 import g_version as g_oauth2ver
-
-from .jdbcdriver import g_extension as g_jdbcext
-from .jdbcdriver import g_identifier as g_jdbcid
-from .jdbcdriver import g_version as g_jdbcver
-
+from .configuration import g_defaultlog
+from .configuration import g_host
 from .configuration import g_identifier
-from .configuration import g_extension
 from .configuration import g_protocol
-from .configuration import g_defaultlog
 from .configuration import g_scheme
-from .configuration import g_host
-
-from .dbconfig import g_folder
-from .dbconfig import g_version
 
diff --git a/uno/lib/uno/card/card/book.py b/uno/lib/uno/card/card/book.py
index f62b2fd3..f3a6cbc1 100644
--- a/uno/lib/uno/card/card/book.py
+++ b/uno/lib/uno/card/card/book.py
@@ -67,6 +67,7 @@ class Book(object):
     def __init__(self, ctx, new, **kwargs):
         self._ctx = ctx
         self._new = new
+        self._changed = False
         self._id = kwargs.get('Book')
         self._uri = kwargs.get('Uri')
         self._name = kwargs.get('Name')
@@ -98,4 +99,4 @@ def hasNameChanged(self, name):
         return self._name != name
 
     def setName(self, name):
-        self.Name = name
+        self._name = name
diff --git a/uno/lib/uno/card/card/database.py b/uno/lib/uno/card/card/database.py
index 443a2ec5..f857811e 100644
--- a/uno/lib/uno/card/card/database.py
+++ b/uno/lib/uno/card/card/database.py
@@ -200,6 +200,7 @@ def getSessionId(self, connection):
         return session
 
     def insertUser(self, uri, scheme, server, path, name):
+        metadata = None
         books = []
         call = self._getCall('insertUser')
         call.setString(1, uri)
@@ -208,17 +209,19 @@ def insertUser(self, uri, scheme, server, path, name):
         call.setString(4, path)
         call.setString(5, name)
         result = call.executeQuery()
-        user = {'User': call.getInt(6),
-                'Uri': uri,
-                'Scheme': scheme,
-                'Server': server,
-                'Path': path,
-                'Name': name}
-        while result.next():
-            books.append(getDataFromResult(result))
+        user = call.getInt(6)
+        if not call.wasNull():
+            metadata = {'User': user,
+                        'Uri': uri,
+                        'Scheme': scheme,
+                        'Server': server,
+                        'Path': path,
+                        'Name': name}
+            while result.next():
+                books.append(getDataFromResult(result))
         result.close()
         call.close()
-        return user, books
+        return metadata, books
 
     def createUser(self, schema, userid, name, password):
         format = {'Public': 'PUBLIC',
@@ -241,8 +244,8 @@ def createUser(self, schema, userid, name, password):
         statement.close()
 
     def selectUser(self, server, name):
-        books = []
         metadata = None
+        books = []
         call = self._getCall('selectUser')
         call.setString(1, server)
         call.setString(2, name)
@@ -255,8 +258,8 @@ def selectUser(self, server, name):
                         'Server': server,
                         'Path': call.getString(6),
                         'Name': name}
-        while result.next():
-            books.append(getDataFromResult(result))
+            while result.next():
+                books.append(getDataFromResult(result))
         result.close()
         call.close()
         return metadata, books
@@ -356,6 +359,7 @@ def _selectChangedGroups(self, start, stop):
         while result.next():
             groups.append(getDataFromResult(result))
         print("DataBase._selectChangedGroups() 2 %s" % (groups,))
+        result.close()
         call.close()
         return groups
 
@@ -546,23 +550,14 @@ def mergeGroup(self, aid, iterator):
         self._setBatchModeOff()
         return count
 
-    def mergeGroupData(self, gid, timestamp, iterator):
-        print("Provider.mergeGroupData() 1")
-        count = 0
-        self._setBatchModeOn()
+    def mergeGroupMembers(self, gid, timestamp, members):
         call = self._getCall('mergeGroupMembers')
         call.setInt(1, gid)
         call.setTimestamp(2, timestamp)
-        for members in iterator:
-            call.setArray(3, Array('VARCHAR', tuple(members)))
-            call.addBatch()
-            count += 1
-        if count:
-            call.executeBatch()
+        call.setArray(3, Array('VARCHAR', members))
+        call.executeUpdate()
         call.close()
-        self.Connection.commit()
-        self._setBatchModeOff()
-        return count
+        return 1
 
     def deleteCard(self, urls):
         call = self._getCall('deleteCard')
diff --git a/uno/lib/uno/card/card/provider.py b/uno/lib/uno/card/card/provider.py
index 97409f4d..c2669dce 100644
--- a/uno/lib/uno/card/card/provider.py
+++ b/uno/lib/uno/card/card/provider.py
@@ -45,23 +45,41 @@ class Provider(object):
     def __init__(self, ctx):
         self._ctx = ctx
 
-    @property
-    def DateTimeFormat(self):
-        return '%Y-%m-%dT%H:%M:%SZ'
-
+    # Currently only vCardOOo supports multiple address books
     def supportAddressBook(self):
         return False
 
+    # Currently only vCardOOo does not supports group
+    def supportGroup(self):
+        return True
+
     def parseDateTime(self, timestamp):
-        return getDateTimeFromString(timestamp, self.DateTimeFormat)
+        datetime = uno.createUnoStruct('com.sun.star.util.DateTime')
+        try:
+            dt = parser.parse(timestamp)
+        except parser.ParserError:
+            pass
+        else:
+            datetime.Year = dt.year
+            datetime.Month = dt.month
+            datetime.Day = dt.day
+            datetime.Hours = dt.hour
+            datetime.Minutes = dt.minute
+            datetime.Seconds = dt.second
+            datetime.NanoSeconds = dt.microsecond * 1000
+            datetime.IsUTC = dt.tzinfo == tz.tzutc()
+        return datetime
+
+    # Method called from User.__init__()
+    # This main method call Request with OAuth2 mode
+    def getRequest(self, url, name):
+        return getRequest(self._ctx, url, name)
 
     # Need to be implemented method
-    def insertUser(self, database, request, scheme, server, name, pwd):
+    def insertUser(self, source, database, request, scheme, server, name, pwd):
         raise NotImplementedError
 
-    def getRequest(self, url, user):
-        return getRequest(self._ctx, url, user)
-
+    # Method called from DataSource.getConnection()
     def initAddressbooks(self, source, database, user):
         raise NotImplementedError
 
@@ -88,7 +106,7 @@ def initUserBooks(self, source, database, user, books):
         print("Provider.initUserBooks() 4")
         if not count:
             cls, mtd = 'Provider', 'initUserBooks()'
-            raise getSqlException(self._ctx, source, 1006, 1109, cls, mtd, user.Name, user.Server)
+            raise getSqlException(self._ctx, source, 1006, 1611, cls, mtd, user.Name, user.Server)
         if modified and self.supportAddressBook():
             database.initAddressbooks(user)
 
@@ -104,7 +122,20 @@ def pullCard(self, database, user, addressbook, pages, count):
     def parseCard(self, database):
         raise NotImplementedError
 
+    def raiseForStatus(self, source, response, mtd, code, parameter, user):
+        status = response.StatusCode
+        msg = response.Text
+        response.close()
+        raise getSqlException(self._ctx, source, code, 1601, 'Provider', mtd,
+                              parameter.Name, status, user, parameter.Url, msg)
+
+    def getLoggerArgs(self, response, mtd, parameter, user):
+        status = response.StatusCode
+        msg = response.Text
+        response.close()
+        return ['Provider', mtd, 201, parameter.Name, status, user, parameter.Url, msg]
+
     # Can be overwritten method
     def syncGroups(self, database, user, addressbook, pages, count):
-        pass
+        return pages, count, None
 
diff --git a/uno/lib/uno/card/card/user.py b/uno/lib/uno/card/card/user.py
index 438200da..8c0228f2 100644
--- a/uno/lib/uno/card/card/user.py
+++ b/uno/lib/uno/card/card/user.py
@@ -37,11 +37,13 @@
 
 from ..cardtool import getSqlException
 
+from ..unotool import getConnectionMode
+
 from ..dbconfig import g_user
 from ..dbconfig import g_schema
 from ..dbconfig import g_dotcode
 
-from ..unotool import getConnectionMode
+from ..configuration import g_extension
 
 import traceback
 
@@ -57,15 +59,15 @@ def __init__(self, ctx, source, database, provider, scheme, server, name, pwd=''
         if not new:
             request = provider.getRequest(server, name)
             if request is None:
-                raise getSqlException(ctx, source, 1002, 1105, cls, mtd, name)
+                raise getSqlException(ctx, source, 1002, 1501, cls, mtd, name, g_extension)
         else:
             if self._isOffLine(server):
-                raise getSqlException(ctx, source, 1004, 1108, cls, mtd, name)
+                raise getSqlException(ctx, source, 1004, 1502, cls, mtd, server)
             request = provider.getRequest(server, name)
             if request is None:
-                raise getSqlException(ctx, source, 1002, 1105, cls, mtd, name)
-            self._metadata, books = self._getUserData(ctx, source, cls, mtd, database,
-                                                      provider, request, scheme, server, name, pwd)
+                raise getSqlException(ctx, source, 1002, 1501, cls, mtd, name, g_extension)
+            self._metadata, books = self._getUserData(ctx, source, cls, database, provider,
+                                                      request, scheme, server, name, pwd)
             database.createUser(self.getSchema(), self.Id, name, '')
         self.Request = request
         self._books = Books(ctx, books, new)
@@ -99,7 +101,7 @@ def BaseUrl(self):
         return self.Scheme + self.Server + self.Path
 
     def isOnLine(self):
-        return getConnectionMode(self._ctx, self.Server) != OFFLINE
+        return self._isOnLine(self.Server)
     def isOffLine(self):
         return self._isOffLine(self.Server)
 
@@ -132,12 +134,15 @@ def unquoteUrl(self, url):
     def getBooks(self):
         return self._books.getBooks()
 
-    def _getUserData(self, ctx, source, cls, mtd, database, provider, request, scheme, server, name, pwd):
-        data = provider.insertUser(database, request, scheme, server, name, pwd)
-        if data is None:
-            raise getSqlException(ctx, source, 1006, 1107, cls, mtd, name)
-        return data
+    def _getUserData(self, ctx, source, cls, database, provider, request, scheme, server, name, pwd):
+        metadata, books = provider.insertUser(source, database, request, scheme, server, name, pwd)
+        if metadata is None:
+            raise getSqlException(ctx, source, 1005, 1503, cls, '_getUserData', name)
+        return metadata, books
 
     def _isOffLine(self, server):
         return getConnectionMode(self._ctx, server) != ONLINE
 
+    def _isOnLine(self, server):
+        return getConnectionMode(self._ctx, server) != OFFLINE
+
diff --git a/uno/lib/uno/card/cardtool.py b/uno/lib/uno/card/cardtool.py
index 64bd3e5c..b1c8ebfa 100644
--- a/uno/lib/uno/card/cardtool.py
+++ b/uno/lib/uno/card/cardtool.py
@@ -33,17 +33,20 @@
 
 from .logger import getLogger
 
-from .configuration import g_errorlog
 from .configuration import g_basename
+from .configuration import g_defaultlog
+from .configuration import g_extension
 
 import traceback
 
 
-def getSqlException(ctx, source, state, code, cls, method, *args):
-    logger = getLogger(ctx, g_errorlog, g_basename)
-    state = logger.resolveString(state)
+def getLogException(logger, source, state, code, cls, mtd, *args):
+    status = logger.resolveString(state)
     msg = logger.resolveString(code, *args)
-    logger.logp(SEVERE, cls, method, msg)
-    error = getException(state, code, msg, source)
-    return error
+    logger.logp(SEVERE, cls, mtd, msg)
+    return getException(status, code, msg, source)
+
+def getSqlException(ctx, source, state, code, cls, mtd, *args):
+    logger = getLogger(ctx, g_defaultlog, g_basename)
+    return getLogException(logger, source, state, code, cls, mtd, *args)
 
diff --git a/uno/lib/uno/card/datasource.py b/uno/lib/uno/card/datasource.py
index 822b60ba..42797025 100644
--- a/uno/lib/uno/card/datasource.py
+++ b/uno/lib/uno/card/datasource.py
@@ -43,18 +43,20 @@
 
 from .unotool import getDesktop
 
+from threading import Event
 import traceback
 
 
-class DataSource(object):
+class DataSource():
     def __init__(self, ctx, database):
         self._ctx = ctx
         self._maps = {}
         self._users = {}
         self._database = database
         self._listener = EventListener(self)
-        self._provider = Provider(ctx)
-        self._replicator = Replicator(ctx, database, self._provider, self._users)
+        self._provider = Provider(ctx, database)
+        self._sync = Event()
+        self._replicator = Replicator(ctx, database, self._provider, self._users, self._sync)
         listener = TerminateListener(self._replicator)
         getDesktop(ctx).addTerminateListener(listener)
 
@@ -68,18 +70,16 @@ def closeConnection(self, connection):
         if name in self._users:
             user = self._users.get(name)
             user.removeSession(self._database.getSessionId(connection))
-        if not self._hasSession():
-            self._replicator.stop()
 
 # Procedures called by Driver
-    def getConnection(self, source, scheme, server, account, password):
+    def getConnection(self, source, scheme, server, account, password=''):
         uri = self._provider.getUserUri(server, account)
         if uri in self._maps:
             name = self._maps.get(uri)
             user = self._users.get(name)
             if not user.Request.isAuthorized():
                 cls, mtd = 'DataSource', 'getConnection()'
-                raise getSqlException(self._ctx, source, 1002, 1105, cls, mtd, name)
+                raise getSqlException(self._ctx, source, 1002, 1401, cls, mtd, name)
         else:
             user = User(self._ctx, source, self._database,
                         self._provider, scheme, server, account, password)
@@ -92,7 +92,7 @@ def getConnection(self, source, scheme, server, account, password):
         user.addSession(self._database.getSessionId(connection))
         # User and/or AddressBooks has been initialized and the connection to the database is done...
         # We can start the database replication in a background task.
-        self._replicator.start()
+        self._sync.set()
         connection.addEventListener(self._listener)
         return connection
 
diff --git a/uno/lib/uno/card/dbqueries.py b/uno/lib/uno/card/dbqueries.py
index 32a01ee1..96c54d87 100644
--- a/uno/lib/uno/card/dbqueries.py
+++ b/uno/lib/uno/card/dbqueries.py
@@ -740,14 +740,18 @@ def getSqlQuery(ctx, name, format=None):
     # The getTypes query allows to obtain the right label (column) for typed properties
     elif name == 'createSelectTypes':
         query = """\
-CREATE PROCEDURE "SelectTypes"()
+CREATE PROCEDURE "SelectTypes"(IN COMPOSE BOOLEAN)
   SPECIFIC "SelectTypes_1"
   READS SQL DATA
   DYNAMIC RESULT SETS 1
   BEGIN ATOMIC
     DECLARE Rslt CURSOR WITH RETURN FOR 
       SELECT R."Path", R."Name", P."Path", 
-      ARRAY_AGG(JSON_OBJECT(T."Path" || P2."Path": COALESCE(T."Name", '') || P2."Name")) 
+      CASE WHEN COMPOSE THEN 
+        ARRAY_AGG(JSON_OBJECT(T."Path" || P2."Path": COALESCE(T."Name", '') || P2."Name")) 
+      ELSE
+        ARRAY_AGG(JSON_OBJECT(T."Path": COALESCE(T."Name", '') || P2."Name")) 
+      END
       FROM "Resources" AS R 
       INNER JOIN "Properties" AS P ON R."Resource"=P."Resource" 
       INNER JOIN "Resources" AS R2 ON R."Resource"=R2."Resource" 
@@ -795,7 +799,7 @@ def getSqlQuery(ctx, name, format=None):
 
     elif name == 'createSelectGroups':
         query = """\
-CREATE PROCEDURE "SelectGroups"(IN Aid Integer)
+CREATE PROCEDURE "SelectGroups"(IN Aid INTEGER)
   SPECIFIC "SelectGroups_1"
   READS SQL DATA
   DYNAMIC RESULT SETS 1
@@ -830,25 +834,25 @@ def getSqlQuery(ctx, name, format=None):
 
     elif name == 'createMergeGroupMembers':
         query = """\
-CREATE PROCEDURE "MergeGroupMembers"(IN Gid INTEGER,
-                                     DateTime TIMESTAMP(6),
-                                     IN Members VARCHAR(100) ARRAY)
+CREATE PROCEDURE "MergeGroupMembers"(IN GID INTEGER,
+                                     IN DATETIME TIMESTAMP(6),
+                                     IN MEMBERS VARCHAR(100) ARRAY)
   SPECIFIC "MergeGroupMembers_1"
   MODIFIES SQL DATA
   BEGIN ATOMIC
-    DECLARE Index INTEGER DEFAULT 1;
-    DECLARE Cid INTEGER DEFAULT 1;
-    DELETE FROM "GroupCards" WHERE "Group"=Gid; 
-    WHILE Index <= CARDINALITY(Members) DO 
-      SELECT "Card" INTO Cid FROM "Cards" WHERE "Uri"=Members[Index];
-      IF Cid IS NOT NULL THEN
-        MERGE INTO "GroupCards" USING (VALUES(Gid,Cid,DateTime))
-          AS vals(x,y,z) ON "Group"=vals.x AND "Card"=vals.y
-            WHEN MATCHED THEN UPDATE SET "Modified"=vals.z
-            WHEN NOT MATCHED THEN INSERT ("Group","Card","Modified")
-              VALUES vals.x,vals.y,vals.z;
+    DECLARE INDEX INTEGER DEFAULT 1;
+    DECLARE CID INTEGER DEFAULT NULL;
+    DELETE FROM "GroupCards" WHERE "Group" = GID; 
+    WHILE INDEX <= CARDINALITY(MEMBERS) DO 
+      SELECT "Card" INTO CID FROM "Cards" WHERE "Uri" = MEMBERS[INDEX];
+      IF CID IS NOT NULL THEN
+        MERGE INTO "GroupCards" USING (VALUES(GID, CID, DATETIME))
+          AS vals(x, y, z) ON "Group" = vals.x AND "Card" = vals.y
+            WHEN MATCHED THEN UPDATE SET "Modified" = vals.z
+            WHEN NOT MATCHED THEN INSERT ("Group", "Card", "Modified")
+              VALUES vals.x, vals.y, vals.z;
       END IF;
-      SET Index = Index + 1;
+      SET INDEX = INDEX + 1;
     END WHILE;
   END"""
 
@@ -983,7 +987,7 @@ def getSqlQuery(ctx, name, format=None):
     elif name == 'getLists':
         query = 'CALL "SelectLists"()'
     elif name == 'getTypes':
-        query = 'CALL "SelectTypes"()'
+        query = 'CALL "SelectTypes"(?)'
     elif name == 'getMaps':
         query = 'CALL "SelectMaps"()'
     elif name == 'getTmps':
diff --git a/uno/lib/uno/card/drvtool.py b/uno/lib/uno/card/drvtool.py
new file mode 100644
index 00000000..3edb4aa3
--- /dev/null
+++ b/uno/lib/uno/card/drvtool.py
@@ -0,0 +1,84 @@
+#!
+# -*- coding: utf-8 -*-
+
+"""
+╔════════════════════════════════════════════════════════════════════════════════════╗
+║                                                                                    ║
+║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║                                                                                    ║
+║   Permission is hereby granted, free of charge, to any person obtaining            ║
+║   a copy of this software and associated documentation files (the "Software"),     ║
+║   to deal in the Software without restriction, including without limitation        ║
+║   the rights to use, copy, modify, merge, publish, distribute, sublicense,         ║
+║   and/or sell copies of the Software, and to permit persons to whom the Software   ║
+║   is furnished to do so, subject to the following conditions:                      ║
+║                                                                                    ║
+║   The above copyright notice and this permission notice shall be included in       ║
+║   all copies or substantial portions of the Software.                              ║
+║                                                                                    ║
+║   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,                  ║
+║   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES                  ║
+║   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.        ║
+║   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY             ║
+║   CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,             ║
+║   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE       ║
+║   OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                    ║
+║                                                                                    ║
+╚════════════════════════════════════════════════════════════════════════════════════╝
+"""
+
+from com.sun.star.sdbc import SQLException
+
+from .database import DataBase
+
+from .datasource import DataSource
+
+from .cardtool import getLogException
+
+from .dbtool import getConnectionUrl
+
+from .unotool import checkVersion
+from .unotool import getExtensionVersion
+
+from .oauth2 import getOAuth2Version
+from .oauth2 import g_extension as g_oauth2ext
+from .oauth2 import g_version as g_oauth2ver
+
+from .jdbcdriver import g_extension as g_jdbcext
+from .jdbcdriver import g_identifier as g_jdbcid
+from .jdbcdriver import g_version as g_jdbcver
+
+from .configuration import g_extension
+from .configuration import g_host
+
+from .dbconfig import g_folder
+from .dbconfig import g_version
+
+import traceback
+
+
+def getDataSource(ctx, logger, source, cls, mtd):
+    oauth2 = getOAuth2Version(ctx)
+    driver = getExtensionVersion(ctx, g_jdbcid)
+    if oauth2 is None:
+        raise getLogException(logger, source, 1003, 1121, cls, mtd, g_oauth2ext, g_extension)
+    elif not checkVersion(oauth2, g_oauth2ver):
+        raise getLogException(logger, source, 1003, 1122, cls, mtd, oauth2, g_oauth2ext, g_oauth2ver)
+    elif driver is None:
+        raise getLogException(logger, source, 1003, 1121, cls, mtd, g_jdbcext, g_extension)
+    elif not checkVersion(driver, g_jdbcver):
+        raise getLogException(logger, source, 1003, 1122, cls, mtd, driver, g_jdbcext, g_jdbcver)
+    else:
+        path = g_folder + '/' + g_host
+        url = getConnectionUrl(ctx, path)
+        try:
+            database = DataBase(ctx, url)
+        except SQLException as e:
+            raise getLogException(logger, source, 1005, 1123, cls, mtd, url, e.Message)
+        else:
+            if not database.isUptoDate():
+                raise getLogException(logger, source, 1005, 1124, cls, mtd, database.Version, g_version)
+            else:
+                return DataSource(ctx, database)
+    return None
+
diff --git a/uno/lib/uno/card/listener.py b/uno/lib/uno/card/listener.py
index b0d1b3d4..ebf0c014 100644
--- a/uno/lib/uno/card/listener.py
+++ b/uno/lib/uno/card/listener.py
@@ -47,7 +47,7 @@ def queryTermination(self, event):
         try:
             self._replicator.dispose()
         except Exception as e:
-            msg = "TerminateListener Error: %s" % traceback.print_exc()
+            msg = "TerminateListener Error: %s" % traceback.format_exc()
             print(msg)
 
     def notifyTermination(self, event):
@@ -68,5 +68,5 @@ def disposing(self, event):
             print("EventListener.disposing() ******************")
             self._datasource.closeConnection(event.Source)
         except Exception as e:
-            msg = "EventListener Error: %s" % traceback.print_exc()
+            msg = "EventListener Error: %s" % traceback.format_exc()
             print(msg)
diff --git a/uno/lib/uno/card/replicator.py b/uno/lib/uno/card/replicator.py
index 3c1dba51..f909699a 100644
--- a/uno/lib/uno/card/replicator.py
+++ b/uno/lib/uno/card/replicator.py
@@ -33,6 +33,8 @@
 from com.sun.star.logging.LogLevel import INFO
 from com.sun.star.logging.LogLevel import SEVERE
 
+from com.sun.star.uno import Exception as UnoException
+
 from .unotool import getConfiguration
 
 from .configuration import g_identifier
@@ -42,115 +44,117 @@
 g_basename = 'Replicator'
 
 from threading import Thread
-from threading import Event
 import traceback
 
 
-class Replicator(unohelper.Base):
-    def __init__(self, ctx, database, provider, users):
+class Replicator(Thread):
+    def __init__(self, ctx, database, provider, users, sync):
+        Thread.__init__(self)
         self._ctx = ctx
         self._database = database
         self._provider = provider
         self._config = getConfiguration(ctx, g_identifier, False)
         self._users = users
-        self._started = Event()
-        self._paused = Event()
-        self._disposed = Event()
-        self._thread = Thread(target=self._replicate)
-        self._thread.start()
+        self._sync = sync
+        self._canceled = False
+        self.start()
 
-    # XRestReplicator
     def dispose(self):
-        print("replicator.dispose() 1")
-        self._disposed.set()
-        self._started.set()
-        self._paused.set()
-        self._thread.join()
-        print("replicator.dispose() 2")
-
-    def stop(self):
-        print("replicator.stop() 1")
-        self._started.clear()
-        self._paused.set()
-        print("replicator.stop() 2")
-
-    def start(self):
-        self._started.set()
-        self._paused.set()
-
-    def _canceled(self):
-        return False
+        self._canceled = True
+        self._sync.set()
+        self.join()
 
-    def _getReplicateTimeout(self):
-        return self._config.getByName('ReplicateTimeout')
+    def run(self):
+        cls, mtd = 'Replicator', 'run()'
+        logger = getLogger(self._ctx, g_synclog, g_basename)
+        try:
+            logger.logprb(INFO, cls, mtd, 101)
+            timeout = self._config.getByName('ReplicateTimeout')
+            while not self._canceled:
+                self._sync.clear()
+                self._sync.wait(timeout)
+                if self._canceled:
+                    continue
+                if not self._hasConnectedUser():
+                    timeout = self._config.getByName('ReplicateTimeout')
+                    logger.logprb(INFO, cls, mtd, 102, timeout // 60)
+                    continue
+                users, pages, total = self._syncCard(logger)
+                logger.logprb(INFO, cls, '_syncCard()', 103, users, pages, total)
+                if total > 0:
+                    self._provider.parseCard(self._database)
+                    if self._provider.supportGroup():
+                        users, pages, total = self._syncGroup(logger)
+                        logger.logprb(INFO, cls, '_syncGroup()', 104, users, pages, total)
+                self._database.dispose()
+                if self._canceled:
+                    continue
+                timeout = self._config.getByName('ReplicateTimeout')
+                logger.logprb(INFO, cls, mtd, 105, timeout // 60)
+            logger.logprb(INFO, cls, mtd, 106)
+        except UnoException as e:
+            logger.logprb(SEVERE, cls, mtd, 107, e.Message)
+        except Exception as e:
+            logger.logprb(SEVERE, cls, mtd, 108, e, traceback.format_exc())
 
-    def _replicate(self):
-        print("replicator.run()1")
+    def _syncCard(self, logger):
+        cls, mtd = 'Replicator', '_syncCard()'
+        users = pages = count = 0
         try:
-            print("replicator.run()1 begin ****************************************")
-            logger = getLogger(self._ctx, g_synclog, g_basename)
-            while not self._disposed.is_set():
-                print("replicator.run()2 wait to start ****************************************")
-                self._started.wait()
-                if not self._disposed.is_set():
-                    print("replicator.run()3 synchronize started ****************************************")
-                    pages, total = self._synchronize(logger)
-                    logger.logprb(INFO, 'Replicator', '_replicate()', 101, pages, total)
-                    if total > 0:
-                        print("replicator.run()4 synchronize started CardSync.jar")
-                        pages, total = self._finalize(logger)
-                        print("replicator.run()5 synchronize ended CardSync.jar")
-                        logger.logprb(INFO, 'Replicator', '_replicate()', 102, pages, total)
-                    self._database.dispose()
-                    print("replicator.run()6 synchronize ended Pages: %s - Total: %s *******************************************" % (pages, total))
-                    if self._started.is_set():
-                        print("replicator.run()7 start waitting *******************************************")
-                        self._paused.clear()
-                        timeout = self._getReplicateTimeout()
-                        self._paused.wait(timeout)
-                        print("replicator.run()8 end waitting *******************************************")
-            print("replicator.run()9 canceled *******************************************")
+            for user in self._users.values():
+                if self._canceled:
+                    break
+                if user.isOffLine():
+                    logger.logprb(INFO, cls, mtd, 111)
+                else:
+                    users += 1
+                    logger.logprb(INFO, cls, mtd, 112, user.Name)
+                    for book in user.getBooks():
+                        if self._canceled:
+                            break
+                        if book.isNew():
+                            pages, count, args = self._provider.firstPullCard(self._database, user, book, pages, count)
+                        else:
+                            pages, count, args = self._provider.pullCard(self._database, user, book, pages, count)
+                        if args:
+                            logger.logprb(SEVERE, *args)
+                    logger.logprb(INFO, cls, mtd, 113, user.Name)
+        except UnoException as e:
+            logger.logprb(SEVERE, cls, mtd, 114, e.Message)
         except Exception as e:
-            msg = "Replicator run(): Error: %s" % traceback.print_exc()
-            print(msg)
+            logger.logprb(SEVERE, cls, mtd, 115, e, traceback.format_exc())
+        return users, pages, count
 
-    def _synchronize(self, logger):
-        pages = count = 0
-        for user in self._users.values():
-            if not user.hasSession():
-                continue
-            if user.isOffLine():
-                logger.logprb(INFO, 'Replicator', '_synchronize()', 111)
-            elif self._canceled():
-                break
-            logger.logprb(INFO, 'Replicator', '_synchronize()', 112, user.Name)
-            for book in user.getBooks():
-                if self._canceled():
+    def _syncGroup(self, logger):
+        cls, mtd = 'Replicator', '_syncGroup()'
+        users = pages = count = 0
+        try:
+            for user in self._users.values():
+                if self._canceled:
                     break
-                if book.isNew():
-                    print("Replicator._syncUser() New AddressBook Path: %s" % book.Uri)
-                    pages, count = self._provider.firstPullCard(self._database, user, book, pages, count)
+                if user.isOffLine():
+                    logger.logprb(INFO, cls, mtd, 121)
                 else:
-                    pages, count = self._provider.pullCard(self._database, user, book, pages, count)
-            logger.logprb(INFO, 'Replicator', '_synchronize()', 113, user.Name)
-        return pages, count
+                    users += 1
+                    logger.logprb(INFO, cls, mtd, 122, user.Name)
+                    for book in user.getBooks():
+                        if self._canceled:
+                            break
+                        pages, count, args = self._provider.syncGroups(self._database, user, book, pages, count)
+                        if args:
+                            logger.logprb(SEVERE, *args)
+                    logger.logprb(INFO, cls, mtd, 123, user.Name)
+            if not self._canceled:
+                self._database.syncGroups()
+        except UnoException as e:
+            logger.logprb(SEVERE, cls, mtd, 124, e.Message)
+        except Exception as e:
+            logger.logprb(SEVERE, cls, mtd, 125, e, traceback.format_exc())
+        return users, pages, count
 
-    def _finalize(self, logger):
-        pages = count = 0
-        self._provider.parseCard(self._database)
+    def _hasConnectedUser(self):
         for user in self._users.values():
-            if not user.hasSession():
-                continue
-            if user.isOffLine():
-                logger.logprb(INFO, 'Replicator', '_finalize()', 121)
-            elif self._canceled():
-                break
-            logger.logprb(INFO, 'Replicator', '_finalize()', 122, user.Name)
-            for book in user.getBooks():
-                if self._canceled():
-                    break
-                pages, count = self._provider.syncGroups(self._database, user, book, pages, count)
-            logger.logprb(INFO, 'Replicator', '_finalize()', 123, user.Name)
-        self._database.syncGroups()
-        return pages, count
+            if user.hasSession():
+                return True
+        return False
 
diff --git a/uno/lib/uno/card/resource/Driver_en_US.properties b/uno/lib/uno/card/resource/Driver_en_US.properties
index 6c38df59..904458ce 100644
--- a/uno/lib/uno/card/resource/Driver_en_US.properties
+++ b/uno/lib/uno/card/resource/Driver_en_US.properties
@@ -1,41 +1,72 @@
-100=Driver.__init__()
-101=Driver initialization completed
+100=OptionsHandler.callHandlerMethod()
+101=An unexpected exception: {} has occurred, producing a series of exceptions: {}
 
-110=Driver.connect()
-111=Loading the driver for the url: %s
+200=OptionsManager.__init__()
+201=OptionManger has been correctly initialized.
 
-112=Protocol ERROR
-113=Authentication ERROR
+210=OptionsManager.loadSetting()
+211=OptionManger has been correctly reloaded.
 
-114=Hsqldb version: %s database is loaded, the user: %s is connected
-115=Driver.connect() ERROR: %s - %s
+220=OptionsManager.saveSetting()
+221=OptionManger saved options {} and logging {}.
 
-116=Loading of the Hsqldb database: %s completed
-117=The creation / recovery of the user: %s failed
-118=Connection of user: %s to the database
-119=Connection of user: %s to the database completed
-
-500=Driver._getDataSource()
-501=The extension %s was not found.%sYou must install this extension to use %s.
-502=Version %s of extension %s is obsolete.%sYou need to update this extension to version: %s.
-503=Unable to connect to URL: %s%sAn SQLException was thrown with the message: %s
-504=HsqlDB driver version %s is obsolete.%sYou need to update this driver to version %s or higher.
 
+1000=Connect URL ERROR
+1001=Authentication ERROR
 1002=Authorization ERROR
 1003=Setup ERROR
 1004=Network ERROR
 1005=DataBase ERROR
 1006=Provider ERROR
 
-1101=Invalide protocol: '%s'
-1102=Invalide user account: '%s' are not supported!!!
 
-1103=Supported Google user accounts are: your_account@gmail.com
-1104=You must provide a valid Google account!
+1100=Driver.__init__()
+1101=Driver initialization completed
+
+1110=Driver.connect()
+1111=Loading the driver for the URL {}
+1112=Invalid protocol <{}>
+1113=Invalid user account and/or password.
+1114=Invalid user account <{}>
+1115=Hsqldb version {} database is loaded, the user {} is connected.
+1116=Driver.connect() ERROR: {} - {}
+
+1120=Driver._getDataSource()
+1121=The extension {} was not found. You must install this extension to use {}.
+1122=Version {} of extension {} is obsolete. You need to update this extension to version: {}.
+1123=Unable to connect to URL {}. An SQLException was thrown with the message: {}.
+1124=HsqlDB driver version {} is obsolete. You need to update this driver to version {} or higher.
+
+1130=Driver._getUrlParts()
+1131=Invalid protocol <{}>
+
+
+1400=DataSource.getConnection()
+1401=The user {} has abandoned the OAuth2 authorization wizard, the {} extension cannot continue without this authorization!!!
+
+
+1500=User.__init__()
+1501=The user {} has abandoned the OAuth2 authorization wizard, the {} extension cannot continue without this authorization!!!
+1502=Can't connect to server <{}>. Is the network offline?
+1503=Can't insert user {} in DataBase
+
+
+1600=Provider.raiseForStatus()
+1601=HTTP request <{}> returned status code {} for user {} on URL {} with content {}
+
+1610=Provider.initUserBooks()
+1611=Can't retrieve AddressBook for user {}, the server {} don't support AddressBook!!!
+
+1620=Provider._getDiscoveryUrl()
+1621=HTTP request <{}> for user {} on URL {} cannot retrieve <Location> on headers {}
+
+1640=Provider._getNewUserId()
+1641=User {} with password {} cannot connect to server {} at URL {}
+1642=User {} cannot find on URL {} a CardDAV compatible server
+
+1650=Provider._supportAddressbook()
+1651=HTTP request <{}> for user {} on URL {} cannot retrieve <DAV> on headers {}
 
-1105=The user: %s has abandoned the OAuth2 authorization wizard, the driver cannot continue without this authorization!!!
-1106=Can't insert user: %s in DataBase
-1107=User: %s does not exist at this Provider
-1108=Can't retrieve user: %s from provider: network is OffLine!!!
-1109=Can't retrieve AddressBook for user: %s, the server: % don't support AddressBook!!!
+1660=Provider._getAddressbooksUrl()
+1661=HTTP request <{}> for user {} on URL {} cannot parse content {}
 
diff --git a/uno/lib/uno/card/resource/Driver_fr_FR.properties b/uno/lib/uno/card/resource/Driver_fr_FR.properties
index ba0193ed..b2044dfb 100644
--- a/uno/lib/uno/card/resource/Driver_fr_FR.properties
+++ b/uno/lib/uno/card/resource/Driver_fr_FR.properties
@@ -1,41 +1,72 @@
-100=Driver.__init__()
-101=Initialisation du pilote termin\u00e9e
+100=OptionsHandler.callHandlerMethod()
+101=Une exception: {} inattendue s'est produite, produisant une s�rie d'exceptions: {}
 
-110=Driver.connect()
-111=Chargement du pilote pour l'url: %s
+200=OptionsManager.__init__()
+201=OptionManger a �t� correctement initialis�.
 
-112=ERREUR de protocole
-113=ERREUR d'authentication
+210=OptionsManager.loadSetting()
+211=OptionManger a �t� correctement recharg�.
 
-114=La version %s de la base de donn\u00e9es Hsqldb est charg\u00e9e, l'utilisateur: %s est connect\u00e9
-115=Driver.connect() ERREUR: %s - %s
+220=OptionsManager.saveSetting()
+221=OptionManger a sauvegard� des options {} et la journalisation {}.
 
-116=Chargement de la base de donn\u00e9es Hsqldb: %s termin\u00e9
-117=La cr\u00e9ation / r\u00e9cup\u00e9ration de l'utilisateur: %s a \u00e9chou\u00e9
-118=Connexion de l'utilisateur: %s à la base de donn\u00e9es
-119=Connexion de l'utilisateur: %s à la base de donn\u00e9es termin\u00e9e
-
-500=Driver._getDataSource()
-501=L'extension %s est introuvable.%sVous devez installer cette extension pour utiliser %s.
-502=La version %s de l'extension %s est obsol�te.%sVous devez mettre � jour cette extension vers la version: %s.
-503=Impossible de se connecter sur l'URL: %s%sUne SQLException a �t� lev�e avec le message: %s
-504=La version %s du pilote HsqlDB est obsol�te.%sVous devez mettre � jour ce pilote vers une version %s ou sup�rieure.
 
+1000=ERREUR d'URL de connection
+1001=ERREUR d'authentification
 1002=ERREUR d'authorisation
 1003=ERREUR d'installation
-1004=ERREUR r\u00e9seau
-1005=ERREUR de base de donn\u00e9es
+1004=ERREUR r�seau
+1005=ERREUR de base de donn�es
 1006=ERREUR de fournisseur
 
-1101=Le protocole est invalide: '%s'
-1102=Le compte utilisateur est invalide: '%s' n'est pas support\u00e9!!!
 
-1103=Les comptes utilisateur Google pris en charge sont: votre_compte@gmail.com
-1104=Vous devez fournir un compte utilisateur Google valide!
+1100=Driver.__init__()
+1101=Initialisation du pilote termin�
+
+1110=Driver.connect()
+1111=Chargement du pilote pour l'URL: {}
+1112=Le protocole <{}> est invalide.
+1113=Le compte utilisateur et/ou le mot de passe est invalide.
+1114=Le compte utilisateur <{}> est invalide.
+1115=La version {} de la base de donn�es Hsqldb est charg�e, l'utilisateur {} est connect�.
+1116=Driver.connect() ERREUR: {} - {}
+
+1120=Driver._getDataSource()
+1121=L'extension {} est introuvable. Vous devez installer cette extension pour utiliser {}.
+1122=La version {} de l'extension {} est obsol�te. Vous devez mettre � jour cette extension vers la version {}.
+1123=Impossible de se connecter sur l'URL {}. Une exception a �t� lev�e avec le message {}.
+1124=La version {} du pilote HsqlDB est obsol�te. Vous devez mettre � jour ce pilote vers une version {} ou sup�rieure.
+
+1130=Driver._getUrlParts()
+1131=Le protocole <{}> est invalide.
+
+
+1400=DataSource.getConnection()
+1401=L'utilisateur {} a abandonn� l'assistant d'autorisation OAuth2, l'extension {} ne peut pas continuer sans cette autorisation!!!
+
+
+1500=User.__init__()
+1501=L'utilisateur {} a abandonn� l'assistant d'autorisation OAuth2, l'extension {} ne peut pas continuer sans cette autorisation!!!
+1502=Impossible de se connecter au serveur <{}>. Le r�seau est-il hors ligne?
+1503=Can't insert user {} in DataBase
+
+
+1600=Provider.raiseForStatus()
+1601=La requ�te HTTP <{}> a renvoy� le code d'�tat {} pour l'utilisateur {} sur l'URL {} avec le contenu {}
+
+1610=Provider.initUserBooks()
+1611=Impossible de r�cup�rer le carnet d'adresses pour l'utilisateur {}, le serveur {} ne prend pas en charge les carnets d'adresses!!!
+
+1620=Provider._getDiscoveryUrl()
+1621=La requ�te HTTP <{}> pour l'utilisateur {} sur l'URL {} ne peut retrouver <Location> dans les en-t�tes HTTP {}
+
+1640=Provider._getNewUserId()
+1641=L'utilisateur {} avec le mot de passe {} ne peut pas se connecter au serveur {} sur l'URL {}
+1642=L'utilisateur {} ne trouve pas sur l'URL {} de serveur compatible CardDAV
+
+1650=Provider._supportAddressbook()
+1651=La requ�te HTTP <{}> pour l'utilisateur {} sur l'URL {} ne peut retrouver <DAV> dans les en-t�tes HTTP {}
 
-1105=L'utilisateur: %s a abandonn\u00e9 l'assistant d'autorisation OAuth2, le pilote ne peut pas continuer sans cette autorisation!!!
-1106=Impossible d'inserer l'utilisateur: %s dans la base de donn\u00e9es
-1107=L'utilisateur: %s est inconnu chez ce fournisseur
-1108=Impossible de retrouver l'utilisateur: %s chez le fournisseur: le r\u00e9seau est hors ligne!!!
-1109=Impossible de r\u00e9cup\u00e9rer le carnet d'adresses pour l'utilisateur: %s, le serveur: % ne prend pas en charge les carnets d'adresses!!!
+1660=Provider._getAddressbooksUrl()
+1661=La requ�te HTTP <{}> pour l'utilisateur {} sur l'URL {} ne peut pas analyser le contenu {}
 
diff --git a/uno/lib/uno/card/resource/Replicator_en_US.properties b/uno/lib/uno/card/resource/Replicator_en_US.properties
index 0b8ac0ac..308b8c1a 100644
--- a/uno/lib/uno/card/resource/Replicator_en_US.properties
+++ b/uno/lib/uno/card/resource/Replicator_en_US.properties
@@ -1,13 +1,28 @@
-100=Replicator._replicate()
-101=Replicator Start processing %s requests produced %s updates...
-102=Replicator Stop processing %s requests produced %s updates...
+100=Replicator.run()
+101=Replicator thread has started.
+102=Replicator has been paused for {} minutes because no users are connected.
+103=Replicator performed cards synchronization for {} users with {} HTTP requests, producing {} updates...
+104=Replicator performed groups synchronization for {} users with {} HTTP requests, producing {} updates...
+105=Replicator thread has been paused for {} minutes.
+106=Replicator thread has stoped.
+107=Replicator thread throw error: {}
+108=Replicator thread throw error: {}\n{}
 
-110=Replicator._synchronize()
+110=Replicator._syncCard()
 111=Replicator synchronization is not possible network is offline!!!
-112=Replicator start synchronization for user: %s
-113=Replicator stop synchronization for user: %s
+112=Replicator start cards synchronization for user: {}
+113=Replicator stop cards synchronization for user: {}
+114=Replicator thread throw error: {}
+115=Replicator thread throw error: {}\n{}
 
-120=Replicator._finalize()
+120=Replicator._syncGroup()
 121=Replicator synchronization is not possible network is offline!!!
-122=Replicator start synchronization for user: %s
-123=Replicator stop synchronization for user: %s
+122=Replicator start groups synchronization for user: {}
+123=Replicator stop groups synchronization for user: {}
+124=Replicator thread throw error: {}
+125=Replicator thread throw error: {}\n{}
+
+
+200=Provider.getLoggerArgs()
+201=HTTP request <{}> returned status code {} for user {} on url {} with content {}
+
diff --git a/uno/lib/uno/card/resource/Replicator_fr_FR.properties b/uno/lib/uno/card/resource/Replicator_fr_FR.properties
index e791086b..ae86c72d 100644
--- a/uno/lib/uno/card/resource/Replicator_fr_FR.properties
+++ b/uno/lib/uno/card/resource/Replicator_fr_FR.properties
@@ -1,14 +1,28 @@
-100=Replicator._replicate()
-101=Replicateur le traitement de %s requetes a produit %s mises a jour...
-102=Replicateur le traitement de %s requetes a produit %s mises a jour...
-
-110=Replicator._synchronize()
-111=Replicateur la synchronisation n'est pas possible le r\u00e9seau est hors ligne!!!
-112=Replicateur d\u00e9marrage de la synchronisation pour l'utilisateur: %s
-113=Replicateur fin de la synchronisation pour l'utilisateur: %s
-
-120=Replicator._finalize()
-121=Replicateur la synchronisation n'est pas possible le r\u00e9seau est hors ligne!!!
-122=Replicateur d\u00e9marrage de la synchronisation pour l'utilisateur: %s
-123=Replicateur fin de la synchronisation pour l'utilisateur: %s
+100=Replicator.run()
+101=Le r�plicateur a �t� initialis�.
+102=Le r�plicateur a �t� suspendu pour {} minutes car aucun utilisateur n'est connect�.
+103=Le r�plicateur a effectu� la synchronisation des contacts pour {} utilisateurs avec {} requ�tes HTTP, produisant {} mises � jour
+104=Le r�plicateur a effectu� la synchronisation des groupes pour {} utilisateurs avec {} requ�tes HTTP, produisant {} mises � jour...
+105=Le r�plicateur a �t� suspendu pour {} minutes.
+106=Le r�plicateur a �t� stopp�.
+107=Le r�plicateur a lanc� l'erreur: {}
+108=Le r�plicateur a lanc� l'erreur: {}\n{}
+
+110=Replicator._syncCard()
+111=Le r�plicateur ne peut effectuer la synchronisation, le r�seau est hors ligne!!!
+112=Le r�plicateur d�marre la synchronisation des contacts pour l'utilisateur: {}
+113=Le r�plicateur a fini la synchronisation des contacts pour l'utilisateur: {}
+114=Le r�plicateur a lanc� l'erreur: {}
+115=Le r�plicateur a lanc� l'erreur: {}\n{}
+
+120=Replicator._syncGroup()
+121=Le r�plicateur ne peut effectuer la synchronisation, le r�seau est hors ligne!!!
+122=Le r�plicateur d�marre la synchronisation des groupes pour l'utilisateur: {}
+123=Le r�plicateur a fini la synchronisation des groupes pour l'utilisateur: {}
+124=Le r�plicateur a lanc� l'erreur: {}
+125=Le r�plicateur a lanc� l'erreur: {}\n{}
+
+
+200=Provider.getLoggerArgs()
+201=La requ�te HTTP <{}> a renvoy� le code d'�tat {} pour l'utilisateur {} sur l'URL {} avec le contenu {}
 
diff --git a/uno/lib/uno/grid/gridhandler.py b/uno/lib/uno/grid/gridhandler.py
index 5d9e3406..4fb7b852 100644
--- a/uno/lib/uno/grid/gridhandler.py
+++ b/uno/lib/uno/grid/gridhandler.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/grid/gridmanagerbase.py b/uno/lib/uno/grid/gridmanagerbase.py
index d16a82a8..25e8e28d 100644
--- a/uno/lib/uno/grid/gridmanagerbase.py
+++ b/uno/lib/uno/grid/gridmanagerbase.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/grid/gridmodelbase.py b/uno/lib/uno/grid/gridmodelbase.py
index e980bfb7..d2b34c11 100644
--- a/uno/lib/uno/grid/gridmodelbase.py
+++ b/uno/lib/uno/grid/gridmodelbase.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/grid/gridview.py b/uno/lib/uno/grid/gridview.py
index e2fc1c0c..599d274e 100644
--- a/uno/lib/uno/grid/gridview.py
+++ b/uno/lib/uno/grid/gridview.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/jdbcdriver/configuration.py b/uno/lib/uno/jdbcdriver/configuration.py
index 2e676965..4336ee38 100644
--- a/uno/lib/uno/jdbcdriver/configuration.py
+++ b/uno/lib/uno/jdbcdriver/configuration.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
@@ -31,7 +31,7 @@
 g_extension = 'jdbcDriverOOo'
 g_identifier = 'io.github.prrvchr.%s' % g_extension
 g_service = '%s.Driver' % g_identifier
-g_version = '1.1.0'
+g_version = '1.1.2'
 
 # jdbcDriverOOo resource strings files and folder
 g_resource = 'resource'
diff --git a/uno/lib/uno/logger/__init__.py b/uno/lib/uno/logger/__init__.py
index 64c23987..243d99f3 100644
--- a/uno/lib/uno/logger/__init__.py
+++ b/uno/lib/uno/logger/__init__.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/logger/dialog/__init__.py b/uno/lib/uno/logger/dialog/__init__.py
index efb514ee..9ab9aec9 100644
--- a/uno/lib/uno/logger/dialog/__init__.py
+++ b/uno/lib/uno/logger/dialog/__init__.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/logger/dialog/loghandler.py b/uno/lib/uno/logger/dialog/loghandler.py
index 41f0d14a..2f63d9d0 100644
--- a/uno/lib/uno/logger/dialog/loghandler.py
+++ b/uno/lib/uno/logger/dialog/loghandler.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/logger/dialog/logmanager.py b/uno/lib/uno/logger/dialog/logmanager.py
index 70658962..fcd607a7 100644
--- a/uno/lib/uno/logger/dialog/logmanager.py
+++ b/uno/lib/uno/logger/dialog/logmanager.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/logger/dialog/logmodel.py b/uno/lib/uno/logger/dialog/logmodel.py
index 9755e837..1ddfc6e7 100644
--- a/uno/lib/uno/logger/dialog/logmodel.py
+++ b/uno/lib/uno/logger/dialog/logmodel.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/logger/dialog/logview.py b/uno/lib/uno/logger/dialog/logview.py
index 27fb7c30..5ca08f3b 100644
--- a/uno/lib/uno/logger/dialog/logview.py
+++ b/uno/lib/uno/logger/dialog/logview.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/logger/logger.py b/uno/lib/uno/logger/logger.py
index 585177fe..696602f5 100644
--- a/uno/lib/uno/logger/logger.py
+++ b/uno/lib/uno/logger/logger.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/logger/loggerpool.py b/uno/lib/uno/logger/loggerpool.py
index a237a14d..a4a0ce45 100644
--- a/uno/lib/uno/logger/loggerpool.py
+++ b/uno/lib/uno/logger/loggerpool.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/logger/loghandler.py b/uno/lib/uno/logger/loghandler.py
index 011b9eb4..abbc761c 100644
--- a/uno/lib/uno/logger/loghandler.py
+++ b/uno/lib/uno/logger/loghandler.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/logger/loghelper.py b/uno/lib/uno/logger/loghelper.py
index d50fb165..202bb4b5 100644
--- a/uno/lib/uno/logger/loghelper.py
+++ b/uno/lib/uno/logger/loghelper.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/oauth2/configuration.py b/uno/lib/uno/oauth2/configuration.py
index af0055b0..3971540f 100644
--- a/uno/lib/uno/oauth2/configuration.py
+++ b/uno/lib/uno/oauth2/configuration.py
@@ -31,7 +31,7 @@
 g_extension = 'OAuth2OOo'
 g_identifier = 'io.github.prrvchr.%s' % g_extension
 g_service = '%s.OAuth2Service' % g_identifier
-g_version = '1.3.0'
+g_version = '1.3.1'
 
 g_oauth2 = g_service
 
diff --git a/uno/lib/uno/options/addressbook/optionsmanager.py b/uno/lib/uno/options/addressbook/optionsmanager.py
index 51241294..75db81c1 100644
--- a/uno/lib/uno/options/addressbook/optionsmanager.py
+++ b/uno/lib/uno/options/addressbook/optionsmanager.py
@@ -29,6 +29,9 @@
 
 import unohelper
 
+from com.sun.star.logging.LogLevel import INFO
+from com.sun.star.logging.LogLevel import SEVERE
+
 from .optionsmodel import OptionsModel
 from .optionsview import OptionsView
 
@@ -38,6 +41,7 @@
 
 from ..configuration import g_identifier
 from ..configuration import g_defaultlog
+from ..configuration import g_synclog
 
 from collections import OrderedDict
 import os
@@ -46,45 +50,28 @@
 
 
 class OptionsManager(unohelper.Base):
-    def __init__(self, ctx, window, ijson=True):
+    def __init__(self, ctx, window, logger):
         self._ctx = ctx
         self._model = OptionsModel(ctx)
         timeout, view, enabled = self._model.getViewData()
         self._view = OptionsView(window, timeout, view, enabled)
-        self._logger = LogManager(self._ctx, window.Peer, self._getInfos(ijson), g_identifier, g_defaultlog)
-
-    def saveSetting(self):
-        timeout, view = self._view.getViewData()
-        self._model.setViewData(timeout, view)
-        self._logger.saveSetting()
+        self._logmanager = LogManager(self._ctx, window.Peer, 'requirements.txt', g_identifier, g_defaultlog, g_synclog)
+        self._logger = logger
+        self._logger.logprb(INFO, 'OptionsManager', '__init__()', 201)
 
     def loadSetting(self):
         self._view.setTimeout(self._model.getTimeout())
         self._view.setViewName(self._model.getViewName())
-        self._logger.loadSetting()
+        self._logmanager.loadSetting()
+        self._logger.logprb(INFO, 'OptionsManager', 'loadSetting()', 211)
+
+    def saveSetting(self):
+        timeout, view = self._view.getViewData()
+        option = self._model.setViewData(timeout, view)
+        log = self._logmanager.saveSetting()
+        self._logger.logprb(INFO, 'OptionsManager', 'saveSetting()', 221, option, log)
 
     def viewData(self):
         url = self._model.getDatasourceUrl()
         getDesktop(self._ctx).loadComponentFromURL(url, '_default', 0, ())
 
-    def _getInfos(self, hasijson):
-        infos = OrderedDict()
-        version  = ' '.join(sys.version.split())
-        infos[111] = version
-        path = os.pathsep.join(sys.path)
-        infos[112] = path
-        if hasijson:
-            # Required modules for ijson
-            try:
-                import ijson
-            except Exception as e:
-                infos[136] = self._getExceptionMsg(e)
-            else:
-                infos[137] = (ijson.__version__, ijson.__file__)
-        return infos
-
-    def _getExceptionMsg(self, e):
-        error = repr(e)
-        trace = repr(traceback.format_exc())
-        return error, trace
-
diff --git a/uno/lib/uno/options/addressbook/optionsmodel.py b/uno/lib/uno/options/addressbook/optionsmodel.py
index 8ca2a6dc..35ee8215 100644
--- a/uno/lib/uno/options/addressbook/optionsmodel.py
+++ b/uno/lib/uno/options/addressbook/optionsmodel.py
@@ -44,33 +44,43 @@
 class OptionsModel(unohelper.Base):
     def __init__(self, ctx):
         self._ctx = ctx
-        self._configuration = getConfiguration(ctx, g_identifier, True)
+        self._config = getConfiguration(ctx, g_identifier, True)
         folder = g_folder + '/' + g_host
         location = getResourceLocation(ctx, g_identifier, folder)
         self._url = location + '.odb'
         self._factor = 60
 
+    @property
+    def _Timeout(self):
+        timeout = self._config.getByName('ReplicateTimeout')
+        return timeout // self._factor
+    @property
+    def _ViewName(self):
+        return self._config.getByName('AddressBookName')
+
 # OptionsModel getter methods
     def getViewData(self):
-        return self.getTimeout(), self.getViewName(), self._hasDatasource()
+        return self._Timeout, self._ViewName, self._hasDatasource()
 
     def getTimeout(self):
-        timeout = self._configuration.getByName('ReplicateTimeout')
-        return timeout / self._factor
+         return self._Timeout
 
     def getViewName(self):
-        return self._configuration.getByName('AddressBookName')
+        return self._ViewName
 
     def getDatasourceUrl(self):
         return self._url
 
 # OptionsModel setter methods
     def setViewData(self, timeout, view):
-        timeout = timeout * self._factor
-        self._configuration.replaceByName('ReplicateTimeout', timeout)
-        self._configuration.replaceByName('AddressBookName', view)
-        if self._configuration.hasPendingChanges():
-            self._configuration.commitChanges()
+        if timeout != self._Timeout:
+            self._config.replaceByName('ReplicateTimeout', timeout * self._factor)
+        if view != self._ViewName:
+            self._config.replaceByName('AddressBookName', view)
+        if self._config.hasPendingChanges():
+            self._config.commitChanges()
+            return True
+        return False
 
 # OptionsModel private getter methods
     def _hasDatasource(self):
diff --git a/uno/lib/uno/options/ucb/optionsmanager.py b/uno/lib/uno/options/ucb/optionsmanager.py
index 94b91dc8..f175a440 100644
--- a/uno/lib/uno/options/ucb/optionsmanager.py
+++ b/uno/lib/uno/options/ucb/optionsmanager.py
@@ -29,6 +29,9 @@
 
 import unohelper
 
+from com.sun.star.logging.LogLevel import INFO
+from com.sun.star.logging.LogLevel import SEVERE
+
 from .optionsmodel import OptionsModel
 from .optionsview import OptionsView
 
@@ -41,31 +44,32 @@
 from ..configuration import g_defaultlog
 from ..configuration import g_synclog
 
-from collections import OrderedDict
-import os
-import sys
 import traceback
 
 
 class OptionsManager(unohelper.Base):
-    def __init__(self, ctx, window):
+    def __init__(self, ctx, window, logger):
         self._ctx = ctx
         self._model = OptionsModel(ctx)
         exist = self._model.hasData()
         resumable = self._model.isResumable()
         data = self._model.getViewData()
         self._view = OptionsView(window, exist, resumable, data)
-        self._logger = LogManager(ctx, window.Peer, self._getInfos(), g_identifier, g_defaultlog, g_synclog)
-
-    def saveSetting(self):
-        share, name, index, timeout, download, upload = self._view.getViewData()
-        self._model.setViewData(share, name, index, timeout, download, upload)
-        self._logger.saveSetting()
+        self._logmanager = LogManager(ctx, window.Peer, 'requirements.txt', g_identifier, g_defaultlog, g_synclog)
+        self._logger = logger
+        self._logger.logprb(INFO, 'OptionsManager', '__init__()', 151)
 
     def loadSetting(self):
         data = self._model.getViewData()
         self._view.setViewData(*data)
-        self._logger.loadSetting()
+        self._logmanager.loadSetting()
+        self._logger.logprb(INFO, 'OptionsManager', 'loadSetting()', 161)
+
+    def saveSetting(self):
+        share, name, index, timeout, download, upload = self._view.getViewData()
+        option = self._model.setViewData(share, name, index, timeout, download, upload)
+        log = self._logmanager.saveSetting()
+        self._logger.logprb(INFO, 'OptionsManager', 'saveSetting()', 171, option, log)
 
     def enableShare(self, enabled):
         self._view.enableShare(enabled)
@@ -83,16 +87,3 @@ def download(self):
     def upload(self):
         self._view.setStep(2)
 
-    def _getInfos(self):
-        infos = OrderedDict()
-        infos['dateutil'] =           ('__version__',     '2.8.2')
-        infos['ijson'] =              ('__version__',     '3.2.2')
-        infos['packaging'] =          ('__version__',     '23.1')
-        infos['six'] =                ('__version__',     '1.16.0')
-        return infos
-
-    def _getExceptionMsg(self, e):
-        error = repr(e)
-        trace = repr(traceback.format_exc())
-        return error, trace
-
diff --git a/uno/lib/uno/options/ucb/optionsmodel.py b/uno/lib/uno/options/ucb/optionsmodel.py
index 41f6cdd0..435ab621 100644
--- a/uno/lib/uno/options/ucb/optionsmodel.py
+++ b/uno/lib/uno/options/ucb/optionsmodel.py
@@ -56,6 +56,32 @@ def __init__(self, ctx):
         self._policies = {'SERVER_IS_MASTER': 1, 'CLIENT_IS_MASTER': 2, 'NONE_IS_MASTER': 3}
         self._factors = {'Timeout': 60, 'Chunk': 1024}
 
+    @property
+    def _IsShared(self):
+        return self._config.getByName('SharedDocuments')
+    @property
+    def _ShareName(self):
+        return self._config.getByName('SharedFolderName')
+    @property
+    def _Policy(self):
+        policy = self._config.getByName('SynchronizePolicy')
+        return self._policies.get(policy)
+    @property
+    def _Timeout(self):
+        timeout = self._config.getByName('ReplicateTimeout')
+        return timeout // self._factors['Timeout']
+    @property
+    def _Download(self):
+        config = self._config.getByHierarchicalName('Settings/Download')
+        return self._getSetting(config)
+    @property
+    def _Upload(self):
+        config = self._config.getByHierarchicalName('Settings/Upload')
+        return self._getSetting(config)
+    @property
+    def _SupportShare(self):
+        return self._config.getByName('SupportShare')
+
 # OptionsModel getter methods
     def hasData(self):
         return getSimpleFile(self._ctx).exists(self._url)
@@ -64,9 +90,9 @@ def isResumable(self):
         return self._config.getByName('ResumableUpload')
 
     def getViewData(self):
-        return (self._supportShare(), self._isShared(), self._getShare(),
-                self._getPolicy(), self._getTimeout(),
-                self._getDownload(), self._getUpload())
+        return (self._SupportShare, self._IsShared, self._ShareName,
+                self._Policy, self._Timeout,
+                self._Download, self._Upload)
 
     def getDatasourceUrl(self):
         return self._url
@@ -81,38 +107,15 @@ def setViewData(self, share, name, index, timeout, download, upload):
         self._setUpload(upload)
         if self._config.hasPendingChanges():
             self._config.commitChanges()
+            return True
+        return False
 
 # OptionsModel private getter methods
-    def _supportShare(self):
-        return self._config.getByName('SupportShare')
-
-    def _isShared(self):
-        return self._config.getByName('SharedDocuments')
-
-    def _getShare(self):
-        return self._config.getByName('SharedFolderName')
-
-    def _getPolicy(self):
-        policy = self._config.getByName('SynchronizePolicy')
-        return self._policies.get(policy)
-
-    def _getTimeout(self):
-        timeout = self._config.getByName('ReplicateTimeout')
-        return timeout / self._factors['Timeout']
-
     def _getSynchronizePolicy(self, index):
         for policy, value in self._policies.items():
             if value == index:
                 return policy
 
-    def _getDownload(self):
-        config = self._config.getByHierarchicalName('Settings/Download')
-        return self._getSetting(config)
-
-    def _getUpload(self):
-        config = self._config.getByHierarchicalName('Settings/Upload')
-        return self._getSetting(config)
-
     def _getSetting(self, config):
         setting = {}
         for name in config.getElementNames():
@@ -124,27 +127,31 @@ def _getSetting(self, config):
 
 # OptionsModel private setter methods
     def _setShared(self, enabled):
-        self._config.replaceByName('SharedDocuments', enabled)
+        if enabled != self._IsShared:
+            self._config.replaceByName('SharedDocuments', enabled)
 
     def _setShare(self, name):
-        if name:
+        if name and name != self._ShareName:
             self._config.replaceByName('SharedFolderName', name)
 
     def _setPolicy(self, index):
-        policy = self._getSynchronizePolicy(index)
-        self._config.replaceByName('SynchronizePolicy', policy)
+        if index != self._Policy:
+            policy = self._getSynchronizePolicy(index)
+            self._config.replaceByName('SynchronizePolicy', policy)
 
     def _setTimeout(self, timeout):
-        timeout = timeout * self._factors['Timeout']
-        self._config.replaceByName('ReplicateTimeout', timeout)
+        if timeout != self._Timeout:
+            self._config.replaceByName('ReplicateTimeout', timeout * self._factors['Timeout'])
 
     def _setDownload(self, setting):
-        config = self._config.getByHierarchicalName('Settings/Download')
-        self._setSetting(config, setting)
+        if setting != self._Download:
+            config = self._config.getByHierarchicalName('Settings/Download')
+            self._setSetting(config, setting)
 
     def _setUpload(self, setting):
-        config = self._config.getByHierarchicalName('Settings/Upload')
-        self._setSetting(config, setting)
+        if setting != self._Upload:
+            config = self._config.getByHierarchicalName('Settings/Upload')
+            self._setSetting(config, setting)
 
     def _setSetting(self, config, setting):
         for name, value in setting.items():
diff --git a/uno/lib/uno/ucb/database.py b/uno/lib/uno/ucb/database.py
index d8e80e7c..fb510953 100644
--- a/uno/lib/uno/ucb/database.py
+++ b/uno/lib/uno/ucb/database.py
@@ -433,6 +433,7 @@ def insertIdentifier(self, iterator, userid):
         if count > 0:
             call.executeBatch()
         call.close()
+        return count
 
     # Pull procedure
     def pullItems(self, iterator, userid, timestamp, mode=1):
diff --git a/uno/lib/uno/ucb/replicator.py b/uno/lib/uno/ucb/replicator.py
index 4071b3db..764f4b83 100644
--- a/uno/lib/uno/ucb/replicator.py
+++ b/uno/lib/uno/ucb/replicator.py
@@ -84,9 +84,9 @@ def __init__(self, ctx, url, provider, users, sync, lock):
             sync.clear()
             self.start()
         except Exception as e:
-            self._logger.logprb(INFO, 'Replicator', '__init__()', 102, e, traceback.format_exc())
+            self._logger.logprb(INFO, g_basename, '__init__()', 102, e, traceback.format_exc())
         else:
-            self._logger.logprb(INFO, 'Replicator', '__init__()', 101)
+            self._logger.logprb(INFO, g_basename, '__init__()', 101)
 
     def fullPull(self):
         return self._fullPull
@@ -98,23 +98,23 @@ def cancel(self):
 
     def run(self):
         try:
-            self._logger.logprb(INFO, 'Replicator', 'run()', 111, self._provider.Scheme)
+            self._logger.logprb(INFO, g_basename, 'run()', 111, self._provider.Scheme)
             while not self._canceled:
                 timeout = self._getReplicateTimeout()
-                self._logger.logprb(INFO, 'Replicator', 'run()', 112, round(timeout /60))
+                self._logger.logprb(INFO, g_basename, 'run()', 112, timeout // 60)
                 self._sync.wait(timeout)
                 self._synchronize()
                 self._sync.clear()
         except Exception as e:
-            self._logger.logprb(SEVERE, 'Replicator', 'run()', 113, e, traceback.format_exc())
+            self._logger.logprb(SEVERE, g_basename, 'run()', 113, e, traceback.format_exc())
 
     def _synchronize(self):
         policy = self._getPolicy()
         if policy == self._getSynchronizePolicy('NONE_IS_MASTER'):
             return
-        self._logger.logprb(INFO, 'Replicator', '_synchronize()', 121)
+        self._logger.logprb(INFO, g_basename, '_synchronize()', 121)
         if self._provider.isOffLine():
-            self._logger.logprb(INFO, 'Replicator', '_synchronize()', 122)
+            self._logger.logprb(INFO, g_basename, '_synchronize()', 122)
         elif policy == self._getSynchronizePolicy('SERVER_IS_MASTER'):
             if not self._canceled:
                 self._pullUsers()
@@ -125,44 +125,59 @@ def _synchronize(self):
                 self._pushUsers()
             if not self._canceled:
                 self._pullUsers()
-        self._logger.logprb(INFO, 'Replicator', '_synchronize()', 123)
+        self._logger.logprb(INFO, g_basename, '_synchronize()', 123)
 
     def _pullUsers(self):
         try:
             for user in self._users.values():
                 if self._canceled:
                     break
-                self._logger.logprb(INFO, 'Replicator', '_pullUsers()', 131, user.Name)
+                self._logger.logprb(INFO, g_basename, '_pullUsers()', 201, user.Name)
                 # In order to make the creation of files or directories possible quickly,
                 # it is necessary to run the verification of the identifiers first.
                 self._checkNewIdentifier(user)
-                #if not user.Token:
                 if self._isNewUser(user):
                     self._initUser(user)
                 else:
                     self._pullUser(user)
-                self._logger.logprb(INFO, 'Replicator', '_pullUsers()', 132, user.Name)
+                self._logger.logprb(INFO, g_basename, '_pullUsers()', 202, user.Name)
         except Exception as e:
-            self._logger.logprb(SEVERE, 'Replicator', '_pullUsers()', 133, e, traceback.format_exc())
+            self._logger.logprb(SEVERE, g_basename, '_pullUsers()', 203, e, traceback.format_exc())
+
+    def _checkNewIdentifier(self, user):
+        if not self._provider.GenerateIds:
+            user.CanAddChild = True
+            return
+        if self._provider.isOffLine():
+            user.CanAddChild = self.DataBase.countIdentifier(user.Id) > 0
+            return
+        count = self.DataBase.countIdentifier(user.Id)
+        if count < min(self._provider.IdentifierRange):
+            total, msg = self._provider.pullNewIdentifiers(user)
+            if total:
+                self._logger.logprb(INFO, g_basename, '_checkNewIdentifier()', 211, user.Name, count, total)
+            else:
+                self._logger.logprb(INFO, g_basename, '_checkNewIdentifier()', 212, user.Name, msg)
+        # Need to postpone the creation authorization after this verification...
+        user.CanAddChild = True
 
     def _initUser(self, user):
         # This procedure is launched only once for each new user
         # This procedure corresponds to the initial pull for a new User (ie: without Token)
-        self._logger.logprb(INFO, 'Replicator', '_initUser()', 141, user.Name)
+        self._logger.logprb(INFO, g_basename, '_initUser()', 221, user.Name)
         pages, count, token = self._provider.firstPull(user)
         self._provider.initUser(self.DataBase, user, token)
         user.SyncMode = 1
         self._fullPull = True
-        self._logger.logprb(INFO, 'Replicator', '_initUser()', 142, user.Name)
+        self._logger.logprb(INFO, g_basename, '_initUser()', 222, user.Name)
 
     def _pullUser(self, user):
         # This procedure is launched each time the synchronization is started
         # This procedure corresponds to the pull for a User (ie: a Token is required)
-        print("Replicator._pullUser() 1")
         pages, count, token = self._provider.pullUser(user)
         if token:
             user.setToken(token)
-        print("Replicator._pullUser() 2 Items count: %s - Pages count: %s - Token: %s" % (count, pages, token))
+        self._logger.logprb(INFO, g_basename, '_pullUser()', 231, user.Name, count, pages, token)
 
     def _pushUsers(self):
         # This procedure is launched each time the synchronization is started
@@ -171,7 +186,7 @@ def _pushUsers(self):
         try:
             end = currentDateTimeInTZ()
             for user in self._users.values():
-                self._logger.logprb(INFO, 'Replicator', '_pushUsers()', 151, user.Name)
+                self._logger.logprb(INFO, g_basename, '_pushUsers()', 301, user.Name)
                 if self._isNewUser(user):
                     self._initUser(user)
                 items = []
@@ -183,25 +198,13 @@ def _pushUsers(self):
                         items.append(newid)
                     else:
                         modified = getDateTimeToString(metadata.get('DateModified'))
-                        self._logger.logprb(SEVERE, 'Replicator', '_pushUsers()', 152, metadata.get('Title'), modified, metadata.get('Id'))
+                        self._logger.logprb(SEVERE, g_basename, '_pushUsers()', 302, metadata.get('Title'), modified, metadata.get('Id'))
                         break
                 if items:
                     self.DataBase.updatePushItems(user, items)
-                self._logger.logprb(INFO, 'Replicator', '_pushUsers()', 153, user.Name)
+                self._logger.logprb(INFO, g_basename, '_pushUsers()', 303, user.Name)
         except Exception as e:
-            self._logger.logprb(SEVERE, 'Replicator', '_pushUsers()', 154, e, traceback.format_exc())
-
-    def _checkNewIdentifier(self, user):
-        if not self._provider.GenerateIds:
-            user.CanAddChild = True
-            return
-        if self._provider.isOffLine():
-            user.CanAddChild = self.DataBase.countIdentifier(user.Id) > 0
-            return
-        if self.DataBase.countIdentifier(user.Id) < min(self._provider.IdentifierRange):
-            self._provider.pullNewIdentifiers(user)
-        # Need to postpone the creation authorization after this verification...
-        user.CanAddChild = True
+            self._logger.logprb(SEVERE, g_basename, '_pushUsers()', 304, e, traceback.format_exc())
 
 
     def _filterParents(self, call, provider, items, childs, roots, start):
@@ -226,28 +229,20 @@ def _pushItem(self, user, item, metadata, start, end):
             timestamp = item.get('TimeStamp')
             action = item.get('ChangeAction')
             chunk, retry, delay = self._getUploadSetting()
-            print("Replicator._pushItem() 3 Insert/Update Title: %s Id: %s - Action: %s" % (metadata.get('Title'),
-                                                                                 itemid,
-                                                                                 action))
             # If the synchronization of an INSERT or an UPDATE fails
             # then the user's TimeStamp will not be updated
             # INSERT procedures, new files and folders are synced here.
             if action & INSERT:
-                print("Replicator._pushItem() INSERT 1")
                 mediatype = metadata.get('MediaType')
-                print("Replicator._pushItem() INSERT 2")
                 created = getDateTimeToString(metadata.get('DateCreated'))
                 if self._provider.isFolder(mediatype):
-                    print("Replicator._pushItem() INSERT 3")
                     newid = self._provider.createFolder(user, itemid, metadata)
-                    print("Replicator._pushItem() INSERT 4")
-                    self._logger.logprb(INFO, 'Replicator', '_pushItem()', 161, metadata.get('Title'), created)
-                    print("Replicator._pushItem() INSERT 5")
+                    self._logger.logprb(INFO, g_basename, '_pushItem()', 311, metadata.get('Title'), created)
                 elif self._provider.isLink(mediatype):
                     pass
                 elif self._provider.isDocument(mediatype):
-                    newid, args = self._provider.uploadFile(165, user, itemid, metadata, created, chunk, retry, delay, True)
-                    self._logger.logprb(INFO, 'Replicator', '_pushItem()', *args)
+                    newid, args = self._provider.uploadFile(314, user, itemid, menewidtadata, created, chunk, retry, delay, True)
+                    self._logger.logprb(INFO, g_basename, '_pushItem()', *args)
             # UPDATE procedures, only a few properties are synchronized: Title and content(ie: Size or DateModified)
             elif action & UPDATE:
                 for property in self.DataBase.getPushProperties(user.Id, itemid, start, end):
@@ -256,26 +251,23 @@ def _pushItem(self, user, item, metadata, start, end):
                     modified = getDateTimeToString(metadata.get('DateModified'))
                     if properties & TITLE:
                         newid = self._provider.updateTitle(user.Request, itemid, metadata)
-                        self._logger.logprb(INFO, 'Replicator', '_pushItem()', 170, metadata.get('Title'), modified)
+                        self._logger.logprb(INFO, g_basename, '_pushItem()', 312, metadata.get('Title'), modified)
                     elif properties & CONTENT:
-                        newid, args = self._provider.uploadFile(175, user, itemid, metadata, modified, chunk, retry, delay, False)
-                        self._logger.logprb(INFO, 'Replicator', '_pushItem()', *args)
+                        newid, args = self._provider.uploadFile(314, user, itemid, metadata, modified, chunk, retry, delay, False)
+                        self._logger.logprb(INFO, g_basename, '_pushItem()', *args)
                     elif properties & TRASHED:
                         newid = self._provider.updateTrashed(user.Request, itemid, metadata)
-                        self._logger.logprb(INFO, 'Replicator', '_pushItem()', 172, metadata.get('Title'), modified)
+                        self._logger.logprb(INFO, g_basename, '_pushItem()', 313, metadata.get('Title'), modified)
             # MOVE procedures to follow parent changes of a resource
             elif action & MOVE:
-                print("Replicator._pushItem() MOVE")
                 self.DataBase.getItemParentIds(itemid, metadata, start, end)
                 newid = self._provider.updateParents(user.Request, itemid, metadata)
-                print("Replicator.._pushItem() MOVE ToAdd: %s - ToRemove: %s" % (toadd, toremove))
             elif action & DELETE:
-                print("Replicator._pushItem() DELETE")
                 newid = self._provider.updateTrashed(user.Request, itemid, metadata)
-                self._logger.logprb(INFO, 'Replicator', '_pushItem()', 172, metadata.get('Title'), timestamp)
+                self._logger.logprb(INFO, g_basename, '_pushItem()', 313, metadata.get('Title'), timestamp)
             return newid
         except Exception as e:
-            self._logger.logprb(SEVERE, 'Replicator', '_pushItem()', 179, e, traceback.format_exc())
+            self._logger.logprb(SEVERE, g_basename, '_pushItem()', 319, e, traceback.format_exc())
 
     def _isNewUser(self, user):
         return user.SyncMode == 0
diff --git a/uno/lib/uno/ucb/ucp/provider.py b/uno/lib/uno/ucb/ucp/provider.py
index d7c45424..72f973d7 100644
--- a/uno/lib/uno/ucb/ucp/provider.py
+++ b/uno/lib/uno/ucb/ucp/provider.py
@@ -154,15 +154,16 @@ def getDocumentContent(self, content, url):
 
     # Method called by Replicator
     def pullNewIdentifiers(self, user):
+        count, msg = 0, ''
         parameter = self.getRequestParameter(user.Request, 'getNewIdentifier', user)
         response = user.Request.execute(parameter)
-        if response.Ok:
-            iterator = self.parseNewIdentifiers(response)
+        if not response.Ok:
+            msg = response.Text
         else:
-            # TODO: raise exception with the right message...
-            self._logger.logprb(SEVERE, 'Replicator', '_checkNewIdentifier', 403, user.Name)
-        user.DataBase.insertIdentifier(iterator, user.Id)
+            iterator = self.parseNewIdentifiers(response)
+            count = user.DataBase.insertIdentifier(iterator, user.Id)
         response.close()
+        return count, msg
 
     def firstPull(self, user):
         datetime = currentDateTimeInTZ()
@@ -306,26 +307,32 @@ def createFolder(self, user, itemid, item):
         return self.mergeNewFolder(user, itemid, response)
 
     def uploadFile(self, code, user, item, data, created, chunk, retry, delay, new=False):
+        newid = None
         method = 'getNewUploadLocation' if new else 'getUploadLocation'
         parameter = self.getRequestParameter(user.Request, method, data)
         response = user.Request.execute(parameter)
         if not response.Ok:
-            msg = response.Text
-            response.close()
-            return None, (code +1, data.get('Title'), msg)
-        location = self.parseUploadLocation(response)
-        if location is None:
-            return None, (code +2, data.get('Title'))
-        parameter = self.getRequestParameter(user.Request, 'getUploadStream', location)
-        url = self.SourceURL + g_separator + item
-        response = user.Request.upload(parameter, url, chunk, retry, delay)
-        if not response.Ok:
-            msg = response.Text
+            args = code, data.get('Title'), response.Text
             response.close()
-            return None, (code +3, data.get('Title'), msg)
-        newid = self.updateItemId(user.DataBase, item, response)
-        return newid, (code, data.get('Title'), created, data.get('Size'))
-
+        else:
+            location = self.parseUploadLocation(response)
+            if location is None:
+                args = code + 1, data.get('Title')
+            else:
+                parameter = self.getRequestParameter(user.Request, 'getUploadStream', location)
+                url = self.SourceURL + g_separator + item
+                response = user.Request.upload(parameter, url, chunk, retry, delay)
+                if not response.Ok:
+                    args = code + 2, data.get('Title'), response.Text
+                    response.close()
+                elif new:
+                    newid = self.updateItemId(user.DataBase, item, response)
+                    args = code + 3, data.get('Title'), created, data.get('Size')
+                else:
+                    response.close()
+                    newid = item
+                    args = code + 4, data.get('Title'), created, data.get('Size')
+        return newid, args
 
     def updateTitle(self, request, itemid, item):
         parameter = self.getRequestParameter(request, 'updateTitle', item)
diff --git a/uno/lib/uno/unolib/__init__.py b/uno/lib/uno/unolib/__init__.py
index 38dc9542..4efbc398 100644
--- a/uno/lib/uno/unolib/__init__.py
+++ b/uno/lib/uno/unolib/__init__.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/unolib/unocore.py b/uno/lib/uno/unolib/unocore.py
index 6aef38e1..c202aa52 100644
--- a/uno/lib/uno/unolib/unocore.py
+++ b/uno/lib/uno/unolib/unocore.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/unolib/unolib.py b/uno/lib/uno/unolib/unolib.py
index 3b77b0f8..58ceb028 100644
--- a/uno/lib/uno/unolib/unolib.py
+++ b/uno/lib/uno/unolib/unolib.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/unotool/__init__.py b/uno/lib/uno/unotool/__init__.py
index 0c9d8537..207f2376 100644
--- a/uno/lib/uno/unotool/__init__.py
+++ b/uno/lib/uno/unotool/__init__.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/lib/uno/unotool/unotool.py b/uno/lib/uno/unotool/unotool.py
index ad48d11f..53e36e5c 100644
--- a/uno/lib/uno/unotool/unotool.py
+++ b/uno/lib/uno/unotool/unotool.py
@@ -4,7 +4,7 @@
 """
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/rdb/idl/com/sun/star/logging/LoggerPool2.idl b/uno/rdb/idl/com/sun/star/logging/LoggerPool2.idl
index 51cd8b2f..e443c6b6 100644
--- a/uno/rdb/idl/com/sun/star/logging/LoggerPool2.idl
+++ b/uno/rdb/idl/com/sun/star/logging/LoggerPool2.idl
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/rdb/idl/com/sun/star/logging/XLogger2.idl b/uno/rdb/idl/com/sun/star/logging/XLogger2.idl
index 0cb01bab..09c59b5f 100644
--- a/uno/rdb/idl/com/sun/star/logging/XLogger2.idl
+++ b/uno/rdb/idl/com/sun/star/logging/XLogger2.idl
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/rdb/idl/com/sun/star/logging/XLoggerPool2.idl b/uno/rdb/idl/com/sun/star/logging/XLoggerPool2.idl
index baa0ab29..260afc64 100644
--- a/uno/rdb/idl/com/sun/star/logging/XLoggerPool2.idl
+++ b/uno/rdb/idl/com/sun/star/logging/XLoggerPool2.idl
@@ -1,7 +1,7 @@
 /*
 ╔════════════════════════════════════════════════════════════════════════════════════╗
 ║                                                                                    ║
-║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║   Copyright (c) 2020-24 https://prrvchr.github.io                                  ║ 
 ║                                                                                    ║
 ║   Permission is hereby granted, free of charge, to any person obtaining            ║
 ║   a copy of this software and associated documentation files (the "Software"),     ║
diff --git a/uno/resource/ucb/ContentProvider_en_US.properties b/uno/resource/ucb/ContentProvider_en_US.properties
index b858a6d4..634551de 100644
--- a/uno/resource/ucb/ContentProvider_en_US.properties
+++ b/uno/resource/ucb/ContentProvider_en_US.properties
@@ -2,6 +2,19 @@
 101=ContentProvider: {} Loading completed
 
 
+140=OptionsHandler.callHandlerMethod()
+141=An unexpected exception: {} has occurred, producing a series of exceptions: {}
+
+150=OptionsManager.__init__()
+151=OptionManger has been correctly initialized.
+
+160=OptionsManager.loadSetting()
+161=OptionManger has been correctly reloaded.
+
+170=OptionsManager.saveSetting()
+171=OptionManger saved options {} and logging {}.
+
+
 200=ContentProvider.__init__()
 201=ParameterizedProvider{} Loading completed
 
diff --git a/uno/resource/ucb/ContentProvider_fr_FR.properties b/uno/resource/ucb/ContentProvider_fr_FR.properties
index c466c193..ce7a598a 100644
--- a/uno/resource/ucb/ContentProvider_fr_FR.properties
+++ b/uno/resource/ucb/ContentProvider_fr_FR.properties
@@ -2,6 +2,19 @@
 101=ContentProvider: {} Chargement termin\u00e9
 
 
+140=OptionsHandler.callHandlerMethod()
+141=Une exception: {} inattendue s'est produite, produisant une s�rie d'exceptions: {}
+
+150=OptionsManager.__init__()
+151=OptionManger a �t� correctement initialis�.
+
+160=OptionsManager.loadSetting()
+161=OptionManger a �t� correctement recharg�.
+
+170=OptionsManager.saveSetting()
+171=OptionManger a sauvegard� des options {} et la journalisation {}.
+
+
 200=ContentProvider.__init__()
 201=ParameterizedProvider{} Chargement termin\u00e9
 
diff --git a/uno/resource/ucb/Replicator_en_US.properties b/uno/resource/ucb/Replicator_en_US.properties
index 4acb05fb..fbdb665e 100644
--- a/uno/resource/ucb/Replicator_en_US.properties
+++ b/uno/resource/ucb/Replicator_en_US.properties
@@ -13,39 +13,38 @@
 122=Synchronization is not possible network is offline!!!
 123=End of data synchronization.
 
-130=Replicator._pullUsers()
-131=Starting data download for user: {}.
-132=End of download for user: {}.
-133=Replicator thread throw error: {}\n{}
-
-140=Replicator._initUser()
-141=Initialize user name: {}.
-142=First data pull for user name {}, done...
-
-150=Replicator._pushUsers()
-151=Starting data replication for user: {}.
-152=Has encountered an error while replicating the file/folder: {} of {} with Id: {}
-153=End of replicating data for user: {}.
-154=Replicator thread throw error: {}\n{}
-
-160=Replicator._pushItem
-161=Has replicated the creation of a folder: {} of {}
-
-165=Has replicated the creation of a file: {} of {} size: {}
-166=Can't retrieve upload location for file: {} HTTP response: {}
-167=Can't retrieve upload location for file: {}
-168=Can't upload file: {} HTTP response: {}
-
-170=Has replicated the file/folder's title: {} update of {}
-172=Has replicated the file/folder's trashed: {} of {}
-
-175=Has replicated the update of file: {} of {} size: {}
-176=Can't retrieve upload location for file: {} HTTP response: {}
-177=Can't retrieve upload location for file: {}
-178=Can't upload file: {} HTTP response: {}
-
-179=Replicator thread throw error: {}\n{}
-
+200=Replicator._pullUsers()
+201=Starting data download for user: {}.
+202=End of download for user: {}.
+203=Replicator thread throw error: {}\n{}
+
+210=Replicator._checkNewIdentifier()
+211=User {} only has {} identifiers left, {} identifiers have just been downloaded.
+212=Has throw an error when requesting identifiers for user {} with the message: {}
+
+220=Replicator._initUser()
+221=Initialize user name: {}.
+222=First data pull for user name {}, done...
+
+230=Replicator._pullUser()
+231=User {} pull #{} changes on #{} pages with token {}
+
+300=Replicator._pushUsers()
+301=Starting data replication for user: {}.
+302=Has encountered an error while replicating the file/folder: {} of {} with Id: {}
+303=End of replicating data for user: {}.
+304=Replicator thread throw error: {}\n{}
+
+310=Replicator._pushItem
+311=Has replicated the creation of a folder: {} of {}
+312=Has replicated the file/folder's title: {} update of {}
+313=Has replicated the file/folder's trashed: {} of {}
+314=Can't retrieve upload location for file: {} HTTP response: {}
+315=Can't retrieve upload location for file: {}
+316=Can't upload file: {} HTTP response: {}
+317=Has replicated the creation of file: {} of {} size: {}
+318=Has replicated the update of file: {} of {} size: {}
+319=Replicator thread throw error: {}\n{}
 
 400=DataBase.__init__()
 401=DataBase: Loading completed
diff --git a/uno/resource/ucb/Replicator_fr_FR.properties b/uno/resource/ucb/Replicator_fr_FR.properties
index aa78098e..d55eaa98 100644
--- a/uno/resource/ucb/Replicator_fr_FR.properties
+++ b/uno/resource/ucb/Replicator_fr_FR.properties
@@ -13,39 +13,38 @@
 122=La synchronisation n'est pas possible le r\u00e9seau est hors ligne!!!
 123=Fin de la synchronisation des donn\u00e9es.
 
-130=Replicator._pullUsers()
-131=D\u00e9marrage du t\u00e9l\u00e9chargement des donn\u00e9es pour l'utilisateur: {}.
-132=Fin du t\u00e9l\u00e9chargement pour l'utilisateur: {}.
-133=Le fil d'execution du r�plicateur a lancer l'erreur: {}\n{}
-
-140=Replicator._initUser()
-141=Initialisation de l'utilisateur {}.
-142=Premi�re r�plication de donn�es pour l'utilisateur {}, termin�e...
-
-150=Replicator._pushUsers()
-151=D\u00e9marrage de la r\u00e9plication des donn\u00e9es pour l'utilisateur: {}.
-152=A rencontr\u00e9 une erreur lors de la r\u00e9pliquation du fichier/r\u00e9p\u00e9rtoire: {} du {} portant l'Id: {}
-153=Fin de la r\u00e9plication des donn\u00e9es pour l'utilisateur: {}.
-154=Le fil d'execution du r�plicateur a lancer l'erreur: {}\n{}
-
-160=Replicator._pushItem
-161=A repliqu\u00e9 la cr\u00e9ation du dossier: {} du {}
-
-165=A repliqu\u00e9 la cr\u00e9ation du fichier: {} du {} d'une taille de: {}
-166=Ne peut pas retrouver l'emplacement du t�l�chargement du fichier: {} la r�ponse HTTP est: {}
-167=Ne peut pas retrouver l'emplacement du t�l�chargement du fichier: {}
-168=Ne peut pas t�l�charger le fichier: {} la r�ponse HTTP est: {}
-
-170=A repliqu\u00e9 la mise \u00e0 jour du titre du fichier/r\u00e9p\u00e9rtoire: {} du {}
-172=A repliqu\u00e9 la mise \u00e0 jour de l'effacement du fichier/r\u00e9p\u00e9rtoire: {} du {}
-
-175=A repliqu\u00e9 la mise \u00e0 jour du fichier: {} du {} d'une taille de: {}
-176=Ne peut pas retrouver l'emplacement de la mise \u00e0 jour du fichier: {} la r�ponse HTTP est: {}
-177=Ne peut pas retrouver l'emplacement de la mise \u00e0 jour du fichier: {}
-178=Ne peut pas mettre \u00e0 jour le fichier: {} la r�ponse HTTP est: {}
-
-179=Le fil d'execution du r�plicateur a lancer l'erreur: {}\n{}
-
+200=Replicator._pullUsers()
+201=D\u00e9marrage du t\u00e9l\u00e9chargement des donn\u00e9es pour l'utilisateur: {}.
+202=Fin du t\u00e9l\u00e9chargement pour l'utilisateur: {}.
+203=Le fil d'execution du r�plicateur a lancer l'erreur: {}\n{}
+
+210=Replicator._checkNewIdentifier()
+211=L'utilisateur {} ne dispose plus que de {} identifiants, {} identifiants viennent d'�tre t�l�charg�.
+212=A g�n�r� une erreur lors de la demande identifiants pour l'utilisateur {} avec le message: {}
+
+220=Replicator._initUser()
+221=Initialisation de l'utilisateur {}.
+222=Premi�re r�plication de donn�es pour l'utilisateur {}, termin�e...
+
+230=Replicator._pullUser()
+231=L'utilisateur {} a #{} changements sur #{} pages avec le jeton {}.
+
+300=Replicator._pushUsers()
+301=D\u00e9marrage de la r\u00e9plication des donn\u00e9es pour l'utilisateur: {}.
+302=A rencontr\u00e9 une erreur lors de la r\u00e9pliquation du fichier/r\u00e9p\u00e9rtoire: {} du {} portant l'Id: {}
+303=Fin de la r\u00e9plication des donn\u00e9es pour l'utilisateur: {}.
+304=Le fil d'execution du r�plicateur a lancer l'erreur: {}\n{}
+
+310=Replicator._pushItem
+311=A repliqu\u00e9 la cr\u00e9ation du dossier: {} du {}
+312=A repliqu\u00e9 la mise \u00e0 jour du titre du fichier/r\u00e9p\u00e9rtoire: {} du {}
+313=A repliqu\u00e9 la mise \u00e0 jour de l'effacement du fichier/r\u00e9p\u00e9rtoire: {} du {}
+314=Ne peut pas retrouver l'emplacement de la mise \u00e0 jour du fichier: {} la r�ponse HTTP est: {}
+315=Ne peut pas retrouver l'emplacement de la mise \u00e0 jour du fichier: {}
+316=Ne peut pas mettre \u00e0 jour le fichier: {} la r�ponse HTTP est: {}
+317=A repliqu� la cr�ation du fichier: {} du {} d'une taille de: {}
+318=A repliqu\u00e9 la mise \u00e0 jour du fichier: {} du {} d'une taille de: {}
+319=Le fil d'execution du r�plicateur a lancer l'erreur: {}\n{}
 
 400=DataBase.__init__()
 401=DataBase: Chargement termin\u00e9