From a2037a5341ab142ffc0330cda85331a62ef54330 Mon Sep 17 00:00:00 2001
From: Edgar <Edgar@AnotherFoxGuy.com>
Date: Thu, 20 Oct 2022 20:30:39 +0200
Subject: [PATCH] :bug: Fixed compatibility with python 3.10

---
 autocmake/extract.py     |  2 +-
 autocmake/interpolate.py |  2 +-
 autocmake/parse_rst.py   | 11 +++--------
 update.py                | 34 ++++++++--------------------------
 4 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/autocmake/extract.py b/autocmake/extract.py
index 4595f90..1f9b9a2 100644
--- a/autocmake/extract.py
+++ b/autocmake/extract.py
@@ -1,5 +1,5 @@
 def extract_list(config, section):
-    from collections import Iterable
+    from collections.abc import Iterable
     l = []
     if 'modules' in config:
         for module in config['modules']:
diff --git a/autocmake/interpolate.py b/autocmake/interpolate.py
index 0a95793..515c955 100644
--- a/autocmake/interpolate.py
+++ b/autocmake/interpolate.py
@@ -13,7 +13,7 @@ def test_replace():
 
 
 def interpolate(d, d_map):
-    from collections import Mapping, Iterable
+    from collections.abc import Mapping, Iterable
     from copy import copy
 
     for k, v in d.items():
diff --git a/autocmake/parse_rst.py b/autocmake/parse_rst.py
index a5fede4..3b951b9 100644
--- a/autocmake/parse_rst.py
+++ b/autocmake/parse_rst.py
@@ -1,14 +1,9 @@
 def parse_cmake_module(s_in, overrides={}):
     import sys
-    from collections import Mapping, Iterable, defaultdict
+    from collections.abc import Mapping, Iterable
+    from collections import defaultdict
     from autocmake.parse_yaml import parse_yaml
-
-    # we do not use the nicer sys.version_info.major
-    # for compatibility with Python < 2.7
-    if sys.version_info[0] > 2:
-        from io import StringIO
-    else:
-        from StringIO import StringIO
+    from io import StringIO
 
     parsed_config = defaultdict(lambda: None)
 
diff --git a/update.py b/update.py
index ce64f06..11978e6 100644
--- a/update.py
+++ b/update.py
@@ -1,15 +1,9 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import sys
 
-
-if sys.version_info[0] == 2 and sys.version_info[1] < 7:
-    sys.stderr.write("ERROR: update.py requires at least Python 2.7\n")
-    sys.exit(-1)
-
-
-AUTOCMAKE_GITHUB_URL = 'https://github.com/dev-cafe/autocmake/raw/master/'
+AUTOCMAKE_GITHUB_URL = 'https://github.com/AnotherFoxGuy/autocmake/raw/master/'
 
 
 def licensing_info():
@@ -56,7 +50,7 @@ def fetch_modules(config, relative_path, download_directory):
     Assemble modules which will
     be included in CMakeLists.txt.
     """
-    from collections import Iterable, namedtuple, defaultdict
+    from collections import namedtuple, defaultdict
     from autocmake.extract import extract_list, to_d, to_l
     from autocmake.parse_rst import parse_cmake_module
 
@@ -130,7 +124,6 @@ def fetch_modules(config, relative_path, download_directory):
 def process_yaml(argv):
     from autocmake.parse_yaml import parse_yaml
     from autocmake.generate import gen_cmakelists, gen_setup
-    from autocmake.extract import extract_list
 
     project_root = argv[1]
     if not os.path.isdir(project_root):
@@ -287,22 +280,11 @@ def fetch_url(src, dst):
     """
     Fetch file from URL src and save it to dst.
     """
-    # we do not use the nicer sys.version_info.major
-    # for compatibility with Python < 2.7
-    if sys.version_info[0] > 2:
-        import urllib.request
-
-        class URLopener(urllib.request.FancyURLopener):
-            def http_error_default(self, url, fp, errcode, errmsg, headers):
-                sys.stderr.write("ERROR: could not fetch {0}\n".format(url))
-                sys.exit(-1)
-    else:
-        import urllib
-
-        class URLopener(urllib.FancyURLopener):
-            def http_error_default(self, url, fp, errcode, errmsg, headers):
-                sys.stderr.write("ERROR: could not fetch {0}\n".format(url))
-                sys.exit(-1)
+    import urllib.request
+    class URLopener(urllib.request.FancyURLopener):
+        def http_error_default(self, url, fp, errcode, errmsg, headers):
+            sys.stderr.write("ERROR: could not fetch {0}\n".format(url))
+            sys.exit(-1)
 
     dirname = os.path.dirname(dst)
     if dirname != '':