From 6e544f5afc365b8e0fc8ad7f98c4c27b9daa755d Mon Sep 17 00:00:00 2001 From: Iwan Aucamp Date: Sun, 9 Apr 2023 21:47:26 +0200 Subject: refactor: eliminate unneeded `rdflib.compat` imports (#2336) Compatibility handling for `collections.abc.Mapping` and `collections.abc.MutableMapping` is not needed as RDFLib currently only support Python 3.7 and newer, and those classes are available from `collections.abc` in Python 3.7. --- rdflib/compat.py | 7 ------- rdflib/plugins/sparql/sparql.py | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/rdflib/compat.py b/rdflib/compat.py index cba3a569..1cc4adac 100644 --- a/rdflib/compat.py +++ b/rdflib/compat.py @@ -97,10 +97,3 @@ def decodeUnicodeEscape(escaped: str) -> str: # Most of times, there are no backslashes in strings. return escaped return _turtle_escape_pattern.sub(_turtle_escape_subber, escaped) - - -# Migration to abc in Python 3.8 -try: - from collections.abc import Mapping, MutableMapping -except: - from collections import Mapping, MutableMapping diff --git a/rdflib/plugins/sparql/sparql.py b/rdflib/plugins/sparql/sparql.py index 8f6a002d..0332d4e7 100644 --- a/rdflib/plugins/sparql/sparql.py +++ b/rdflib/plugins/sparql/sparql.py @@ -4,6 +4,7 @@ import collections import datetime import itertools import typing as t +from collections.abc import Mapping, MutableMapping from typing import ( TYPE_CHECKING, Any, @@ -21,7 +22,6 @@ from typing import ( import isodate import rdflib.plugins.sparql -from rdflib.compat import Mapping, MutableMapping from rdflib.graph import ConjunctiveGraph, Graph from rdflib.namespace import NamespaceManager from rdflib.plugins.sparql.parserutils import CompValue -- cgit v1.2.1