Skip to content

Commit 6851159

Browse files
dhermesdhermes
committed
Using {} as default in iterator for extra_params and get_query_params.
1 parent 161ecbc commit 6851159

File tree

3 files changed

+17
-22
lines changed

3 files changed

+17
-22
lines changed

‎gcloud/storage/iterator.py‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,15 @@ def __init__(self, connection, path, extra_params=None):
4747
self.path = path
4848
self.page_number = 0
4949
self.next_page_token = None
50-
self.extra_params = extra_params
51-
if self.extra_params is not None:
52-
reserved_in_use = self.RESERVED_PARAMS.intersection(
53-
extra_params.keys())
54-
if reserved_in_use:
55-
raise ValueError(('Using a reserved parameter',
56-
reserved_in_use))
50+
self.extra_params = extra_params or {}
51+
reserved_in_use = self.RESERVED_PARAMS.intersection(
52+
self.extra_params.keys())
53+
if reserved_in_use:
54+
raise ValueError(('Using a reserved parameter',
55+
reserved_in_use))
5756

5857
def __iter__(self):
5958
"""Iterate through the list of items."""
60-
6159
while self.has_next_page():
6260
response = self.get_next_page_response()
6361
for item in self.get_items_from_response(response):
@@ -80,12 +78,9 @@ def get_query_params(self):
8078
:rtype: dict or None
8179
:returns: A dictionary of query parameters or None if there are none.
8280
"""
83-
result = None
84-
if self.next_page_token:
85-
result = {self.PAGE_TOKEN: self.next_page_token}
86-
if self.extra_params is not None:
87-
result = result or {}
88-
result.update(self.extra_params)
81+
result = ({self.PAGE_TOKEN: self.next_page_token}
82+
if self.next_page_token else {})
83+
result.update(self.extra_params)
8984
return result
9085

9186
def get_next_page_response(self):

‎gcloud/storage/test_bucket.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def test___iter___empty(self):
7777
kw, = connection._requested
7878
self.assertEqual(kw['method'], 'GET')
7979
self.assertEqual(kw['path'], '/b/%s/o' % NAME)
80-
self.assertEqual(kw['query_params'], None)
80+
self.assertEqual(kw['query_params'], {})
8181

8282
def test___iter___non_empty(self):
8383
NAME = 'name'
@@ -91,7 +91,7 @@ def test___iter___non_empty(self):
9191
kw, = connection._requested
9292
self.assertEqual(kw['method'], 'GET')
9393
self.assertEqual(kw['path'], '/b/%s/o' % NAME)
94-
self.assertEqual(kw['query_params'], None)
94+
self.assertEqual(kw['query_params'], {})
9595

9696
def test___contains___miss(self):
9797
NAME = 'name'
@@ -154,7 +154,7 @@ def test_get_all_keys_empty(self):
154154
kw, = connection._requested
155155
self.assertEqual(kw['method'], 'GET')
156156
self.assertEqual(kw['path'], '/b/%s/o' % NAME)
157-
self.assertEqual(kw['query_params'], None)
157+
self.assertEqual(kw['query_params'], {})
158158

159159
def test_get_all_keys_non_empty(self):
160160
NAME = 'name'
@@ -168,7 +168,7 @@ def test_get_all_keys_non_empty(self):
168168
kw, = connection._requested
169169
self.assertEqual(kw['method'], 'GET')
170170
self.assertEqual(kw['path'], '/b/%s/o' % NAME)
171-
self.assertEqual(kw['query_params'], None)
171+
self.assertEqual(kw['query_params'], {})
172172

173173
def test_new_key_existing(self):
174174
from gcloud.storage.key import Key
@@ -715,7 +715,7 @@ def get_items_from_response(self, response):
715715
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
716716
self.assertEqual(kw[1]['method'], 'GET')
717717
self.assertEqual(kw[1]['path'], '/b/%s/o' % NAME)
718-
self.assertEqual(kw[1]['query_params'], None)
718+
self.assertEqual(kw[1]['query_params'], {})
719719

720720

721721
class TestBucketIterator(unittest2.TestCase):

‎gcloud/storage/test_iterator.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def _get_items(response):
3636
kw, = connection._requested
3737
self.assertEqual(kw['method'], 'GET')
3838
self.assertEqual(kw['path'], PATH)
39-
self.assertEqual(kw['query_params'], None)
39+
self.assertEqual(kw['query_params'], {})
4040

4141
def test_has_next_page_new(self):
4242
connection = _Connection()
@@ -64,7 +64,7 @@ def test_get_query_params_no_token(self):
6464
connection = _Connection()
6565
PATH = '/foo'
6666
iterator = self._makeOne(connection, PATH)
67-
self.assertEqual(iterator.get_query_params(), None)
67+
self.assertEqual(iterator.get_query_params(), {})
6868

6969
def test_get_query_params_w_token(self):
7070
connection = _Connection()
@@ -116,7 +116,7 @@ def test_get_next_page_response_new_no_token_in_response(self):
116116
kw, = connection._requested
117117
self.assertEqual(kw['method'], 'GET')
118118
self.assertEqual(kw['path'], PATH)
119-
self.assertEqual(kw['query_params'], None)
119+
self.assertEqual(kw['query_params'], {})
120120

121121
def test_get_next_page_response_no_token(self):
122122
connection = _Connection()

0 commit comments

Comments
 (0)