Merge remote-tracking branch 'upstream/master' into test-reorg

3 files changed, 11 insertions, 21 deletions

diff --git a/test/test_conjunctivegraph/test_conjunctive_graph.py b/test/test_conjunctivegraph/test_conjunctive_graph.py
index 0cbe0077..67078e5f 100644
--- a/test/test_conjunctivegraph/test_conjunctive_graph.py
+++ b/test/test_conjunctivegraph/test_conjunctive_graph.py
@@ -2,13 +2,13 @@
 Tests for ConjunctiveGraph that do not depend on the underlying store
 """
 
+from os import path
+
 import pytest
 
 from rdflib import ConjunctiveGraph, Graph
-from rdflib.term import Identifier, URIRef, BNode
 from rdflib.parser import StringInputSource
-from os import path
-
+from rdflib.term import BNode, Identifier, URIRef
 
 DATA = """
 <http://example.org/record/1> a <http://xmlns.com/foaf/0.1/Document> .
diff --git a/test/test_conjunctivegraph/test_conjunctivegraph_generators.py b/test/test_conjunctivegraph/test_conjunctivegraph_generators.py
index e962ab7a..853320dd 100644
--- a/test/test_conjunctivegraph/test_conjunctivegraph_generators.py
+++ b/test/test_conjunctivegraph/test_conjunctivegraph_generators.py
@@ -1,7 +1,8 @@
 import os
-from rdflib import ConjunctiveGraph, URIRef
 from test.data import TEST_DATA_DIR
 
+from rdflib import ConjunctiveGraph, URIRef
+
 timblcardn3 = open(os.path.join(TEST_DATA_DIR, "timbl-card.n3")).read()
 
 
diff --git a/test/test_conjunctivegraph/test_conjunctivegraph_operator_combinations.py b/test/test_conjunctivegraph/test_conjunctivegraph_operator_combinations.py
index f277621a..9cd49abe 100644
--- a/test/test_conjunctivegraph/test_conjunctivegraph_operator_combinations.py
+++ b/test/test_conjunctivegraph/test_conjunctivegraph_operator_combinations.py
@@ -1,21 +1,10 @@
 import os
-from rdflib import (
-    Graph,
-    ConjunctiveGraph,
-    URIRef,
-)
-from test.data import (
-    TEST_DATA_DIR,
-    michel,
-    tarek,
-    bob,
-    likes,
-    hates,
-    pizza,
-    cheese,
-    context1 as c1,
-    context2 as c2,
-)
+from test.data import TEST_DATA_DIR, bob, cheese
+from test.data import context1 as c1
+from test.data import context2 as c2
+from test.data import hates, likes, michel, pizza, tarek
+
+from rdflib import ConjunctiveGraph, Graph, URIRef
 
 sportquadstrig = open(os.path.join(TEST_DATA_DIR, "sportquads.trig")).read()