Merge branch 'master' into key_populate

Author: dimitri-yatsenko

datajoint/dependencies.py

@@ -42,7 +42,8 @@ def topo_sort(graph):
         if (master := extract_master(part)) in graph:
             for edge in graph.in_edges(part):
                 parent = edge[0]
-                if parent != master and extract_master(parent) != master:
+                if master not in (parent, extract_master(parent)):
+                    # if parent is neither master nor part of master
                     graph.add_edge(parent, master)
     sorted_nodes = list(nx.topological_sort(graph))
 

datajoint/diagram.py

@@ -61,8 +61,8 @@ class Diagram(nx.DiGraph):
         draws the diagram using pyplot
 
         diag1 + diag2  - combines the two diagrams.
-        diag1 - diag2  - differente between diagrams
-        diag1 * diag2  - intersction of diagrams
+        diag1 - diag2  - difference between diagrams
+        diag1 * diag2  - intersection of diagrams
         diag + n   - expands n levels of successors
         diag - n   - expands n levels of predecessors
         Thus dj.Diagram(schema.Table)+1-1 defines the diagram of immediate ancestors and descendants of schema.Table
@@ -71,7 +71,7 @@ class Diagram(nx.DiGraph):
         Only those tables that are loaded in the connection object are displayed
         """
 
-        def __init__(self, source=None, context=None):
+        def __init__(self, source, context=None):
 
             if isinstance(source, Diagram):
                 # copy constructor

datajoint/user_tables.py

@@ -257,7 +257,7 @@ class _AliasNode:
 
 
 def _get_tier(table_name):
-    """given the table name, return"""
+    """given the table name, return the use table class."""
     if not table_name.startswith("`"):
         return _AliasNode
     else: