Adding flake8 lint checker to tox configuration

- Removing uses of bare except: Some handlers are unnecessary (whatever
  is thrown should be)

Author: Graham Higgins

rdflib_sqlalchemy/__init__.py

@@ -44,11 +44,9 @@ def registerplugins():
     from rdflib import plugin
 
     try:
-        x = plugin.get("SQLAlchemy", Store)
-        del x
-        return  # plugins already registered
-    except:
-        pass  # must register plugins
+        plugin.get("SQLAlchemy", Store)
+    except plugin.PluginException:
+        pass
 
     # Register the plugins ...
 

rdflib_sqlalchemy/constants.py

@@ -17,29 +17,29 @@
 INTERNED_PREFIX = "kb_"
 
 TERM_COMBINATIONS = dict([(term, index) for index, term in enumerate([
-     "UUUU", "UUUB", "UUUF", "UUVU", "UUVB", "UUVF", "UUBU", "UUBB", "UUBF",
-     "UULU", "UULB", "UULF", "UUFU", "UUFB", "UUFF",
-     #
-     "UVUU", "UVUB", "UVUF", "UVVU", "UVVB", "UVVF", "UVBU", "UVBB", "UVBF",
-     "UVLU", "UVLB", "UVLF", "UVFU", "UVFB", "UVFF",
-     #
-     "VUUU", "VUUB", "VUUF", "VUVU", "VUVB", "VUVF", "VUBU", "VUBB", "VUBF",
-     "VULU", "VULB", "VULF", "VUFU", "VUFB", "VUFF",
-     #
-     "VVUU", "VVUB", "VVUF", "VVVU", "VVVB", "VVVF", "VVBU", "VVBB", "VVBF",
-     "VVLU", "VVLB", "VVLF", "VVFU", "VVFB", "VVFF",
-     #
-     "BUUU", "BUUB", "BUUF", "BUVU", "BUVB", "BUVF", "BUBU", "BUBB", "BUBF",
-     "BULU", "BULB", "BULF", "BUFU", "BUFB", "BUFF",
-     #
-     "BVUU", "BVUB", "BVUF", "BVVU", "BVVB", "BVVF", "BVBU", "BVBB", "BVBF",
-     "BVLU", "BVLB", "BVLF", "BVFU", "BVFB", "BVFF",
-     #
-     "FUUU", "FUUB", "FUUF", "FUVU", "FUVB", "FUVF", "FUBU", "FUBB", "FUBF",
-     "FULU", "FULB", "FULF", "FUFU", "FUFB", "FUFF",
-     #
-     "FVUU", "FVUB", "FVUF", "FVVU", "FVVB", "FVVF", "FVBU", "FVBB", "FVBF",
-     "FVLU", "FVLB", "FVLF", "FVFU", "FVFB", "FVFF",
+    "UUUU", "UUUB", "UUUF", "UUVU", "UUVB", "UUVF", "UUBU", "UUBB", "UUBF",
+    "UULU", "UULB", "UULF", "UUFU", "UUFB", "UUFF",
+    #
+    "UVUU", "UVUB", "UVUF", "UVVU", "UVVB", "UVVF", "UVBU", "UVBB", "UVBF",
+    "UVLU", "UVLB", "UVLF", "UVFU", "UVFB", "UVFF",
+    #
+    "VUUU", "VUUB", "VUUF", "VUVU", "VUVB", "VUVF", "VUBU", "VUBB", "VUBF",
+    "VULU", "VULB", "VULF", "VUFU", "VUFB", "VUFF",
+    #
+    "VVUU", "VVUB", "VVUF", "VVVU", "VVVB", "VVVF", "VVBU", "VVBB", "VVBF",
+    "VVLU", "VVLB", "VVLF", "VVFU", "VVFB", "VVFF",
+    #
+    "BUUU", "BUUB", "BUUF", "BUVU", "BUVB", "BUVF", "BUBU", "BUBB", "BUBF",
+    "BULU", "BULB", "BULF", "BUFU", "BUFB", "BUFF",
+    #
+    "BVUU", "BVUB", "BVUF", "BVVU", "BVVB", "BVVF", "BVBU", "BVBB", "BVBF",
+    "BVLU", "BVLB", "BVLF", "BVFU", "BVFB", "BVFF",
+    #
+    "FUUU", "FUUB", "FUUF", "FUVU", "FUVB", "FUVF", "FUBU", "FUBB", "FUBF",
+    "FULU", "FULB", "FULF", "FUFU", "FUFB", "FUFF",
+    #
+    "FVUU", "FVUB", "FVUF", "FVVU", "FVVB", "FVVF", "FVBU", "FVBB", "FVBF",
+    "FVLU", "FVLB", "FVLF", "FVFU", "FVFB", "FVFF",
 ])])
 
 REVERSE_TERM_COMBINATIONS = dict([

rdflib_sqlalchemy/store.py

@@ -562,9 +562,8 @@ def contexts(self, triple=None):
                 # partition (optionally)
                 selects = []
                 if (not self.STRONGLY_TYPED_TERMS or
-                        isinstance(obj, Literal) or
-                        not obj
-                        or (self.STRONGLY_TYPED_TERMS and isinstance(obj, REGEXTerm))):
+                        isinstance(obj, Literal) or not obj or (
+                            self.STRONGLY_TYPED_TERMS and isinstance(obj, REGEXTerm))):
                     clause = self.build_clause(literal, subject, predicate, obj)
                     selects.append(
                         (literal, clause, ASSERTED_LITERAL_PARTITION))
@@ -674,7 +673,8 @@ def namespace(self, prefix):
                 rt = [rtTuple[0] for rtTuple in res.fetchall()]
                 res.close()
                 return rt and URIRef(rt[0]) or None
-        except:
+        except Exception:
+            _logger.warning('exception in namespace retrieval', exc_info=True)
             return None
 
     def namespaces(self):

rdflib_sqlalchemy/termutils.py

@@ -10,7 +10,6 @@
     REVERSE_TERM_COMBINATIONS,
 )
 
