Fix commit 2615

Bugs corrections with cancelling tabulations and misplaced backslashes.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2616 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/master/handlers/election.py

@@ -18,7 +18,7 @@
 import neo.lib
 
 from neo.lib.protocol import NodeTypes, Packets
-from neo.lib.protocol import NotReadyError, ProtocolError,
+from neo.lib.protocol import NotReadyError, ProtocolError, \
                               UnexpectedPacketError
 from neo.lib.protocol import BrokenNodeDisallowedError
 from neo.master.handlers import MasterHandler

neo/master/handlers/identification.py

@@ -25,8 +25,8 @@ class IdentificationHandler(MasterHandler):
     """This class deals with messages from the admin node only"""
 
     def nodeLost(self, conn, node):
-        neo.lib.logging.warning('
-                        lost a node in IdentificationHandler : %s' % node)
+        neo.lib.logging.warning(
+            'lost a node in IdentificationHandler : %s' % node)
 
     def requestIdentification(self, conn, node_type, uuid, address, name):
 

neo/scripts/runner.py

@@ -100,7 +100,7 @@ LOG_FILE = 'neo.log'
 
 # override logging configuration to send all messages to a file
 for logger_name in ('NEO', 'CLIENT'):
-    neo.setupLog(logger_name, filename=LOG_FILE)
+    neo.lib.setupLog(logger_name, filename=LOG_FILE)
 
 class NeoTestRunner(unittest.TestResult):
     """ Custom result class to build report with statistics per module """

neo/tests/storage/testIdentificationHandler.py

@@ -18,7 +18,7 @@
 import unittest
 from mock import Mock
 from neo.tests import NeoUnitTestBase
-from neo.lib.protocol import NodeTypes, NotReadyError, 
+from neo.lib.protocol import NodeTypes, NotReadyError, \
         BrokenNodeDisallowedError
 from neo.lib.pt import PartitionTable
 from neo.storage.app import Application

neo/tests/testNodes.py

@@ -19,7 +19,7 @@ import unittest
 from mock import Mock
 from neo.lib import protocol
 from neo.lib.protocol import NodeTypes, NodeStates
-from neo.lib.node import Node, MasterNode, StorageNode,
+from neo.lib.node import Node, MasterNode, StorageNode, \
     ClientNode, AdminNode, NodeManager
 from neo.tests import NeoUnitTestBase
 from time import time

neo/tests/zodb/__init__.py

@@ -43,7 +43,7 @@ class ZODBTestCase(NEOFunctionalTest):
         self._storage.cleanup()
         self.neo.stop()
         # Deconfigure client logger
-        neo.setupLog('CLIENT')
+        neo.lib.setupLog('CLIENT')
         NEOFunctionalTest.tearDown(self)
 
     def open(self, read_only=False):