db_op, rz_server, db_controller: misc

3 files changed, 10 insertions, 9 deletions

diff --git a/src/server/db_controller.py b/src/server/db_controller.py
index e49633e5..b627699d 100644
--- a/src/server/db_controller.py
+++ b/src/server/db_controller.py
@@ -41,7 +41,7 @@ class DB_Controller:
             self.db_driver.commit_tx(op)
 
             op_ret = op.process_result_set()
-            log.debug('exec_op:' + op.name + ': return value: ' + unicode(op_ret)[:256])  # trim verbose return values
+            log.debug('exec_op: ' + op.name + ': return value: ' + unicode(op_ret)[:256])  # trim verbose return values
             return op_ret
 
         except Neo4JException as e:
diff --git a/src/server/db_op.py b/src/server/db_op.py
index adcac378..a472f39a 100644
--- a/src/server/db_op.py
+++ b/src/server/db_op.py
@@ -2,19 +2,20 @@ from copy import deepcopy
 import gzip
 import hashlib
 import json
+import logging
 import re
 
 import StringIO as sio
 from model.graph import Attr_Diff
 from model.graph import Topo_Diff
 from model.model import Link, RZDoc
+from neo4j_cypher import DB_Query, DB_result_set
+import neo4j_schema
+from neo4j_util import cfmt
 from neo4j_util import generate_random_id__uuid, rzdoc__ns_label, \
     quote__singlequote, rzdoc__meta_ns_label, quote__backtick
-from neo4j_util import cfmt
 import neo4j_util as db_util
-import logging
-from neo4j_cypher import DB_Query, DB_result_set
-import neo4j_schema
+
 
 log = logging.getLogger('rhizi')
 
@@ -34,7 +35,7 @@ class DB_op(object):
             yield dbq
 
     def __repr__(self):
-        return '%s: tx-id: %s' % (self.__class__.__name__, str(self.tx_id)) # id may be null if Tx open failed
+        return '%s: tx-id: %s' % (self.__class__.__name__, str(self.tx_id))  # id may be null if Tx open failed
 
     def iter__r_set(self):
         """
@@ -831,7 +832,7 @@ class DBO_rzdoc__lookup_by_name(DB_op):
 
     def __init__(self, rzdoc_name):
         """
-        @return: [rzdoc] of [] if no doc with the given name was found
+        @return: [rzdoc] or [] if no doc with the given name was found
         """
         super(DBO_rzdoc__lookup_by_name, self).__init__()
 
@@ -855,7 +856,7 @@ class DBO_rzdoc__rename(DB_op):
 
     def __init__(self, rzdoc_cur_name, rzdoc_new_name):
         """
-        @return: [rzdoc] of [] if no doc with the given name was found
+        @return: [rzdoc] or [] if no doc with the given name was found
         """
         super(DBO_rzdoc__rename, self).__init__()
 
diff --git a/src/server/rz_server.py b/src/server/rz_server.py
index fb276306..5068834c 100644
--- a/src/server/rz_server.py
+++ b/src/server/rz_server.py
@@ -302,7 +302,7 @@ def init_rest_interface(cfg, flask_webapp):
                       rest_entry('/signup', rz_user.rest__user_signup, {'methods': ['GET', 'POST']}),
 
                       # doc endpoints
-                      rest_entry('/rz/<path:rzdoc_name>', rz_api_rest.rzdoc__via_rz_url, {'methods': ['GET']}), # pretty URLs
+                      rest_entry('/rz/<path:rzdoc_name>', rz_api_rest.rzdoc__via_rz_url, {'methods': ['GET']}),  # pretty URLs
                       rest_entry('/graph/clone', rz_api_rest.rzdoc_clone),
                       rest_entry('/rzdoc/list', rz_api_rest.rzdoc__list),
                       rest_entry('/rzdoc/<path:rzdoc_name>/create', rz_api_rest.rzdoc__create),