Do all paginated calls inside PaginatedList

This was already the case for Legacy.PaginatedList. Doing it in PaginatedList.PaginatedList reduces the amount of repeated code and will allow a generic solution for issue #77
PyGithub · Sep 11, 2012 · ef403a1 · ef403a1
1 parent 25a7696
commit ef403a1
Show file tree

Hide file tree

Showing 25 changed files with 200 additions and 553 deletions.
diff --git a/github/AuthenticatedUser.py b/github/AuthenticatedUser.py
@@ -332,17 +332,11 @@ def get_authorization( self, id ):
         return Authorization.Authorization( self._requester, data, completed = True )
 
     def get_authorizations( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            "/authorizations",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             Authorization.Authorization,
             self._requester,
-            headers,
+            "/authorizations",
-            data
+            None
         )
 
     def get_emails( self ):
@@ -355,73 +349,43 @@ def get_emails( self ):
         return data
 
     def get_events( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            "/events",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             Event.Event,
             self._requester,
-            headers,
+            "/events",
-            data
+            None
         )
 
     def get_followers( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            "/user/followers",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             NamedUser.NamedUser,
             self._requester,
-            headers,
+            "/user/followers",
-            data
+            None
         )
 
     def get_following( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            "/user/following",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             NamedUser.NamedUser,
             self._requester,
-            headers,
+            "/user/following",
-            data
+            None
         )
 
     def get_gists( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            "/gists",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             Gist.Gist,
             self._requester,
-            headers,
+            "/gists",
-            data
+            None
         )
 
     def get_issues( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            "/issues",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             Issue.Issue,
             self._requester,
-            headers,
+            "/issues",
-            data
+            None
         )
 
     def get_key( self, id ):
@@ -435,46 +399,28 @@ def get_key( self, id ):
         return UserKey.UserKey( self._requester, data, completed = True )
 
     def get_keys( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            "/user/keys",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             UserKey.UserKey,
             self._requester,
-            headers,
+            "/user/keys",
-            data
+            None
         )
 
     def get_organization_events( self, org ):
         assert isinstance( org, Organization.Organization ), org
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            "/users/" + self.login + "/events/orgs/" + org.login,
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             Event.Event,
             self._requester,
-            headers,
+            "/users/" + self.login + "/events/orgs/" + org.login,
-            data
+            None
         )
 
     def get_orgs( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            "/user/orgs",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             Organization.Organization,
             self._requester,
-            headers,
+            "/user/orgs",
-            data
+            None
         )
 
     def get_repo( self, name ):
@@ -498,73 +444,43 @@ def get_repos( self, type = GithubObject.NotSet, sort = GithubObject.NotSet, dir
             url_parameters[ "sort" ] = sort
         if direction is not GithubObject.NotSet:
             url_parameters[ "direction" ] = direction
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            "/user/repos",
-            url_parameters,
-            None
-        )
         return PaginatedList.PaginatedList(
             Repository.Repository,
             self._requester,
-            headers,
+            "/user/repos",
-            data
+            url_parameters
         )
 
     def get_starred( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            "/user/starred",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             Repository.Repository,
             self._requester,
-            headers,
+            "/user/starred",
-            data
+            None
         )
 
     def get_starred_gists( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            "/gists/starred",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             Gist.Gist,
             self._requester,
-            headers,
+            "/gists/starred",
-            data
+            None
         )
 
     def get_subscriptions( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            "/user/subscriptions",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             Repository.Repository,
             self._requester,
-            headers,
+            "/user/subscriptions",
-            data
+            None
         )
 
     def get_watched( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            "/user/watched",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             Repository.Repository,
             self._requester,
-            headers,
+            "/user/watched",
-            data
+            None
         )
 
     def has_in_following( self, following ):

diff --git a/github/Commit.py b/github/Commit.py
@@ -105,31 +105,19 @@ def create_status( self, state, target_url = GithubObject.NotSet, description =
         return CommitStatus.CommitStatus( self._requester, data, completed = True )
 
     def get_comments( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            self.url + "/comments",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             CommitComment.CommitComment,
             self._requester,
-            headers,
+            self.url + "/comments",
-            data
+            None
         )
 
     def get_statuses( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            self._parentUrl( self._parentUrl( self.url ) ) + "/statuses/" + self.sha,
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             CommitStatus.CommitStatus,
             self._requester,
-            headers,
+            self._parentUrl( self._parentUrl( self.url ) ) + "/statuses/" + self.sha,
-            data
+            None
         )
 
     @property

diff --git a/github/Gist.py b/github/Gist.py
@@ -154,17 +154,11 @@ def get_comment( self, id ):
         return GistComment.GistComment( self._requester, data, completed = True )
 
     def get_comments( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            self.url + "/comments",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             GistComment.GistComment,
             self._requester,
-            headers,
+            self.url + "/comments",
-            data
+            None
         )
 
     def is_starred( self ):

diff --git a/github/Github.py b/github/Github.py
@@ -69,12 +69,11 @@ def get_gist( self, id ):
         return Gist.Gist( self.__requester, data, completed = True )
 
     def get_gists( self ):
-        headers, data = self.__requester.requestAndCheck( "GET", "/gists/public", None, None )
         return PaginatedList.PaginatedList(
             Gist.Gist,
             self.__requester,
-            headers,
+            "/gists/public",
-            data
+            None
         )
 
     def legacy_search_repos( self, keyword, language = GithubObject.NotSet ):

diff --git a/github/Issue.py b/github/Issue.py
@@ -183,45 +183,27 @@ def get_comment( self, id ):
         return IssueComment.IssueComment( self._requester, data, completed = True )
 
     def get_comments( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            self.url + "/comments",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             IssueComment.IssueComment,
             self._requester,
-            headers,
+            self.url + "/comments",
-            data
+            None
         )
 
     def get_events( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            self.url + "/events",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             IssueEvent.IssueEvent,
             self._requester,
-            headers,
+            self.url + "/events",
-            data
+            None
         )
 
     def get_labels( self ):
-        headers, data = self._requester.requestAndCheck(
-            "GET",
-            self.url + "/labels",
-            None,
-            None
-        )
         return PaginatedList.PaginatedList(
             Label.Label,
             self._requester,
-            headers,
+            self.url + "/labels",
-            data
+            None
         )
 
     def remove_from_labels( self, label ):

diff --git a/github/Legacy.py b/github/Legacy.py
@@ -15,7 +15,7 @@
 
 class PaginatedList( PaginatedListBase ):
     def __init__( self, url, args, requester, key, convert, contentClass ):
-        PaginatedListBase.__init__( self, list() )
+        PaginatedListBase.__init__( self )
         self.__url = url
         self.__args = args
         self.__requester = requester
@@ -24,7 +24,6 @@ def __init__( self, url, args, requester, key, convert, contentClass ):
         self.__contentClass = contentClass
         self.__nextPage = 1
         self.__continue = True
-        self.__elements = list()
 
     def _couldGrow( self ):
         return self.__continue