[Neo-report] r1839 gregory - in /trunk/neo: ./ admin/ master/ master/handlers/ storage/han...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Feb 23 16:58:24 CET 2010
Author: gregory
Date: Tue Feb 23 16:58:23 2010
New Revision: 1839
Log:
Remove unused imports.
Modified:
trunk/neo/admin/app.py
trunk/neo/event.py
trunk/neo/master/handlers/election.py
trunk/neo/master/handlers/secondary.py
trunk/neo/master/verification.py
trunk/neo/storage/handlers/hidden.py
trunk/neo/storage/handlers/master.py
trunk/neo/tests/functional/testClient.py
trunk/neo/tests/master/testClientHandler.py
trunk/neo/tests/master/testElectionHandler.py
trunk/neo/tests/master/testRecovery.py
trunk/neo/tests/master/testStorageHandler.py
trunk/neo/tests/master/testVerification.py
trunk/neo/tests/storage/testClientHandler.py
trunk/neo/tests/storage/testInitializationHandler.py
trunk/neo/tests/storage/testMasterHandler.py
trunk/neo/tests/storage/testStorageHandler.py
trunk/neo/tests/storage/testVerificationHandler.py
trunk/neo/tests/testProtocol.py
Modified: trunk/neo/admin/app.py
==============================================================================
--- trunk/neo/admin/app.py [iso-8859-1] (original)
+++ trunk/neo/admin/app.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -26,7 +26,6 @@
from neo.connector import getConnectorHandler
from neo.bootstrap import BootstrapManager
from neo.pt import PartitionTable
-from neo import protocol
from neo.protocol import NodeTypes, NodeStates, Packets, Errors
class Dispatcher:
Modified: trunk/neo/event.py
==============================================================================
--- trunk/neo/event.py [iso-8859-1] (original)
+++ trunk/neo/event.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -16,7 +16,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from neo import logging
-from select import select
from time import time
from neo.epoll import Epoll
Modified: trunk/neo/master/handlers/election.py
==============================================================================
--- trunk/neo/master/handlers/election.py [iso-8859-1] (original)
+++ trunk/neo/master/handlers/election.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -18,7 +18,7 @@
from neo import logging
from neo import protocol
-from neo.protocol import NodeTypes, NodeStates, Packets
+from neo.protocol import NodeTypes, Packets
from neo.master.handlers import MasterHandler
from neo.exception import ElectionFailure
from neo.util import dump
Modified: trunk/neo/master/handlers/secondary.py
==============================================================================
--- trunk/neo/master/handlers/secondary.py [iso-8859-1] (original)
+++ trunk/neo/master/handlers/secondary.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -15,11 +15,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-from neo import logging
-
from neo.master.handlers import MasterHandler
from neo.exception import ElectionFailure, PrimaryFailure
-from neo import protocol
from neo.protocol import NodeTypes, Packets
class SecondaryMasterHandler(MasterHandler):
Modified: trunk/neo/master/verification.py
==============================================================================
--- trunk/neo/master/verification.py [iso-8859-1] (original)
+++ trunk/neo/master/verification.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -17,7 +17,7 @@
from neo import logging
from neo.util import dump
-from neo.protocol import ClusterStates, Packets, NodeTypes, NodeStates
+from neo.protocol import ClusterStates, Packets, NodeStates
from neo.master.handlers import BaseServiceHandler
Modified: trunk/neo/storage/handlers/hidden.py
==============================================================================
--- trunk/neo/storage/handlers/hidden.py [iso-8859-1] (original)
+++ trunk/neo/storage/handlers/hidden.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -18,7 +18,7 @@
from neo import logging
from neo.storage.handlers import BaseMasterHandler
-from neo.protocol import NodeTypes, NodeStates, CellStates
+from neo.protocol import CellStates
class HiddenHandler(BaseMasterHandler):
"""This class implements a generic part of the event handlers."""
Modified: trunk/neo/storage/handlers/master.py
==============================================================================
--- trunk/neo/storage/handlers/master.py [iso-8859-1] (original)
+++ trunk/neo/storage/handlers/master.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -19,7 +19,6 @@
from neo.protocol import CellStates, Packets, ProtocolError
from neo.storage.handlers import BaseMasterHandler
-from neo.exception import OperationFailure
class MasterOperationHandler(BaseMasterHandler):
Modified: trunk/neo/tests/functional/testClient.py
==============================================================================
--- trunk/neo/tests/functional/testClient.py [iso-8859-1] (original)
+++ trunk/neo/tests/functional/testClient.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -22,7 +22,6 @@
from Persistence import Persistent
from neo.tests.functional import NEOCluster, NEOFunctionalTest
-from neo.protocol import ClusterStates, NodeStates
# simple persitent object with conflict resolution
Modified: trunk/neo/tests/master/testClientHandler.py
==============================================================================
--- trunk/neo/tests/master/testClientHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/master/testClientHandler.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -19,7 +19,7 @@
from mock import Mock
from struct import pack, unpack
from neo.tests import NeoTestBase
-from neo.protocol import Packets, NodeTypes, NodeStates
+from neo.protocol import NodeTypes, NodeStates
from neo.master.handlers.client import ClientServiceHandler
from neo.master.app import Application
Modified: trunk/neo/tests/master/testElectionHandler.py
==============================================================================
--- trunk/neo/tests/master/testElectionHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/master/testElectionHandler.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -19,11 +19,10 @@
from mock import Mock
from neo import protocol
from neo.tests import NeoTestBase
-from neo.protocol import Packet, Packets, NodeTypes, NodeStates, INVALID_UUID
+from neo.protocol import Packet, NodeTypes, NodeStates
from neo.master.handlers.election import ClientElectionHandler, ServerElectionHandler
from neo.master.app import Application
from neo.exception import ElectionFailure
-from neo.tests import DoNothingConnector
from neo.connection import ClientConnection
# patch connection so that we can register _addPacket messages
Modified: trunk/neo/tests/master/testRecovery.py
==============================================================================
--- trunk/neo/tests/master/testRecovery.py [iso-8859-1] (original)
+++ trunk/neo/tests/master/testRecovery.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -18,7 +18,6 @@
import unittest
from struct import pack, unpack
from neo.tests import NeoTestBase
-from neo.protocol import Packets
from neo.protocol import NodeTypes, NodeStates, CellStates
from neo.master.recovery import RecoveryManager
from neo.master.app import Application
Modified: trunk/neo/tests/master/testStorageHandler.py
==============================================================================
--- trunk/neo/tests/master/testStorageHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/master/testStorageHandler.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -19,8 +19,7 @@
from mock import Mock
from struct import pack
from neo.tests import NeoTestBase
-from neo.protocol import Packets
-from neo.protocol import NodeTypes, NodeStates, CellStates
+from neo.protocol import NodeTypes, NodeStates
from neo.master.handlers.storage import StorageServiceHandler
from neo.master.handlers.client import ClientServiceHandler
from neo.master.app import Application
Modified: trunk/neo/tests/master/testVerification.py
==============================================================================
--- trunk/neo/tests/master/testVerification.py [iso-8859-1] (original)
+++ trunk/neo/tests/master/testVerification.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -18,8 +18,6 @@
import unittest
from struct import pack, unpack
from neo.tests import NeoTestBase
-from neo import protocol
-from neo.protocol import Packets
from neo.protocol import NodeTypes, NodeStates
from neo.master.verification import VerificationManager, VerificationFailure
from neo.master.app import Application
Modified: trunk/neo/tests/storage/testClientHandler.py
==============================================================================
--- trunk/neo/tests/storage/testClientHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testClientHandler.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -16,14 +16,13 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import unittest
-from struct import unpack
from mock import Mock
from collections import deque
from neo.tests import NeoTestBase
from neo.storage.app import Application
-from neo.storage.transactions import ConflictError, DelayedError
+from neo.storage.transactions import ConflictError
from neo.storage.handlers.client import ClientOperationHandler
-from neo.protocol import Packets, Packet, INVALID_PARTITION
+from neo.protocol import INVALID_PARTITION
from neo.protocol import INVALID_TID, INVALID_OID, INVALID_SERIAL
class StorageClientHandlerTests(NeoTestBase):
Modified: trunk/neo/tests/storage/testInitializationHandler.py
==============================================================================
--- trunk/neo/tests/storage/testInitializationHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testInitializationHandler.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -21,7 +21,7 @@
from neo.pt import PartitionTable
from neo.storage.app import Application
from neo.storage.handlers.initialization import InitializationHandler
-from neo.protocol import Packets, CellStates
+from neo.protocol import CellStates
from neo.exception import PrimaryFailure
class StorageInitializationHandlerTests(NeoTestBase):
Modified: trunk/neo/tests/storage/testMasterHandler.py
==============================================================================
--- trunk/neo/tests/storage/testMasterHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testMasterHandler.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -23,7 +23,7 @@
from neo.storage.handlers.master import MasterOperationHandler
from neo.exception import PrimaryFailure, OperationFailure
from neo.pt import PartitionTable
-from neo.protocol import CellStates, Packets, Packet, ProtocolError
+from neo.protocol import CellStates, ProtocolError
from neo.protocol import INVALID_TID, INVALID_OID
class StorageMasterHandlerTests(NeoTestBase):
Modified: trunk/neo/tests/storage/testStorageHandler.py
==============================================================================
--- trunk/neo/tests/storage/testStorageHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testStorageHandler.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -21,7 +21,7 @@
from neo.tests import NeoTestBase
from neo.storage.app import Application
from neo.storage.handlers.storage import StorageOperationHandler
-from neo.protocol import Packets, Packet, INVALID_PARTITION
+from neo.protocol import INVALID_PARTITION
from neo.protocol import INVALID_TID, INVALID_OID, INVALID_SERIAL
class StorageStorageHandlerTests(NeoTestBase):
Modified: trunk/neo/tests/storage/testVerificationHandler.py
==============================================================================
--- trunk/neo/tests/storage/testVerificationHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testVerificationHandler.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -21,7 +21,7 @@
from neo.pt import PartitionTable
from neo.storage.app import Application
from neo.storage.handlers.verification import VerificationHandler
-from neo.protocol import Packets, CellStates, ErrorCodes
+from neo.protocol import CellStates, ErrorCodes
from neo.protocol import INVALID_OID, INVALID_TID
from neo.exception import PrimaryFailure, OperationFailure
from neo.util import p64, u64
Modified: trunk/neo/tests/testProtocol.py
==============================================================================
--- trunk/neo/tests/testProtocol.py [iso-8859-1] (original)
+++ trunk/neo/tests/testProtocol.py [iso-8859-1] Tue Feb 23 16:58:23 2010
@@ -16,7 +16,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import unittest
-from neo import protocol
from neo.protocol import NodeTypes, NodeStates, CellStates
from neo.protocol import ErrorCodes, Packets, Errors
from neo.tests import NeoTestBase
More information about the Neo-report
mailing list