Remove unused imports, found by pylint

neo/admin/app.py

@@ -22,8 +22,7 @@ from .handler import AdminEventHandler, MasterEventHandler, \
     MasterRequestEventHandler
 from neo.lib.bootstrap import BootstrapManager
 from neo.lib.pt import PartitionTable
-from neo.lib.protocol import ClusterStates, Errors, \
-    NodeTypes, NodeStates, Packets
+from neo.lib.protocol import ClusterStates, Errors, NodeTypes, Packets
 from neo.lib.debug import register as registerLiveDebugger
 
 class Application(BaseApplication):

neo/client/Storage.py

@@ -18,7 +18,6 @@ from ZODB import BaseStorage, ConflictResolution, POSException
 from zope.interface import implementer
 import ZODB.interfaces
 
-from functools import wraps
 from neo.lib import logging
 from .app import Application
 from .exception import NEOStorageNotFoundError, NEOStorageDoesNotExistError

neo/client/app.py

@@ -19,7 +19,6 @@ from zlib import compress, decompress
 from random import shuffle
 import heapq
 import time
-import weakref
 from functools import partial
 
 from ZODB.POSException import UndoError, StorageTransactionError, ConflictError
@@ -32,20 +31,17 @@ from persistent.TimeStamp import TimeStamp
 from neo.lib import logging
 from neo.lib.protocol import NodeTypes, Packets, \
     INVALID_PARTITION, MAX_TID, ZERO_HASH, ZERO_TID
-from neo.lib.event import EventManager
 from neo.lib.util import makeChecksum, dump
 from neo.lib.locking import Empty, Lock, SimpleQueue
 from neo.lib.connection import MTClientConnection, ConnectionClosed
-from neo.lib.node import NodeManager
 from .exception import NEOStorageError, NEOStorageCreationUndoneError
 from .exception import NEOStorageNotFoundError
 from .handlers import storage, master
-from neo.lib.dispatcher import Dispatcher, ForgottenPacket
+from neo.lib.dispatcher import ForgottenPacket
 from neo.lib.threaded_app import ThreadedApplication
 from .cache import ClientCache
 from .pool import ConnectionPool
 from neo.lib.util import p64, u64, parseMasterList
-from neo.lib.debug import register as registerLiveDebugger
 
 CHECKED_SERIAL = object()
 

neo/client/handlers/master.py

@@ -17,8 +17,8 @@
 from neo.lib import logging
 from neo.lib.handler import MTEventHandler
 from neo.lib.pt import MTPartitionTable as PartitionTable
-from neo.lib.protocol import NodeStates, Packets, ProtocolError
-from neo.lib.util import dump, add64
+from neo.lib.protocol import NodeStates, ProtocolError
+from neo.lib.util import dump
 from . import AnswerBaseHandler
 from ..exception import NEOStorageError
 

neo/lib/interfaces.py

@@ -15,7 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import inspect
-from functools import wraps
 
 def check_signature(reference, function):
     # args, varargs, varkw, defaults

neo/lib/threaded_app.py

@@ -21,7 +21,6 @@ from .connection import ConnectionClosed
 from .debug import register as registerLiveDebugger
 from .dispatcher import Dispatcher, ForgottenPacket
 from .locking import SimpleQueue
-from .protocol import Packets
 
 class app_set(weakref.WeakSet):
 

neo/master/backup_app.py

@@ -22,8 +22,8 @@ from neo.lib.bootstrap import BootstrapManager
 from neo.lib.exception import PrimaryFailure
 from neo.lib.handler import EventHandler
 from neo.lib.node import NodeManager
-from neo.lib.protocol import CellStates, ClusterStates, \
-    NodeStates, NodeTypes, Packets, uuid_str, INVALID_TID, ZERO_TID
+from neo.lib.protocol import ClusterStates, \
+    NodeTypes, Packets, uuid_str, ZERO_TID
 from neo.lib.util import add64, dump
 from .app import StateChangedException
 from .pt import PartitionTable

neo/master/verification.py

@@ -16,7 +16,6 @@
 
 from collections import defaultdict
 from neo.lib import logging
-from neo.lib.util import dump
 from neo.lib.protocol import ClusterStates, Packets, NodeStates
 from .handlers import BaseServiceHandler
 

neo/scripts/runner.py

@@ -17,7 +17,6 @@
 
 import traceback
 import unittest
-import logging
 import time
 import sys
 import os
@@ -33,7 +32,6 @@ if filter(re.compile(r'--coverage$|-\w*c').match, sys.argv[1:]):
     coverage.neotestrunner = []
     coverage.start()
 
-import neo
 from neo.tests import getTempDirectory, __dict__ as neo_tests__dict__
 from neo.tests.benchmark import BenchmarkRunner
 

neo/scripts/simple.py

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import inspect, random, signal, sys
+import inspect, random
 from logging import getLogger, INFO
 from optparse import OptionParser
 from neo.lib import logging

neo/storage/app.py

@@ -21,7 +21,6 @@ from neo.lib import logging
 from neo.lib.app import BaseApplication
 from neo.lib.protocol import uuid_str, \
     CellStates, ClusterStates, NodeTypes, Packets
-from neo.lib.node import NodeManager
 from neo.lib.connection import ListeningConnection
 from neo.lib.exception import StoppedOperation, PrimaryFailure
 from neo.lib.pt import PartitionTable

neo/storage/database/importer.py

@@ -28,8 +28,7 @@ from .manager import DatabaseManager
 from neo.lib import logging, patch, util
 from neo.lib.exception import DatabaseFailure
 from neo.lib.interfaces import implements
-from neo.lib.protocol import BackendNotImplemented, CellStates, \
-    MAX_TID, ZERO_HASH, ZERO_OID, ZERO_TID
+from neo.lib.protocol import BackendNotImplemented, MAX_TID
 
 patch.speedupFileStorageTxnLookup()
 

neo/storage/database/mysqldb.py

@@ -29,7 +29,7 @@ import struct
 import time
 
 from . import LOG_QUERIES
-from .manager import CreationUndone, DatabaseManager, splitOIDField
+from .manager import DatabaseManager, splitOIDField
 from neo.lib import logging, util
 from neo.lib.exception import DatabaseFailure
 from neo.lib.interfaces import implements

neo/storage/database/sqlite.py

@@ -21,9 +21,8 @@ import string
 import traceback
 
 from . import LOG_QUERIES
-from .manager import CreationUndone, DatabaseManager, splitOIDField
+from .manager import DatabaseManager, splitOIDField
 from neo.lib import logging, util
-from neo.lib.exception import DatabaseFailure
 from neo.lib.interfaces import implements
 from neo.lib.protocol import CellStates, ZERO_OID, ZERO_TID, ZERO_HASH
 

neo/storage/handlers/identification.py

@@ -16,7 +16,7 @@
 
 from neo.lib import logging
 from neo.lib.handler import EventHandler
-from neo.lib.protocol import uuid_str, NodeTypes, NotReadyError, Packets
+from neo.lib.protocol import NodeTypes, NotReadyError, Packets
 from neo.lib.protocol import ProtocolError, BrokenNodeDisallowedError
 from .storage import StorageOperationHandler
 from .client import ClientOperationHandler, ClientReadOnlyOperationHandler

neo/storage/handlers/master.py

@@ -16,7 +16,7 @@
 
 from neo.lib import logging
 from neo.lib.util import dump
-from neo.lib.protocol import Packets, ProtocolError, ZERO_TID
+from neo.lib.protocol import Packets, ZERO_TID
 from . import BaseMasterHandler
 
 

neo/tests/client/testClientApp.py

@@ -19,7 +19,7 @@ import unittest
 from cPickle import dumps
 from mock import Mock, ReturnValues
 from ZODB.POSException import StorageTransactionError, UndoError, ConflictError
