more Flak8 improvements

7 files changed, 26 insertions, 22 deletions

diff --git a/rdflib/plugins/parsers/hext.py b/rdflib/plugins/parsers/hext.py
index d30641ca..b61fc0e4 100644
--- a/rdflib/plugins/parsers/hext.py
+++ b/rdflib/plugins/parsers/hext.py
@@ -5,7 +5,7 @@ handle contexts, i.e. multiple graphs.
 """
 import json
 
-from typing import List, Optional
+from typing import List, Union
 from rdflib.parser import Parser
 from rdflib import ConjunctiveGraph, URIRef, Literal, BNode
 import warnings
@@ -26,7 +26,7 @@ class HextuplesParser(Parser):
     def _load_json_line(self, line: str):
         return [x if x != "" else None for x in json.loads(line)]
 
-    def _parse_hextuple(self, cg: ConjunctiveGraph, tup: List[Optional[str, None]]):
+    def _parse_hextuple(self, cg: ConjunctiveGraph, tup: List[Union[str, None]]):
         # 1 - subject
         if tup[0].startswith("_"):
             s = BNode(value=tup[0].replace("_:", ""))
diff --git a/rdflib/plugins/serializers/nquads.py b/rdflib/plugins/serializers/nquads.py
index 79479cef..ce2d2f7c 100644
--- a/rdflib/plugins/serializers/nquads.py
+++ b/rdflib/plugins/serializers/nquads.py
@@ -30,7 +30,10 @@ class NQuadsSerializer(Serializer):
         if base is not None:
             warnings.warn("NQuadsSerializer does not support base.")
         if encoding is not None and encoding.lower() != self.encoding.lower():
-            warnings.warn("NQuadsSerializer does not use custom encoding.")
+            warnings.warn(
+                "NQuadsSerializer does not use custom encoding."
+                + "Given encoding was: %s" % encoding
+            )
         encoding = self.encoding
         for context in self.store.contexts():
             for triple in context:
diff --git a/rdflib/plugins/serializers/nt.py b/rdflib/plugins/serializers/nt.py
index 34ecc959..7862528d 100644
--- a/rdflib/plugins/serializers/nt.py
+++ b/rdflib/plugins/serializers/nt.py
@@ -33,7 +33,10 @@ class NTSerializer(Serializer):
         if base is not None:
             warnings.warn("NTSerializer does not support base.")
         if encoding != "utf-8":
-            warnings.warn("NTSerializer always uses UTF-8 encoding.")
+            warnings.warn(
+                "NTSerializer always uses UTF-8 encoding."
+                + "Given encoding was: %s" % encoding
+            )
 
         for triple in self.store:
             stream.write(_nt_row(triple).encode())
diff --git a/test/test_prefixTypes.py b/test/test_prefixTypes.py
index 045c6056..57408d4f 100644
--- a/test/test_prefixTypes.py
+++ b/test/test_prefixTypes.py
@@ -25,10 +25,9 @@ class PrefixTypesTest(unittest.TestCase):
     """
 
     def test(self):
-        s = graph.serialize(format="n3", encoding="latin-1")
-        print(s)
-        self.assertTrue(b"foaf:Document" in s)
-        self.assertTrue(b"xsd:date" in s)
+        s = graph.serialize(format="n3")
+        self.assertTrue("foaf:Document" in s)
+        self.assertTrue("xsd:date" in s)
 
 
 if __name__ == "__main__":
diff --git a/test/test_preflabel.py b/test/test_preflabel.py
index 77ecbcd3..39057d48 100644
--- a/test/test_preflabel.py
+++ b/test/test_preflabel.py
@@ -10,9 +10,9 @@ from rdflib import URIRef
 class TestPrefLabel(unittest.TestCase):
     def setUp(self):
         self.g = ConjunctiveGraph()
-        self.u = URIRef("http://example.com/foo")
-        self.g.add([self.u, RDFS.label, Literal("foo")])
-        self.g.add([self.u, RDFS.label, Literal("bar")])
+        self.u = URIRef("https://example.com/foo")
+        self.g.add((self.u, RDFS.label, Literal("foo")))
+        self.g.add((self.u, RDFS.label, Literal("bar")))
 
     def test_default_label_sorting(self):
         res = sorted(self.g.preferredLabel(self.u))
@@ -29,7 +29,7 @@ class TestPrefLabel(unittest.TestCase):
         self.assertEqual(res, tgt)
 
     def test_default_preflabel_sorting(self):
-        self.g.add([self.u, SKOS.prefLabel, Literal("bla")])
+        self.g.add((self.u, SKOS.prefLabel, Literal("bla")))
         res = self.g.preferredLabel(self.u)
         tgt = [
             (
@@ -40,8 +40,8 @@ class TestPrefLabel(unittest.TestCase):
         self.assertEqual(res, tgt)
 
     def test_preflabel_lang_sorting_no_lang_attr(self):
-        self.g.add([self.u, SKOS.prefLabel, Literal("bla")])
-        self.g.add([self.u, SKOS.prefLabel, Literal("blubb", lang="en")])
+        self.g.add((self.u, SKOS.prefLabel, Literal("bla")))
+        self.g.add((self.u, SKOS.prefLabel, Literal("blubb", lang="en")))
         res = sorted(self.g.preferredLabel(self.u))
         tgt = [
             (
@@ -57,8 +57,8 @@ class TestPrefLabel(unittest.TestCase):
         self.assertEqual(res, tgt)
 
     def test_preflabel_lang_sorting_empty_lang_attr(self):
-        self.g.add([self.u, SKOS.prefLabel, Literal("bla")])
-        self.g.add([self.u, SKOS.prefLabel, Literal("blubb", lang="en")])
+        self.g.add((self.u, SKOS.prefLabel, Literal("bla")))
+        self.g.add((self.u, SKOS.prefLabel, Literal("blubb", lang="en")))
         res = self.g.preferredLabel(self.u, lang="")
         tgt = [
             (
@@ -69,7 +69,7 @@ class TestPrefLabel(unittest.TestCase):
         self.assertEqual(res, tgt)
 
     def test_preflabel_lang_sorting_en_lang_attr(self):
-        self.g.add([self.u, SKOS.prefLabel, Literal("blubb", lang="en")])
+        self.g.add((self.u, SKOS.prefLabel, Literal("blubb", lang="en")))
         res = self.g.preferredLabel(self.u, lang="en")
         tgt = [
             (
diff --git a/test/test_swap_n3.py b/test/test_swap_n3.py
index 1734806c..c0b596cd 100644
--- a/test/test_swap_n3.py
+++ b/test/test_swap_n3.py
@@ -1,6 +1,5 @@
 import os
 import sys
-import unittest
 
 import pytest
 
diff --git a/test/test_term.py b/test/test_term.py
index e154bd4e..0f9dbea2 100644
--- a/test/test_term.py
+++ b/test/test_term.py
@@ -74,16 +74,16 @@ class TestLiteral(unittest.TestCase):
             sorted(literals)
             orderable = True
         except TypeError as e:
-            for l in literals:
-                print(repr(l), repr(l.value))
+            for l_ in literals:
+                print(repr(l_), repr(l_.value))
             print(e)
             orderable = False
         self.assertTrue(orderable)
 
         # also make sure that within a datetime things are still ordered:
         l1 = [
-            Literal(l, datatype=XSD.dateTime)
-            for l in [
+            Literal(l_, datatype=XSD.dateTime)
+            for l_ in [
                 "2001-01-01T00:00:00",
                 "2001-01-01T01:00:00",
                 "2001-01-01T01:00:01",