Skip to content

Allow bytes or string as project value in clients. #1505

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

Merged
dhermes merged 1 commit into from
Feb 20, 2016
Merged

Allow bytes or string as project value in clients. #1505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions gcloud/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ def __init__(self, project=None):
if project is None:
raise ValueError('Project was not passed and could not be '
'determined from the environment.')
if isinstance(project, six.binary_type):
project = project.decode('utf-8')
if not isinstance(project, six.string_types):
raise ValueError('Project must be a string.')
self.project = project
Expand Down
22 changes: 17 additions & 5 deletions gcloud/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def mock_get_credentials():
_determine_default_project=mock_determine_proj):
client_obj = self._makeOne()

self.assertTrue(client_obj.project is PROJECT)
self.assertEqual(client_obj.project, PROJECT)
self.assertTrue(isinstance(client_obj.connection, _MockConnection))
self.assertTrue(client_obj.connection.credentials is CREDENTIALS)
self.assertEqual(
Expand Down Expand Up @@ -189,19 +189,31 @@ def test_ctor_w_invalid_project(self):
with self.assertRaises(ValueError):
self._makeOne(project=object(), credentials=CREDENTIALS, http=HTTP)

def test_ctor_explicit(self):
PROJECT = 'PROJECT'
def _explicit_ctor_helper(self, project):
import six

CREDENTIALS = object()
HTTP = object()

client_obj = self._makeOne(project=PROJECT, credentials=CREDENTIALS,
client_obj = self._makeOne(project=project, credentials=CREDENTIALS,
http=HTTP)

self.assertTrue(client_obj.project is PROJECT)
if isinstance(project, six.binary_type):
self.assertEqual(client_obj.project, project.decode('utf-8'))
else:
self.assertEqual(client_obj.project, project)
self.assertTrue(isinstance(client_obj.connection, _MockConnection))
self.assertTrue(client_obj.connection.credentials is CREDENTIALS)
self.assertTrue(client_obj.connection.http is HTTP)

def test_ctor_explicit_bytes(self):
PROJECT = b'PROJECT'
self._explicit_ctor_helper(PROJECT)

def test_ctor_explicit_unicode(self):
PROJECT = u'PROJECT'
self._explicit_ctor_helper(PROJECT)


class _MockConnection(object):

Expand Down