Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Using *arg syntax for lists #623

Closed
wants to merge 3 commits into from
Closed

Using *arg syntax for lists #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb7009b
Changed syntax to *args for get, delete, put
elibixby Feb 12, 2015
c4d4a58
Merge branch 'master' of https://github.com/GoogleCloudPlatform/gclou…
elibixby Feb 12, 2015
f6733f3
Fixed no_key tests
elibixby Feb 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gcloud/datastore/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def _extended_lookup(connection, dataset_id, key_pbs,
return results


def get(keys, missing=None, deferred=None, connection=None, dataset_id=None):
def get(*keys, missing=None, deferred=None, connection=None, dataset_id=None):
"""Retrieves entities, along with their attributes.

:type keys: list of :class:`gcloud.datastore.key.Key`
Expand Down Expand Up @@ -231,7 +231,7 @@ def get(keys, missing=None, deferred=None, connection=None, dataset_id=None):
return entities


def put(entities, connection=None, dataset_id=None):
def put(*entities, connection=None, dataset_id=None):
"""Save the entities in the Cloud Datastore.

:type entities: list of :class:`gcloud.datastore.entity.Entity`
Expand Down Expand Up @@ -266,7 +266,7 @@ def put(entities, connection=None, dataset_id=None):
current.commit()


def delete(keys, connection=None, dataset_id=None):
def delete(*keys, connection=None, dataset_id=None):
"""Delete the keys in the Cloud Datastore.

:type keys: list of :class:`gcloud.datastore.key.Key`
Expand Down
54 changes: 27 additions & 27 deletions gcloud/datastore/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ def test_implicit_set_passed_explicitly(self):

class Test_get_function(unittest2.TestCase):

def _callFUT(self, keys, missing=None, deferred=None,
def _callFUT(self, *keys, missing=None, deferred=None,
connection=None, dataset_id=None):
from gcloud.datastore.api import get
return get(keys, missing=missing, deferred=deferred,
return get(*keys, missing=missing, deferred=deferred,
connection=connection, dataset_id=dataset_id)

def _make_entity_pb(self, dataset_id, kind, integer_id,
Expand All @@ -190,10 +190,10 @@ def test_wo_connection(self):
DATASET_ID = 'DATASET'
key = Key('Kind', 1234, dataset_id=DATASET_ID)
self.assertRaises(EnvironmentError,
self._callFUT, [key], dataset_id=DATASET_ID)
self._callFUT, key, dataset_id=DATASET_ID)

def test_no_keys(self):
results = self._callFUT([])
results = self._callFUT()
self.assertEqual(results, [])

def test_miss(self):
Expand All @@ -203,7 +203,7 @@ def test_miss(self):
DATASET_ID = 'DATASET'
connection = _Connection()
key = Key('Kind', 1234, dataset_id=DATASET_ID)
results = self._callFUT([key], connection=connection,
results = self._callFUT(key, connection=connection,
dataset_id=DATASET_ID)
self.assertEqual(results, [])

Expand All @@ -214,7 +214,7 @@ def test_miss_wo_dataset_id(self):
DATASET_ID = 'DATASET'
connection = _Connection()
key = Key('Kind', 1234, dataset_id=DATASET_ID)
results = self._callFUT([key], connection=connection)
results = self._callFUT(key, connection=connection)
self.assertEqual(results, [])
expected = {
'dataset_id': DATASET_ID,
Expand Down Expand Up @@ -246,7 +246,7 @@ def test_miss_w_missing(self):

key = Key(KIND, ID, dataset_id=DATASET_ID)
missing = []
entities = self._callFUT([key], connection=connection,
entities = self._callFUT(key, connection=connection,
missing=missing, dataset_id=DATASET_ID)
self.assertEqual(entities, [])
self.assertEqual([missed.key.to_protobuf() for missed in missing],
Expand All @@ -261,7 +261,7 @@ def test_w_missing_non_empty(self):

missing = ['this', 'list', 'is', 'not', 'empty']
self.assertRaises(ValueError, self._callFUT,
[key], connection=CONNECTION,
key, connection=CONNECTION,
missing=missing)

def test_w_deferred_non_empty(self):
Expand All @@ -273,7 +273,7 @@ def test_w_deferred_non_empty(self):

deferred = ['this', 'list', 'is', 'not', 'empty']
self.assertRaises(ValueError, self._callFUT,
[key], connection=CONNECTION,
key, connection=CONNECTION,
deferred=deferred)

def test_miss_w_deferred(self):
Expand All @@ -288,7 +288,7 @@ def test_miss_w_deferred(self):
connection._deferred = [key.to_protobuf()]

deferred = []
entities = self._callFUT([key], connection=connection,
entities = self._callFUT(key, connection=connection,
deferred=deferred, dataset_id=DATASET_ID)
self.assertEqual(entities, [])
self.assertEqual([def_key.to_protobuf() for def_key in deferred],
Expand Down Expand Up @@ -399,7 +399,7 @@ def test_hit(self):
connection = _Connection(entity_pb)

key = Key(KIND, ID, dataset_id=DATASET_ID)
result, = self._callFUT([key], connection=connection,
result, = self._callFUT(key, connection=connection,
dataset_id=DATASET_ID)
new_key = result.key

Expand Down Expand Up @@ -473,7 +473,7 @@ def test_implicit_wo_transaction(self):
key = Key(KIND, ID, dataset_id=DATASET_ID)
with _Monkey(_implicit_environ, CONNECTION=CUSTOM_CONNECTION,
DATASET_ID=DATASET_ID):
result, = self._callFUT([key])
result, = self._callFUT(key)

expected_called_with = {
'dataset_id': DATASET_ID,
Expand Down Expand Up @@ -510,7 +510,7 @@ def test_w_transaction(self):

key = Key(KIND, ID, dataset_id=DATASET_ID)
with _NoCommitTransaction(DATASET_ID, CUSTOM_CONNECTION, TRANSACTION):
result, = self._callFUT([key], connection=CUSTOM_CONNECTION,
result, = self._callFUT(key, connection=CUSTOM_CONNECTION,
dataset_id=DATASET_ID)

expected_called_with = {
Expand Down Expand Up @@ -550,7 +550,7 @@ def test_max_loops(self):
deferred = []
missing = []
with _Monkey(api, _MAX_LOOPS=-1):
result = self._callFUT([key], missing=missing, deferred=deferred,
result = self._callFUT(key, missing=missing, deferred=deferred,
connection=connection,
dataset_id=DATASET_ID)

Expand All @@ -563,9 +563,9 @@ def test_max_loops(self):

class Test_put_function(unittest2.TestCase):

def _callFUT(self, entities, connection=None, dataset_id=None):
def _callFUT(self, *entities, connection=None, dataset_id=None):
from gcloud.datastore.api import put
return put(entities, connection=connection, dataset_id=dataset_id)
return put(*entities, connection=connection, dataset_id=dataset_id)

def test_no_connection(self):
from gcloud.datastore import _implicit_environ
Expand Down Expand Up @@ -611,7 +611,7 @@ def test_no_entities(self):
from gcloud.datastore import _implicit_environ

self.assertEqual(_implicit_environ.CONNECTION, None)
result = self._callFUT([])
result = self._callFUT()
self.assertEqual(result, None)

def test_no_batch_w_partial_key(self):
Expand Down Expand Up @@ -696,9 +696,9 @@ def test_implicit_connection(self):

class Test_delete_function(unittest2.TestCase):

def _callFUT(self, keys, connection=None, dataset_id=None):
def _callFUT(self, *keys, connection=None, dataset_id=None):
from gcloud.datastore.api import delete
return delete(keys, connection=connection, dataset_id=dataset_id)
return delete(*keys, connection=connection, dataset_id=dataset_id)

def test_no_connection(self):
from gcloud.datastore import _implicit_environ
Expand All @@ -710,7 +710,7 @@ def test_no_connection(self):

self.assertEqual(_implicit_environ.CONNECTION, None)
with self.assertRaises(EnvironmentError):
self._callFUT([key], dataset_id=_DATASET)
self._callFUT(key, dataset_id=_DATASET)

def test_no_dataset_id(self):
from gcloud.datastore import _implicit_environ
Expand All @@ -724,7 +724,7 @@ def test_no_dataset_id(self):

self.assertEqual(_implicit_environ.CONNECTION, None)

result = self._callFUT([key], connection=connection)
result = self._callFUT(key, connection=connection)

self.assertEqual(result, None)
self.assertEqual(len(connection._committed), 1)
Expand All @@ -736,7 +736,7 @@ def test_no_keys(self):
from gcloud.datastore import _implicit_environ

self.assertEqual(_implicit_environ.CONNECTION, None)
result = self._callFUT([])
result = self._callFUT()
self.assertEqual(result, None)

def test_no_batch(self):
Expand All @@ -748,7 +748,7 @@ def test_no_batch(self):
connection = _Connection()
key = _Key(_DATASET)

result = self._callFUT([key], connection=connection,
result = self._callFUT(key, connection=connection,
dataset_id=_DATASET)
self.assertEqual(result, None)
self.assertEqual(len(connection._committed), 1)
Expand All @@ -771,7 +771,7 @@ def test_wo_batch_w_key_different_than_default_dataset_id(self):
with _Monkey(_implicit_environ,
CONNECTION=connection,
DATASET_ID=_DEFAULT_DATASET):
result = self._callFUT([key])
result = self._callFUT(key)
self.assertEqual(result, None)
self.assertEqual(len(connection._committed), 1)
dataset_id, mutation = connection._committed[0]
Expand All @@ -789,7 +789,7 @@ def test_w_existing_batch(self):

# Set up Batch on stack so we can check it is used.
with _NoCommitBatch(_DATASET, connection) as CURR_BATCH:
result = self._callFUT([key])
result = self._callFUT(key)

self.assertEqual(result, None)
self.assertEqual(len(CURR_BATCH.mutation.insert_auto_id), 0)
Expand All @@ -810,7 +810,7 @@ def test_w_existing_transaction(self):

# Set up Batch on stack so we can check it is used.
with _NoCommitTransaction(_DATASET, connection) as CURR_BATCH:
result = self._callFUT([key])
result = self._callFUT(key)

self.assertEqual(result, None)
self.assertEqual(len(CURR_BATCH.mutation.insert_auto_id), 0)
Expand All @@ -836,7 +836,7 @@ def test_implicit_connection_and_dataset_id(self):
DATASET_ID=_DATASET):
# Set up Batch on stack so we can check it is used.
with _NoCommitBatch(_DATASET, connection) as CURR_BATCH:
result = self._callFUT([key])
result = self._callFUT(key)

self.assertEqual(result, None)
self.assertEqual(len(CURR_BATCH.mutation.insert_auto_id), 0)
Expand Down