cleanup

Author: dimitri-yatsenko

datajoint/table.py

@@ -19,7 +19,7 @@
 logger = logging.getLogger(__name__)
 
 
-class _rename_map(tuple):
+class _RenameMap(tuple):
     """ for internal use """
     pass
 
@@ -375,7 +375,7 @@ def delete(self, verbose=True):
         graph = conn.dependencies
         graph.load()
         delete_list = collections.OrderedDict(
-            (name, _rename_map(next(iter(graph.parents(name).items()))) if name.isdigit() else FreeTable(conn, name))
+            (name, _RenameMap(next(iter(graph.parents(name).items()))) if name.isdigit() else FreeTable(conn, name))
             for name in graph.descendants(self.full_table_name))
 
         # construct restrictions for each relation
@@ -405,7 +405,7 @@ def delete(self, verbose=True):
                 table.restrict([
                     r.proj() if isinstance(r, FreeTable) else (
                         delete_list[r[0]].proj(**{a: b for a, b in r[1]['attr_map'].items()})
-                        if isinstance(r, _rename_map) else r)
+                        if isinstance(r, _RenameMap) else r)
                     for r in restrictions[name]])
         if safe:
             print('About to delete:')

tests/schema.py

@@ -5,7 +5,7 @@
 import random
 import numpy as np
 import datajoint as dj
-import os, signal
+import inspect
 from . import PREFIX, CONN_INFO
 
 schema = dj.schema(PREFIX + '_test1', connection=dj.conn(**CONN_INFO))
@@ -278,35 +278,26 @@ def make(self, key):
 
 
 @schema
-class DjExceptionNames(dj.Lookup):
+class DjExceptionName(dj.Lookup):
     definition = """
     dj_exception_name:    char(64)
     """
+
     @property
     def contents(self):
-        ret = []
-        for e in dir(dj.errors):
-            ea = getattr(dj.errors, e) 
-            if callable(ea):
-                try:
-                    werks = (isinstance(ea, type(Exception))
-                             and isinstance(ea(), Exception))
-                except TypeError as te:
-                    pass
-                if werks:
-                    ret.append((e,))
-        return ret
+        return [[member_name] for member_name, member_type in inspect.getmembers(dj.errors)
+                if inspect.isclass(member_type) and issubclass(member_type, Exception)]
 
 
 @schema
-class ErrorClassTable(dj.Computed):
+class ErrorClass(dj.Computed):
     definition = """
-    -> DjExceptionNames
+    -> DjExceptionName
     """
-    def make(self, key):
-        ename = key['dj_exception_name']
-        raise getattr(dj.errors, ename)(ename)
 
+    def make(self, key):
+        exception_name = key['dj_exception_name']
+        raise getattr(dj.errors, exception_name)
 
 
 @schema

tests/test_alter.py

@@ -39,4 +39,5 @@ def test_alter():
     Experiment().alter(prompt=False)
     restored = schema.connection.query("SHOW CREATE TABLE " + Experiment.full_table_name).fetchone()[1]
     assert_equal(original, restored)
-    assert_not_equal(original, altered)
+    assert_not_equal(original, altered)
+

tests/test_jobs.py

@@ -1,4 +1,3 @@
-from decimal import Decimal
 from nose.tools import assert_true, assert_false, assert_equals
 from . import schema
 from datajoint.jobs import ERROR_MESSAGE_LENGTH, TRUNCATION_APPENDIX
@@ -46,6 +45,7 @@ def test_reserve_job():
     assert_false(schema.schema.jobs,
                  'failed to clear error jobs')
 
+
 def test_restrictions():
     # clear out jobs table
     jobs = schema.schema.jobs
@@ -62,6 +62,7 @@ def test_restrictions():
                 'There should be only one entries with error status in table a')
     jobs.delete()
 
+
 def test_sigint():
     # clear out job table
     schema.schema.jobs.delete()
@@ -75,6 +76,7 @@ def test_sigint():
     assert_equals(error_message, 'KeyboardInterrupt')
     schema.schema.jobs.delete()
 
+
 def test_sigterm():
     # clear out job table
     schema.schema.jobs.delete()
@@ -90,14 +92,13 @@ def test_sigterm():
 
 
 def test_suppress_dj_errors():
-    ''' test_suppress_dj_errors: dj errors suppressable w/o native py blobs'''
+    """ test_suppress_dj_errors: dj errors suppressable w/o native py blobs """
     schema.schema.jobs.delete()
     with dj.config(enable_python_native_blobs=False):
-        schema.ErrorClassTable().populate(
-            reserve_jobs=True, suppress_errors=True)
-
-        assert len(schema.DjExceptionNames()) == len(schema.DjExceptionNames
-                                                     & schema.schema.jobs)
+        schema.ErrorClass.populate(reserve_jobs=True, suppress_errors=True)
+    number_of_exceptions = len(schema.DjExceptionName())
+    assert_true(number_of_exceptions > 0)
+    assert_equals(number_of_exceptions, len(schema.schema.jobs))
 
 
 def test_long_error_message():