swh.lister.gitlab: Improve headers extraction

swh/lister/gitlab/lister.py

@@ -6,6 +6,7 @@ import random
 import re
 import time
 
+from .. import utils
 from ..core.paging_lister import PageByPageHttpLister
 from .models import GitLabModel
 
@@ -108,9 +109,9 @@ class GitLabLister(PageByPageHttpLister):
         """
         response = self.transport_head(identifier=1)
         h = response.headers
-        total = h.get('x-total', h.get('X-Total'))
-        total_pages = h.get('x-total-pages', h.get('X-Total-Pages'))
-        per_page = h.get('x-per-page', h.get('X-Per-Page'))
+        total = utils.get(h, ['X-Total', 'x-total'])
+        total_pages = utils.get(h, ['X-Total-Pages', 'x-total-pages'])
+        per_page = utils.get(h, ['X-Per-Page', 'x-per-page'])
         if total is not None:
             total = int(total)
         if total_pages is not None:

swh/lister/tests/test_utils.py

+# Copyright (C) 2018 the Software Heritage developers
+# License: GNU General Public License version 3, or any later version
+# See top-level LICENSE file for more information
+
+import unittest
+
+from nose.tools import istest
+
+from swh.lister import utils
+
+
+class UtilsTest(unittest.TestCase):
+
+    @istest
+    def get(self):
+        data = {
+            'X-Next-Page': None,
+            'x-next-page': 1,
+        }
+        actual_value = utils.get(data, ['X-Next-Page', 'x-next-page'])
+
+        self.assertEqual(actual_value, 1)
+
+        data = {
+            'X-Next-Page': 10,
+            'x-next-page': 1,
+        }
+        actual_value = utils.get(data, ['X-Next-Page', 'x-next-page'])
+
+        self.assertEqual(actual_value, 10)
+
+        data = {
+            'x-next-page': 100,
+        }
+        actual_value = utils.get(data, ['X-Next-Page', 'x-next-page'])
+
+        self.assertEqual(actual_value, 100)
+
+    @istest
+    def get_empty(self):
+        self.assertIsNone(utils.get({}, []))
+        self.assertIsNone(utils.get({'a': 1}, ['b']))
+        self.assertIsNone(utils.get({'b': 2}, []))
+        self.assertIsNone(utils.get({'b': 2}, []))
+
+    @istest
+    def get_errors(self):
+        with self.assertRaises(TypeError):
+            self.assertIsNone(utils.get({}, None))
+        with self.assertRaises(AttributeError):
+            self.assertIsNone(utils.get(None, ['a']))

swh/lister/utils.py

+# Copyright (C) 2018 the Software Heritage developers
+# License: GNU General Public License version 3, or any later version
+# See top-level LICENSE file for more information
+
+
+def get(d, keys):
+    """Given a dict, lookup in order for keys with values not None.
+
+    """
+    for key in keys:
+        v = d.get(key)
+        if v is not None:
+            return v
+    return None