Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions firebase/firebase.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,10 @@ def _build_endpoint_url(self, url, name=None):
full_url = _build_endpoint_url('/users', '1')
full_url => 'http://firebase.localhost/users/1.json'
"""
if (name is None) or (name is ''):
return '%s%s' % (urlparse.urljoin(self.dsn, url), self.NAME_EXTENSION)
if not url.endswith(self.URL_SEPERATOR):
url = url + self.URL_SEPERATOR
if name is None:
name = ''
return '%s%s%s' % (urlparse.urljoin(self.dsn, url), name,
self.NAME_EXTENSION)

Expand Down
2 changes: 1 addition & 1 deletion tests/firebase_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def setUp(self):
def test_build_endpoint_url(self):
url1 = os.path.join(self.DSN, 'users', '1.json')
self.assertEqual(self.firebase._build_endpoint_url('/users', '1'), url1)
url2 = os.path.join(self.DSN, 'users/1/.json')
url2 = os.path.join(self.DSN, 'users/1.json')
self.assertEqual(self.firebase._build_endpoint_url('/users/1', None), url2)

def test_make_get_request(self):
Expand Down