This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a commit to branch 1.5.x
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/1.5.x by this push:
new f8ff6a7 DISPATCH-1229 - Fixed imports causing issues to system tests
on python3.7
f8ff6a7 is described below
commit f8ff6a7b5f77f3d46f7b034fbee529042678389f
Author: Fernando Giorgetti <fgior...@redhat.com>
AuthorDate: Thu Dec 20 17:51:04 2018 -0200
DISPATCH-1229 - Fixed imports causing issues to system tests on python3.7
---
python/qpid_dispatch_internal/tools/command.py | 5 ++++-
tests/tox.ini.in | 4 +++-
tools/qdmanage.in | 5 ++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/python/qpid_dispatch_internal/tools/command.py
b/python/qpid_dispatch_internal/tools/command.py
index ace9391..b7da384 100644
--- a/python/qpid_dispatch_internal/tools/command.py
+++ b/python/qpid_dispatch_internal/tools/command.py
@@ -26,7 +26,10 @@ from __future__ import absolute_import
from __future__ import print_function
import sys, json, optparse, os
-from collections import Sequence, Mapping
+try:
+ from collections.abc import Mapping, Sequence
+except ImportError:
+ from collections import Mapping, Sequence
from qpid_dispatch_site import VERSION
from proton import SSLDomain, Url
from proton.utils import SyncRequestResponse, BlockingConnection
diff --git a/tests/tox.ini.in b/tests/tox.ini.in
index af724a4..4885e61 100644
--- a/tests/tox.ini.in
+++ b/tests/tox.ini.in
@@ -18,7 +18,7 @@
#
[tox]
-envlist = py27,py35,py36
+envlist = py27,py35,py36,py37
skipsdist = True
minversion = ${TOX_VERSION}
skip_missing_interpreters = True
@@ -43,4 +43,6 @@ basepython = python3.5
[testenv:py36]
basepython = python3.6
+[testenv:py37]
+basepython = python3.7
diff --git a/tools/qdmanage.in b/tools/qdmanage.in
index 9ed3adb..b1480e3 100755
--- a/tools/qdmanage.in
+++ b/tools/qdmanage.in
@@ -27,7 +27,10 @@ from __future__ import print_function
import sys, json, re
import qpid_dispatch_site
from qpid_dispatch.management.client import Node, Url
-from collections import Mapping, Sequence
+try:
+ from collections.abc import Mapping, Sequence
+except ImportError:
+ from collections import Mapping, Sequence
from optparse import OptionGroup
from qpid_dispatch_internal.tools.command import OptionParser, Option,
UsageError, connection_options, check_args, \
main, opts_ssl_domain, opts_url, opts_sasl
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
