Skip to content
Snippets Groups Projects
Commit fd36d7ff authored by Sandro Tosi's avatar Sandro Tosi
Browse files

add upstream patch to properly import Callable; Closes: #1002361 (and partially #978259)

parent 8c3d70ac
Branches
Tags upstream/8.1.0
No related merge requests found
python-testing.common.database (2.0.3-1) UNRELEASED; urgency=medium
* New upstream release
* debian/patches/PR25.patch
- add upstream patch to properly import Callable; Closes: #1002361 (and
partially #978259)
-- Sandro Tosi <morph@debian.org> Sun, 19 Jun 2022 02:00:31 -0400
-- Sandro Tosi <morph@debian.org> Sun, 19 Jun 2022 02:06:27 -0400
python-testing.common.database (2.0.0-3) unstable; urgency=medium
......
From fa31191abe883d0ddc2a441550eeacc4126c85cb Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Sat, 18 Dec 2021 10:32:19 -0500
Subject: [PATCH] Support Callable in collections.abc
The abstract base classes are available here in Python 3.3+, and
in current Python versions they are no longer available directly
in collections.
---
src/testing/common/database.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/testing/common/database.py b/src/testing/common/database.py
index 5ba8c5e..74e1067 100644
--- a/src/testing/common/database.py
+++ b/src/testing/common/database.py
@@ -23,7 +23,10 @@
from time import sleep
from shutil import copytree, rmtree
from datetime import datetime
-import collections
+try:
+ from collections.abc import Callable
+except ImportError:
+ from collections import Callable
class DatabaseFactory(object):
@@ -285,7 +288,7 @@ def decorator(fn, path=arg):
return skipIf(cond, "%s not found" % self.name)(fn)
- if isinstance(arg, collections.Callable): # execute as simple decorator
+ if isinstance(arg, Callable): # execute as simple decorator
return decorator(arg, None)
else: # execute with path argument
return decorator
PR25.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment