Merge remote-tracking branch 'upstream/master' into default_prefixes

admin/get_merged_prs.py

@@ -1,9 +1,9 @@
 """Get all merged PRs since last release, save them to a JSON file"""
 
-import httpx
 import json
 from datetime import datetime
 
+import httpx
 
 r = httpx.get(
     "https://api.github.com/repos/rdflib/rdflib/pulls",

docs/conf.py

@@ -11,9 +11,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
 import re
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

rdflib/__init__.py

@@ -86,8 +86,8 @@
     "util",
 ]
 
-import sys
 import logging
+import sys
 
 logger = logging.getLogger(__name__)
 
@@ -157,13 +157,8 @@
 Literal work, eq, __neq__, __lt__, etc.
 """
 
-from rdflib.term import URIRef, BNode, IdentifiedNode, Literal, Variable
-
-from rdflib.graph import Dataset, Graph, ConjunctiveGraph
-
-from rdflib import plugin
-from rdflib import query
-
+from rdflib import plugin, query
+from rdflib.graph import ConjunctiveGraph, Dataset, Graph
 from rdflib.namespace import (
     BRICK,
     CSVW,
@@ -193,11 +188,11 @@
     XSD,
     Namespace,
 )
+from rdflib.term import BNode, IdentifiedNode, Literal, URIRef, Variable
 
 # tedious sop to flake8
 assert plugin
 assert query
 
 from rdflib import util
-
 from rdflib.container import *

rdflib/collection.py

@@ -1,7 +1,5 @@
 from rdflib.namespace import RDF
-from rdflib.term import BNode
-from rdflib.term import Literal
-
+from rdflib.term import BNode, Literal
 
 __all__ = ["Collection"]
 

rdflib/compare.py

@@ -73,10 +73,7 @@
     _:cb558f30e21ddfc05ca53108348338ade8
         <http://example.org/ns#label> "B" .
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
+from __future__ import absolute_import, division, print_function
 
 # TODO:
 # - Doesn't handle quads.
@@ -92,24 +89,24 @@
     "similar",
 ]
 
-from rdflib.graph import Graph, ConjunctiveGraph, ReadOnlyGraphAggregate
-from rdflib.term import BNode, Node, URIRef, IdentifiedNode
-from hashlib import sha256
-
-from datetime import datetime
 from collections import defaultdict
+from datetime import datetime
+from hashlib import sha256
 from typing import (
-    Set,
-    Dict,
     TYPE_CHECKING,
-    Union,
-    List,
-    Tuple,
     Callable,
-    Optional,
+    Dict,
     Iterator,
+    List,
+    Optional,
+    Set,
+    Tuple,
+    Union,
 )
 
+from rdflib.graph import ConjunctiveGraph, Graph, ReadOnlyGraphAggregate
+from rdflib.term import BNode, IdentifiedNode, Node, URIRef
+
 if TYPE_CHECKING:
     from _hashlib import HASH
 

rdflib/compat.py

@@ -3,12 +3,11 @@
 and different versions of support libraries.
 """
 
-import re
 import codecs
+import re
 import warnings
 from typing import TYPE_CHECKING, Match
 
-
 if TYPE_CHECKING:
     import xml.etree.ElementTree as etree
 else:

rdflib/container.py

@@ -1,6 +1,7 @@
+from random import randint
+
 from rdflib.namespace import RDF
 from rdflib.term import BNode, URIRef
-from random import randint
 
 __all__ = ["Container", "Bag", "Seq", "Alt", "NoElementException"]
 

rdflib/extras/cmdlineutils.py

@@ -1,9 +1,9 @@
+import codecs
+import getopt
 import sys
 import time
-import getopt
-import rdflib
-import codecs
 
+import rdflib
 from rdflib.util import guess_format
 
 

rdflib/graph.py

