Adding support for 3.8 abstract base classes

meejah · Oct 7, 2019 · 69b462f · 69b462f
1 parent 9f51c23
commit 69b462f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/txtorcon/controller.py b/txtorcon/controller.py
@@ -11,8 +11,11 @@
 import tempfile
 import functools
 from io import StringIO
-from collections import Sequence
 from os.path import dirname, exists
+try:
+    from collections.abc import Sequence
+except ImportError:
+    from collections import Sequence
 
 from twisted.python import log
 from twisted.python.failure import Failure

diff --git a/txtorcon/torconfig.py b/txtorcon/torconfig.py
@@ -10,8 +10,11 @@
 import functools
 import warnings
 from io import StringIO
-from collections import OrderedDict
 from warnings import warn
+try:
+    from collections.abc import OrderedDict
+except ImportError:
+    from collections import OrderedDict
 
 from twisted.python import log
 from twisted.python.compat import nativeString