I am far happier with this

sigmavirus24 · sigmavirus24 · commit 1de78ab01f80 · 2013-12-23T20:35:54.000-06:00
diff --git a/github3/github.py b/github3/github.py
@@ -9,14 +9,15 @@
 from json import dumps
 from requests import session
 from github3.auths import Authorization
+from github3.decorators import requires_auth, requires_basic_auth
 from github3.events import Event
 from github3.gists import Gist
 from github3.issues import Issue, issue_params
 from github3.models import GitHubCore
 from github3.orgs import Organization
 from github3.repos import Repository
+from github3.structs import SearchIterator
 from github3.users import User, Key
-from github3.decorators import requires_auth, requires_basic_auth
 from github3.notifications import Thread
 from uritemplate import URITemplate
 
@@ -985,7 +986,8 @@ def repository(self, owner, repository):
         return Repository(json, self) if json else None
 
     def search_repositories(self, query, sort=None, order=None,
-                            per_page=None, text_match=False):
+                            per_page=None, text_match=False, number=-1,
+                            etag=None):
         """Find repositories via various criteria.
 
         The query can contain any combination of the following supported
@@ -1016,6 +1018,9 @@ def search_repositories(self, query, sort=None, order=None,
         :param int per_page: (optional)
         :param bool text_match: (optional), if True, return matching search
             terms. See http://git.io/4ct1eQ for more information
+        :param int number: (optional), number of repositories to return.
+            Default: -1, returns all available repositories
+        :param str etag: (optional), previous ETag header value
         :return: dict
         """
         # TODO Describe the dictionary being returned
@@ -1034,12 +1039,7 @@ def search_repositories(self, query, sort=None, order=None,
                 }
 
         url = self._build_url('search', 'repositories')
-        results = self._json(self._get(url, params=params, headers=headers),
-                             200)
-        repos_dicts = results['items']
-        repos = [Repository(r) for r in repos_dicts]
-        results['repositories'] = repos
-        return results
+        return SearchIterator(number, url, Repository, self, params, etag)
 
     def set_client_id(self, id, secret):
         """Allows the developer to set their client_id and client_secret for
diff --git a/github3/structs.py b/github3/structs.py
@@ -34,9 +34,10 @@ def __init__(self, count, url, cls, session, params=None, etag=None):
         if etag:
             self.headers = {'If-None-Match': etag}
 
+        self.path = urlparse(self.url).path
+
     def __repr__(self):
-        path = urlparse(self.url).path
-        return '<GitHubIterator [{0}, {1}]>'.format(self.count, path)
+        return '<GitHubIterator [{0}, {1}]>'.format(self.count, self.path)
 
     def __iter__(self):
         url, params, cls = self.url, self.params, self.cls
@@ -94,3 +95,23 @@ def refresh(self, conditional=False):
 
     def next(self):
         return self.__next__()
+
+
+class SearchIterator(GitHubIterator):
+    def __init__(self, count, url, cls, session, params=None, etag=None):
+        super(SearchIterator, self).__init__(count, url, cls, session, params,
+                                             etag)
+        self.total_count = 0
+
+    def __repr__(self):
+        return '<SearchIterator [{0}, {1}]>'.format(self.count, self.path)
+
+    def _json(self, response, status_code):
+        json = super(SearchIterator, self)._json(response, status_code)
+        # I'm not sure if another page will retain the total_count attribute,
+        # so if it's not in the response, just set it back to what it used to
+        # be
+        self.total_count = json.get('total_count', self.total_count)
+        self.items = json.get('items', [])
+        # If we return None then it will short-circuit the while loop.
+        return json.get('items')
