From 6fb25746278774b630758209416eedd920a022b3 Mon Sep 17 00:00:00 2001 From: Virgilio Santos Date: Mon, 14 Sep 2015 17:32:25 -0300 Subject: [PATCH] endpoint: build url as endpoint.json when name is empty or None --- firebase/firebase.py | 4 ++-- tests/firebase_test.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firebase/firebase.py b/firebase/firebase.py index 2e55865..8ed18ca 100644 --- a/firebase/firebase.py +++ b/firebase/firebase.py @@ -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) diff --git a/tests/firebase_test.py b/tests/firebase_test.py index 30e6068..ba192ef 100644 --- a/tests/firebase_test.py +++ b/tests/firebase_test.py @@ -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):