Merge pull request #782 from eywalker/master

Avoid __ function name

Author: Chris Turner

datajoint/connection.py

@@ -185,7 +185,7 @@ def is_connected(self):
         return True
 
     @staticmethod
-    def __execute_query(cursor, query, args, cursor_class, suppress_warnings):
+    def _execute_query(cursor, query, args, cursor_class, suppress_warnings):
         try:
             with warnings.catch_warnings():
                 if suppress_warnings:
@@ -211,7 +211,7 @@ def query(self, query, args=(), *, as_dict=False, suppress_warnings=True, reconn
         cursor_class = client.cursors.DictCursor if as_dict else client.cursors.Cursor
         cursor = self._conn.cursor(cursor=cursor_class)
         try:
-            self.__execute_query(cursor, query, args, cursor_class, suppress_warnings)
+            self._execute_query(cursor, query, args, cursor_class, suppress_warnings)
         except errors.LostConnectionError:
             if not reconnect:
                 raise
@@ -222,7 +222,7 @@ def query(self, query, args=(), *, as_dict=False, suppress_warnings=True, reconn
                 raise errors.LostConnectionError("Connection was lost during a transaction.") from None
             logger.debug("Re-executing")
             cursor = self._conn.cursor(cursor=cursor_class)
-            self.__execute_query(cursor, query, args, cursor_class, suppress_warnings)
+            self._execute_query(cursor, query, args, cursor_class, suppress_warnings)
         return cursor
 
     def get_user(self):

datajoint/table.py

@@ -535,7 +535,6 @@ def describe(self, context=None, printout=True):
                             parent_name = list(self.connection.dependencies.in_edges(parent_name))[0][0]
                             lst = [(attr, ref) for attr, ref in fk_props['attr_map'].items() if ref != attr]
                             definition += '->{props} {class_name}.proj({proj_list})\n'.format(
-                                attr_list=', '.join(r[0] for r in lst),
                                 props=index_props,
                                 class_name=lookup_class_name(parent_name, context) or parent_name,
                                 proj_list=','.join('{}="{}"'.format(a, b) for a, b in lst))