Merge branch 'per-page' of daevaorn/github3.py

sigmavirus24 · sigmavirus24 · commit 4377c0190c87 · 2016-12-19T19:35:47.000-06:00
Conflicts:
        AUTHORS.rst
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -125,6 +125,7 @@ Contributors
 
 - Abhijeet Kasurde (@akasurde)
 
+<<<<<<< HEAD
 - Matthew Krueger (@mlkrueger1987)
 
 - Dejan Svetec (@dsvetec)
@@ -138,3 +139,5 @@ Contributors
 - Goodwillcoding (@goodwillcoding)
 
 - Andreas Backx (@AndreasBackx)
+
+- Alexander Koshelev <daevaorn@gmail.com>
diff --git a/github3/repos/repo.py b/github3/repos/repo.py
@@ -593,7 +593,7 @@ def commit_comment(self, comment_id):
         return self._instance_or_null(RepoComment, json)
 
     def commits(self, sha=None, path=None, author=None, number=-1, etag=None,
-                since=None, until=None):
+                since=None, until=None, per_page=None):
         r"""Iterate over commits in this repository.
 
         :param str sha: (optional), sha or branch to start listing commits
@@ -614,13 +614,15 @@ def commits(self, sha=None, path=None, author=None, number=-1, etag=None,
             be returned. This can be a ``datetime`` or an ``ISO8601`` formatted
             date string.
         :type until: datetime or string
+        :param int per_page: (optional), commits listing page size
 
         :returns: generator of
             :class:`RepoCommit <github3.repos.commit.RepoCommit>`\ s
         """
         params = {'sha': sha, 'path': path, 'author': author,
                   'since': timestamp_parameter(since),
-                  'until': timestamp_parameter(until)}
+                  'until': timestamp_parameter(until),
+                  'per_page': per_page}
 
         self._remove_none(params)
         url = self._build_url('commits', base_url=self._api)
diff --git a/tests/unit/test_repos_repo.py b/tests/unit/test_repos_repo.py
@@ -1093,6 +1093,18 @@ def test_commits_since_until_datetime(self):
             headers={}
         )
 
+    def test_commits_per_page(self):
+        """Test the ability to specify page size for commits listing."""
+
+        i = self.instance.commits(per_page=10)
+        self.get_next(i)
+
+        self.session.get.assert_called_once_with(
+            url_for('commits'),
+            params={'per_page': 10},
+            headers={}
+        )
+
     def test_commits_sha_path(self):
         """Test the ability to filter commits by branch and path."""
         i = self.instance.commits(sha='branch', path='tests/')
