Merge pull request #15 from annatisch/RestAPI-PR1923

Fixed conflicting import

Author: annatisch

azure-batch/tests/preparers.py renamed to azure-batch/tests/batch_preparers.py

@@ -15,7 +15,7 @@
 
 import azure.batch
 from azure.batch import models
-from preparers import (
+from batch_preparers import (
     AccountPreparer,
     PoolPreparer,
     JobPreparer

azure-batch/tests/test_batch.py

@@ -14,7 +14,7 @@
 import azure.mgmt.batch
 from azure.mgmt.batch import models
 from azure.common.exceptions import CloudError
-from preparers import KeyVaultPreparer, SimpleBatchPreparer
+from mgmt_batch_preparers import KeyVaultPreparer, SimpleBatchPreparer
 
 from devtools_testutils import (
     AzureMgmtTestCase,