[trafficserver] branch 9.2.x updated: Address issues with python 3.10 (#8729)

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.2.x by this push:
     new 181a152  Address issues with python 3.10 (#8729)
181a152 is described below

commit 181a152b560e3d0711b0fa3c79d42e8ef98345a1
Author: dragon512 <dr...@live.com>
AuthorDate: Thu Mar 17 16:38:28 2022 -0500

    Address issues with python 3.10 (#8729)
    
    (cherry picked from commit 9bed7f25ef93df0e2b0546f981a48b172e5b113d)
---
 tests/Pipfile                                     | 2 +-
 tests/gold_tests/autest-site/ordered_set_queue.py | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/Pipfile b/tests/Pipfile
index 431f330..ac98990 100644
--- a/tests/Pipfile
+++ b/tests/Pipfile
@@ -26,7 +26,7 @@ pyflakes = "*"
 [packages]
 
 # Keep init.cli.ext updated with this required autest version.
-autest = "==1.10.0"
+autest = "==1.10.1"
 
 traffic-replay = "*" # this should install TRLib, MicroServer, MicroDNS, Traffic-Replay
 hyper = "*"
diff --git a/tests/gold_tests/autest-site/ordered_set_queue.py b/tests/gold_tests/autest-site/ordered_set_queue.py
index 5001cf7..789301d 100644
--- a/tests/gold_tests/autest-site/ordered_set_queue.py
+++ b/tests/gold_tests/autest-site/ordered_set_queue.py
@@ -20,6 +20,11 @@ Implement an OrderedSetQueue
 
 import collections
 try:
+    collectionsAbc = collections.abc
+except AttributeError:
+    collectionsAbc = collections
+
+try:
     import queue as Queue
 except ImportError:
     import Queue
@@ -30,7 +35,7 @@ except ImportError:
 # https://code.activestate.com/recipes/576694/
 #
 
-class OrderedSet(collections.MutableSet):
+class OrderedSet(collectionsAbc.MutableSet):
 
     def __init__(self, iterable=None):
         self.end = end = []