Move mock.py to neo/tests to not conflict with https://pypi.python.org/pypi/mock

This is a backport commit for a project branch.
Not sure of this cherry-pick conflict resolution, neoppod is not used in
this project anyway, what matters is to fix the conflict when importing
mock

 Conflicts:
	.gitignore
	neo/tests/client/testClientApp.py
	neo/tests/client/testConnectionPool.py
	neo/tests/storage/testClientHandler.py
	neo/tests/storage/testStorageApp.py
	neo/tests/storage/testStorageMySQL.py
	neo/tests/storage/testTransactions.py
	neo/tests/testNodes.py
	setup.py

neo/tests/__init__.py

@@ -29,7 +29,7 @@ import MySQLdb
 import transaction
 
 from functools import wraps
-from mock import Mock
+from .mock import Mock
 from neo.lib import debug, logging, protocol
 from neo.lib.protocol import NodeTypes, Packets, UUID_NAMESPACES
 from time import time

neo/tests/client/testClientApp.py

@@ -16,10 +16,9 @@
 
 import threading
 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 ..mock import Mock
+from ZODB.POSException import StorageTransactionError, ConflictError
+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/testConnectionPool.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import time, unittest
-from mock import Mock, ReturnValues
+from ..mock import Mock
 
 from .. import NeoUnitTestBase
 from neo.client.app import ConnectionPool

neo/tests/client/testMasterHandler.py

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

neo/tests/master/testClientHandler.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-from mock import Mock
+from ..mock import Mock
 from .. import NeoUnitTestBase
 from neo.lib.protocol import NodeTypes, NodeStates, Packets
 from neo.master.handlers.client import ClientServiceHandler

neo/tests/master/testElectionHandler.py

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

neo/tests/master/testStorageHandler.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-from mock import Mock
+from ..mock import Mock
 from .. import NeoUnitTestBase
 from neo.lib.protocol import NodeTypes, NodeStates, Packets
 from neo.master.handlers.storage import StorageServiceHandler

neo/tests/master/testTransactions.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-from mock import Mock
+from ..mock import Mock
 from struct import pack
 from .. import NeoUnitTestBase
 from neo.lib.protocol import NodeTypes

neo/tests/storage/testClientHandler.py

@@ -15,9 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-from mock import Mock, ReturnValues
 from collections import deque
 from neo.lib.util import makeChecksum
+from ..mock import Mock, ReturnValues
 from .. import NeoUnitTestBase
 from neo.storage.app import Application
 from neo.storage.transactions import ConflictError

neo/tests/storage/testMasterHandler.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-from mock import Mock
+from ..mock import Mock
 from collections import deque
 from .. import NeoUnitTestBase
 from neo.storage.app import Application

neo/tests/storage/testStorageApp.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-from mock import Mock, ReturnValues
+from ..mock import Mock
 from .. import NeoUnitTestBase
 from neo.storage.app import Application
 from neo.lib.protocol import CellStates

neo/tests/storage/testStorageMySQL.py

@@ -15,8 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-import MySQLdb
-from mock import Mock
+from MySQLdb import OperationalError
+from ..mock import Mock
 from neo.lib.exception import DatabaseFailure
 from neo.lib.util import p64
 from .. import DB_PREFIX, DB_SOCKET, DB_USER

neo/tests/storage/testTransactions.py

@@ -16,7 +16,7 @@
 
 import random
 import unittest
-from mock import Mock, ReturnValues
+from ..mock import Mock
 from .. import NeoUnitTestBase
 from neo.storage.transactions import Transaction, TransactionManager
 from neo.storage.transactions import ConflictError, DelayedError

neo/tests/testConnection.py

@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import unittest
 from time import time
-from mock import Mock
+from .mock import Mock
 from neo.lib import connection, logging
 from neo.lib.connection import BaseConnection, ClientConnection, \
     MTClientConnection, HandlerSwitcher, CRITICAL_TIMEOUT

neo/tests/testHandler.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-from mock import Mock
+from .mock import Mock
 from . import NeoUnitTestBase
 from neo.lib.handler import EventHandler
 from neo.lib.protocol import PacketMalformedError, UnexpectedPacketError, \

neo/tests/testNodes.py

@@ -15,8 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-from mock import Mock
-from neo.lib import protocol
+from .mock import Mock
 from neo.lib.protocol import NodeTypes, NodeStates
 from neo.lib.node import Node, MasterNode, StorageNode, \
     ClientNode, AdminNode, NodeManager, MasterDB

neo/tests/threaded/__init__.py

@@ -25,7 +25,7 @@ from itertools import count
 from functools import wraps
 from thread import get_ident
 from zlib import decompress
-from mock import Mock
+from ..mock import Mock
 import transaction, ZODB
 import neo.admin.app, neo.master.app, neo.storage.app
 import neo.client.app, neo.neoctl.app

setup.py

@@ -14,14 +14,15 @@ Topic :: Database
 Topic :: Software Development :: Libraries :: Python Modules
 """
 
-if not os.path.exists('mock.py'):
+mock = 'neo/tests/mock.py'
+if not os.path.exists(mock):
     import cStringIO, hashlib, urllib, zipfile
     mock_py = zipfile.ZipFile(cStringIO.StringIO(urllib.urlopen(
         'http://downloads.sf.net/sourceforge/python-mock/pythonmock-0.1.0.zip'
         ).read())).read('mock.py')
     if hashlib.md5(mock_py).hexdigest() != '79f42f390678e5195d9ce4ae43bd18ec':
         raise EnvironmentError("MD5 checksum mismatch downloading 'mock.py'")
-    open('mock.py', 'w').write(mock_py)
+    open(mock, 'w').write(mock_py)
 
 zodb_require = ['ZODB3>=3.10', 'ZODB3<3.11dev']
 
@@ -65,7 +66,6 @@ setup(
     long_description = ".. contents::\n\n" + open('README.rst').read()
                      + "\n" + open('CHANGELOG.rst').read(),
     packages = find_packages(),
-    py_modules = ['mock'],
     entry_points = {
         'console_scripts': [
             # XXX: we'd like not to generate scripts for unwanted features