@@ -1,42 +1,40 @@
+import logging
+import os
+import pathlib
+import random
+import shutil
+import tempfile
+from io import BytesIO
 from typing import (
     IO,
     Any,
     BinaryIO,
+    Generator,
     Iterable,
     Optional,
     TextIO,
-    Union,
+    Tuple,
     Type,
+    Union,
     cast,
     overload,
-    Generator,
-    Tuple,
 )
-import logging
+from urllib.parse import urlparse
+from urllib.request import url2pathname
 from warnings import warn
-import random
-from rdflib.namespace import Namespace, RDF
-from rdflib import plugin, exceptions, query, namespace
+
 import rdflib.term
-from rdflib.term import BNode, IdentifiedNode, Node, URIRef, Literal, Genid
-from rdflib.paths import Path
-from rdflib.store import Store
-from rdflib.serializer import Serializer
-from rdflib.parser import InputSource, Parser, create_input_source
-from rdflib.namespace import NamespaceManager
-from rdflib.resource import Resource
-from rdflib.collection import Collection
 import rdflib.util  # avoid circular dependency
+from rdflib import exceptions, namespace, plugin, query
+from rdflib.collection import Collection
 from rdflib.exceptions import ParserError
-
-import os
-import shutil
-import tempfile
-import pathlib
-
-from io import BytesIO
-from urllib.parse import urlparse
-from urllib.request import url2pathname
+from rdflib.namespace import RDF, Namespace, NamespaceManager
+from rdflib.parser import InputSource, Parser, create_input_source
+from rdflib.paths import Path
+from rdflib.resource import Resource
+from rdflib.serializer import Serializer
+from rdflib.store import Store
+from rdflib.term import BNode, Genid, IdentifiedNode, Literal, Node, URIRef
 
 assert Literal  # avoid warning
 assert Namespace  # avoid warning

rdflib/namespace/_BRICK.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class BRICK(DefinedNamespace):

rdflib/namespace/_CSVW.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class CSVW(DefinedNamespace):

rdflib/namespace/_DC.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class DC(DefinedNamespace):

rdflib/namespace/_DCAM.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class DCAM(DefinedNamespace):

rdflib/namespace/_DCAT.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class DCAT(DefinedNamespace):

rdflib/namespace/_DCMITYPE.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class DCMITYPE(DefinedNamespace):

rdflib/namespace/_DCTERMS.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class DCTERMS(DefinedNamespace):

rdflib/namespace/_DOAP.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class DOAP(DefinedNamespace):

rdflib/namespace/_FOAF.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class FOAF(DefinedNamespace):

rdflib/namespace/_GEO.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class GEO(DefinedNamespace):

rdflib/namespace/_ODRL2.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class ODRL2(DefinedNamespace):

rdflib/namespace/_ORG.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class ORG(DefinedNamespace):

rdflib/namespace/_OWL.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class OWL(DefinedNamespace):

rdflib/namespace/_PROF.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class PROF(DefinedNamespace):

rdflib/namespace/_PROV.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class PROV(DefinedNamespace):

rdflib/namespace/_QB.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class QB(DefinedNamespace):

rdflib/namespace/_RDF.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class RDF(DefinedNamespace):

rdflib/namespace/_RDFS.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class RDFS(DefinedNamespace):

rdflib/namespace/_SDO.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class SDO(DefinedNamespace):

rdflib/namespace/_SH.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class SH(DefinedNamespace):

rdflib/namespace/_SKOS.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class SKOS(DefinedNamespace):

rdflib/namespace/_SOSA.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class SOSA(DefinedNamespace):

rdflib/namespace/_SSN.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class SSN(DefinedNamespace):

rdflib/namespace/_TIME.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class TIME(DefinedNamespace):

rdflib/namespace/_VANN.py

@@ -1,5 +1,5 @@
-from rdflib.term import URIRef
 from rdflib.namespace import DefinedNamespace, Namespace
+from rdflib.term import URIRef
 
 
 class VANN(DefinedNamespace):