Merge pull request #83 from citrusleaf/dev

[CLIENT-1708] Fix batch_remove, batch_apply, batch_operate import error.

VERSION

@@ -1 +1 @@
-7.0.0
+7.0.1

src/main/aerospike.c

@@ -154,7 +154,7 @@ static int Aerospike_Clear(PyObject *aerospike)
 MOD_INIT(aerospike)
 {
 
-	const char version[8] = "7.0.0";
+	const char version[8] = "7.0.1";
 	// Makes things "thread-safe"
 	PyEval_InitThreads();
 	int i = 0;

src/main/client/batch_apply.c

@@ -206,7 +206,7 @@ static PyObject *AerospikeClient_Batch_Apply_Invoke(
 	PyObject *br_module = NULL;
 	PyObject *sys_modules = PyImport_GetModuleDict();
 
-	if (PyMapping_HasKeyString(sys_modules, "aerospike_helpers")) {
+	if (PyMapping_HasKeyString(sys_modules, "aerospike_helpers.batch.records")) {
 		br_module = PyMapping_GetItemString(sys_modules,
 											"aerospike_helpers.batch.records");
 	}

src/main/client/batch_operate.c

@@ -222,7 +222,7 @@ static PyObject *AerospikeClient_Batch_Operate_Invoke(
 	PyObject *br_module = NULL;
 	PyObject *sys_modules = PyImport_GetModuleDict();
 
-	if (PyMapping_HasKeyString(sys_modules, "aerospike_helpers")) {
+	if (PyMapping_HasKeyString(sys_modules, "aerospike_helpers.batch.records")) {
 		br_module = PyMapping_GetItemString(sys_modules,
 											"aerospike_helpers.batch.records");
 	}

src/main/client/batch_remove.c

@@ -191,7 +191,7 @@ static PyObject *AerospikeClient_Batch_Remove_Invoke(
 	PyObject *br_module = NULL;
 	PyObject *sys_modules = PyImport_GetModuleDict();
 
-	if (PyMapping_HasKeyString(sys_modules, "aerospike_helpers")) {
+	if (PyMapping_HasKeyString(sys_modules, "aerospike_helpers.batch.records")) {
 		br_module = PyMapping_GetItemString(sys_modules,
 											"aerospike_helpers.batch.records");
 	}

test/new_tests/test_batch_apply.py

@@ -14,9 +14,6 @@
     sys.exit(1)
 
 from aerospike_helpers import expressions as exp
-from aerospike_helpers.batch import records as br
-from aerospike_helpers.operations import operations as op
-from aerospike_helpers.operations import list_operations as lop
 from aerospike import exception as e
 from .test_base_class import TestBaseClass
 from .as_status_codes import AerospikeStatus

test/new_tests/test_batch_operate.py

@@ -13,9 +13,7 @@
     sys.exit(1)
 
 from aerospike_helpers import expressions as exp
-from aerospike_helpers.batch import records as br
 from aerospike_helpers.operations import operations as op
-from aerospike_helpers.operations import list_operations as lop
 from aerospike import exception as e
 from .test_base_class import TestBaseClass
 from .as_status_codes import AerospikeStatus

test/new_tests/test_batch_remove.py

@@ -14,9 +14,6 @@
     sys.exit(1)
 
 from aerospike_helpers import expressions as exp
-from aerospike_helpers.batch import records as br
-from aerospike_helpers.operations import operations as op
-from aerospike_helpers.operations import list_operations as lop
 from aerospike import exception as e
 from .test_base_class import TestBaseClass
 from .as_status_codes import AerospikeStatus