dede5bd1d4
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=166
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 023d1256106319d042233021c0f200bcdc0cd1f0 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
|
|
<psuarezhernandez@suse.com>
|
|
Date: Fri, 13 Mar 2020 13:01:57 +0000
|
|
Subject: [PATCH] Make salt.ext.tornado.gen to use salt.ext.backports_abc
|
|
on Python 2
|
|
|
|
---
|
|
salt/ext/tornado/gen.py | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/salt/ext/tornado/gen.py b/salt/ext/tornado/gen.py
|
|
index 6cb19730bf1ef3893a4626e9e144eac1c6fa9683..72f422ce28fa43132782a7a0d61b31acd32d138b 100644
|
|
--- a/salt/ext/tornado/gen.py
|
|
+++ b/salt/ext/tornado/gen.py
|
|
@@ -115,13 +115,13 @@ try:
|
|
# py35+
|
|
from collections.abc import Generator as GeneratorType # type: ignore
|
|
except ImportError:
|
|
- from backports_abc import Generator as GeneratorType # type: ignore
|
|
+ from salt.ext.backports_abc import Generator as GeneratorType # type: ignore
|
|
|
|
try:
|
|
# py35+
|
|
from inspect import isawaitable # type: ignore
|
|
except ImportError:
|
|
- from backports_abc import isawaitable
|
|
+ from salt.ext.backports_abc import isawaitable
|
|
except ImportError:
|
|
if 'APPENGINE_RUNTIME' not in os.environ:
|
|
raise
|
|
--
|
|
2.23.0
|
|
|
|
|