diff options
author | Marco Scardovi <marco@scardovi.com> | 2022-01-17 21:34:12 +0100 |
---|---|---|
committer | Jakov Smolić <jsmolic@gentoo.org> | 2022-01-18 12:29:36 +0100 |
commit | 395c494e0cfba8e94ea03ff351cd0ae0aeca5fe0 (patch) | |
tree | c3385b7b5fd5fcb7eb4f2676e147fce4a0dc02ce /app-admin/cdist/files/test.patch | |
parent | x11-misc/screengrab: Stabilize 2.2.0 x86, #831374 (diff) | |
download | gentoo-395c494e0cfba8e94ea03ff351cd0ae0aeca5fe0.tar.gz gentoo-395c494e0cfba8e94ea03ff351cd0ae0aeca5fe0.tar.bz2 gentoo-395c494e0cfba8e94ea03ff351cd0ae0aeca5fe0.zip |
app-admin/cdist: fix test
Closes: https://bugs.gentoo.org/831362
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco@scardovi.com>
Closes: https://github.com/gentoo/gentoo/pull/23846
Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
Diffstat (limited to 'app-admin/cdist/files/test.patch')
-rw-r--r-- | app-admin/cdist/files/test.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/app-admin/cdist/files/test.patch b/app-admin/cdist/files/test.patch new file mode 100644 index 000000000000..98659344e9ea --- /dev/null +++ b/app-admin/cdist/files/test.patch @@ -0,0 +1,45 @@ +From 3a321469a8ba5aea55220bd70bd4900de732e917 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net> +Date: Tue, 16 Nov 2021 11:11:45 +0100 +Subject: [PATCH] Python 3.10: collections.X -> collections.abc.X + +--- + cdist/integration.py | 2 +- + cdist/util/fsproperty.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cdist/integration.py b/cdist/integration.py +index 17b65f09..04470ea7 100644 +--- a/cdist/integration.py ++++ b/cdist/integration.py +@@ -84,7 +84,7 @@ def _process_hosts_simple(action, host, manifest, verbose, + """ + if isinstance(host, str): + hosts = [host, ] +- elif isinstance(host, collections.Iterable): ++ elif isinstance(host, collections.abc.Iterable): + hosts = host + else: + raise cdist.Error('Invalid host argument: {}'.format(host)) +diff --git a/cdist/util/fsproperty.py b/cdist/util/fsproperty.py +index 09e9cc19..6bf935e8 100644 +--- a/cdist/util/fsproperty.py ++++ b/cdist/util/fsproperty.py +@@ -33,7 +33,7 @@ class AbsolutePathRequiredError(cdist.Error): + return 'Absolute path required, got: {}'.format(self.path) + + +-class FileList(collections.MutableSequence): ++class FileList(collections.abc.MutableSequence): + """A list that stores it's state in a file. + + """ +@@ -102,7 +102,7 @@ class FileList(collections.MutableSequence): + self.__write(lines) + + +-class DirectoryDict(collections.MutableMapping): ++class DirectoryDict(collections.abc.MutableMapping): + """A dict that stores it's items as files in a directory. + + """ |