-from .. import NeoUnitTestBase, buildUrlFromString, ADDRESS_TYPE
+from .. import NeoUnitTestBase, buildUrlFromString
 from neo.client.app import Application
 from neo.client.cache import test as testCache
 from neo.client.exception import NEOStorageError, NEOStorageNotFoundError

neo/tests/client/testMasterHandler.py

@@ -18,9 +18,6 @@ import unittest
 from mock import Mock
 from .. import NeoUnitTestBase
 from neo.lib.node import NodeManager
-from neo.lib.pt import PartitionTable
-from neo.lib.protocol import NodeTypes
-from neo.client.handlers.master import PrimaryBootstrapHandler
 from neo.client.handlers.master import PrimaryNotificationsHandler, \
        PrimaryAnswersHandler
 from neo.client.exception import NEOStorageError

neo/tests/fs2zodb.py

@@ -16,7 +16,6 @@
 
 import os, stat, time
 from persistent import Persistent
-from persistent.TimeStamp import TimeStamp
 from BTrees.OOBTree import OOBTree
 
 class Inode(OOBTree):

neo/tests/functional/testClient.py

@@ -26,7 +26,6 @@ from ZODB.FileStorage import FileStorage
 from ZODB.POSException import ConflictError
 from ZODB.tests.StorageTestBase import zodb_pickle
 from persistent import Persistent
-from .. import expectedFailure
 from . import NEOCluster, NEOFunctionalTest
 
 TREE_SIZE = 6

neo/tests/master/testMasterPT.py

@@ -16,7 +16,6 @@
 
 import unittest
 from collections import defaultdict
-from mock import Mock
 from .. import NeoUnitTestBase
 from neo.lib.protocol import NodeStates, CellStates
 from neo.lib.pt import PartitionTableException

neo/tests/storage/testMasterHandler.py

@@ -22,7 +22,7 @@ from neo.storage.app import Application
 from neo.storage.handlers.master import MasterOperationHandler
 from neo.lib.exception import PrimaryFailure
 from neo.lib.pt import PartitionTable
-from neo.lib.protocol import CellStates, ProtocolError, Packets
+from neo.lib.protocol import CellStates, Packets
 
 class StorageMasterHandlerTests(NeoUnitTestBase):
 

neo/tests/storage/testStorageMySQL.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-import MySQLdb
+from MySQLdb import OperationalError
 from mock import Mock
 from neo.lib.exception import DatabaseFailure
 from neo.lib.util import p64
@@ -59,7 +59,6 @@ class StorageMySQLdbTests(StorageDBTests):
     def test_query2(self):
         # test the OperationalError exception
         # fake object, raise exception during the first call
-        from MySQLdb import OperationalError
         from MySQLdb.constants.CR import SERVER_GONE_ERROR
         class FakeConn(object):
             def query(*args):
@@ -78,7 +77,6 @@ class StorageMySQLdbTests(StorageDBTests):
 
     def test_query3(self):
         # OperationalError > raise DatabaseFailure exception
-        from MySQLdb import OperationalError
         class FakeConn(object):
             def close(self):
                 pass

neo/tests/testNodes.py

@@ -16,9 +16,8 @@
 
 import unittest
 from mock import Mock
-from neo.lib import protocol
 from neo.lib.protocol import NodeTypes, NodeStates
-from neo.lib.node import Node, NodeManager, MasterDB
+from neo.lib.node import Node, MasterDB
 from . import NeoUnitTestBase, getTempDirectory
 from time import time
 from os import chmod, mkdir, rmdir, unlink

neo/tests/testPT.py

@@ -15,7 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-from mock import Mock
 from neo.lib.protocol import NodeStates, CellStates
 from neo.lib.pt import Cell, PartitionTable, PartitionTableException
 from . import NeoUnitTestBase

neo/tests/threaded/testImporter.py

@@ -18,7 +18,7 @@ from collections import deque
 from cPickle import Pickler, Unpickler
 from cStringIO import StringIO
 from itertools import islice, izip_longest
-import os, time, unittest
+import os, unittest
 import neo, transaction, ZODB
 from neo.lib import logging
 from neo.lib.util import u64