-
 __all__ = ["extract_triple"]
 
 
@@ -148,16 +147,10 @@ def triple_pattern_to_term_combinations(triple):
 
 def type_to_term_combination(member, klass, context):
     """Map a type to a term combination."""
-    try:
-        rt = TERM_COMBINATIONS["%sU%s%s" %
-                               (term_to_letter(member),
-                                term_to_letter(klass),
-                                normalize_graph(context)[-1])]
-        return rt
-    except:
-        raise Exception("Unable to persist" +
-                        "classification triple: %s %s %s %s" %
-                        (member, "rdf:type", klass, context))
+    return TERM_COMBINATIONS["%sU%s%s" %
+                             (term_to_letter(member),
+                              term_to_letter(klass),
+                              normalize_graph(context)[-1])]
 
 
 def statement_to_term_combination(subject, predicate, obj, context):

setup.cfg

@@ -8,3 +8,4 @@ verbosity = 2
 [flake8]
 max-line-length = 120
 max-complexity = 15
+ignore = E722

test/context_case.py

@@ -30,10 +30,7 @@ def setUp(self, uri="sqlite://", storename=None):
 
     def tearDown(self, uri="sqlite://"):
         self.graph.destroy(uri)
-        try:
-            self.graph.close()
-        except:
-            pass
+        self.graph.close()
 
     def get_context(self, identifier):
         assert isinstance(identifier, URIRef) or \

test/graph_case.py

@@ -29,10 +29,7 @@ def setUp(self, uri="sqlite://", storename=None):
 
     def tearDown(self, uri="sqlite://"):
         self.graph.destroy(uri)
-        try:
-            self.graph.close()
-        except:
-            pass
+        self.graph.close()
 
     def addStuff(self):
         tarek = self.tarek
@@ -300,7 +297,6 @@ def testStoreLiteralsXmlQuote(self):
         o = objs[0]
         self.assertEquals(o, (bob, says, imtheone))
 
-
 xmltestdoc = """<?xml version="1.0" encoding="UTF-8"?>
 <rdf:RDF
    xmlns="http://example.org/"

test/test.py

@@ -24,8 +24,8 @@
 def investigate_len_issue():
     store = plugin.get("SQLAlchemy", Store)(
         identifier=URIRef("rdflib_test"),
-        configuration=Literal("sqlite:///%(here)s/development.sqlite" % {
-                                                        "here": os.getcwd()}))
+        configuration=Literal(
+            "sqlite:///%(here)s/development.sqlite" % {"here": os.getcwd()}))
     g0 = Graph("Sleepycat")
     g0.open("/tmp/foo", create=True)
     g1 = Graph(store)

test/test_sqlalchemy.py

@@ -40,10 +40,7 @@ def setUp(self):
 
     def tearDown(self):
         self.graph.destroy(self.dburi)
-        try:
-            self.graph.close()
-        except:
-            pass
+        self.graph.close()
 
     def test_registerplugins(self):
         # I doubt this is quite right for a fresh pip installation,

tox.ini

@@ -13,7 +13,7 @@ deps =
 
 [testenv:lint]
 commands = flake8 rdflib_sqlalchemy test
-deps=
+deps =
     flake8
     flake8-print
 
@@ -30,3 +30,8 @@ deps =
 [tox:travis]
 2.7 = py27, cover, lint
 3.5 = py35, lint
+
+[flake8]
+max-line-length = 120
+max-complexity = 15
+ignore = W504,W503