Simplify login() method, don't catch Exceptions

djc · djc · commit d4a52343f515 · 2016-03-23T22:23:23.000+01:00
diff --git a/couchdb/client.py b/couchdb/client.py
@@ -257,23 +257,18 @@ def login(self, name, password):
         """Login regular user in couch db
         :param name: name of regular user, normally user id
         :param password: password of regular user
-        :return: (status, token) tuple of the login user
-        :rtype: `tuple`
+        :return: authentication token
         """
-        data = {
+        status, headers, _ = self.resource.post_json('_session', {
             'name': name,
             'password': password,
-        }
-        try:
-            status, headers, _ = self.resource.post_json('_session', data)
-            if sys.version_info > (3, ):
-                cookie = headers._headers[0][1]
-            else:
-                cookie = headers.headers[0].split(';')[0]
-            pos = cookie.find('=')
-            return status, cookie[pos + 1:]
-        except http.Unauthorized:
-            return 401, None
+        })
+        if sys.version_info[0] > 2:
+            cookie = headers._headers[0][1]
+        else:
+            cookie = headers.headers[0].split(';')[0]
+        pos = cookie.find('=')
+        return cookie[pos + 1:]
 
     def logout(self, token):
         """Logout regular user in couch db
diff --git a/couchdb/tests/client.py b/couchdb/tests/client.py
@@ -144,8 +144,7 @@ def test_user_management(self):
         server = client.Server(url)
         try:
             server.add_user('foo', 'secret', roles=['hero'])
-            status, token = server.login('foo', 'secret')
-            self.assertEqual(status, 200)
+            token = server.login('foo', 'secret')
             self.assertTrue(server.verify_token(token))
             self.assertTrue(server.logout(token))
         finally:
