sigmavirus24 · sigmavirus24 · Dec 22, 2017 · Feb 4, 2017 · Feb 5, 2017 · Feb 5, 2017
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,5 @@ build/
 *.egg
 .env
 .ipynb_checkpoints
-.cache/
+.cache/
+tests/id_rsa
diff --git a/.travis.yml b/.travis.yml
@@ -15,14 +15,6 @@ env:
 
 matrix:
   include:
-    - python: 2.7
-      env: TOXENV=py27 REQUESTS_VERSION="===2.0.1"
-    - python: 3.4
-      env: TOXENV=py34 REQUESTS_VERSION="===2.0.1"
-    - python: 3.5
-      env: TOXENV=py35 REQUESTS_VERSION="===2.0.1"
-    - python: pypy
-      env: TOXENV=pypy REQUESTS_VERSION="===2.0.1"
     - python: 2.7
       env: TOXENV=py27 REQUESTS_VERSION=""
     - python: 3.4

diff --git a/github3/github.py b/github3/github.py
@@ -20,7 +20,7 @@
 from .orgs import Membership, ShortOrganization, Organization, Team
 from .projects import Project, ProjectCard, ProjectColumn
 from .pulls import PullRequest
-from .repos.repo import Repository, repo_issue_params
+from .repos import repo
 from .search import (CodeSearchResult, IssueSearchResult,
                      RepositorySearchResult, UserSearchResult)
 from .structs import SearchIterator
@@ -126,10 +126,10 @@ def all_repositories(self, number=-1, since=None, etag=None,
             endpoint
         :param int per_page: (optional), number of repositories to list per
             request
-        :returns: generator of :class:`Repository <github3.repos.Repository>`
+        :returns: generator of :class:`~github3.repos.ShortRepository`
         """
         url = self._build_url('repositories')
-        return self._iter(int(number), url, Repository,
+        return self._iter(int(number), url, repo.ShortRepository,
                           params={'since': since, 'per_page': per_page},
                           etag=etag)
 
@@ -344,7 +344,7 @@ def create_repository(self, name, description='', homepage='',
                 'auto_init': auto_init,
                 'gitignore_template': gitignore_template}
         json = self._json(self._post(url, data=data), 201)
-        return self._instance_or_null(Repository, json)
+        return self._instance_or_null(repo.Repository, json)
 
     @requires_auth
     def delete_email_addresses(self, addresses=[]):
@@ -696,8 +696,10 @@ def issues_on(self, username, repository, milestone=None, state=None,
         if username and repository:
             url = self._build_url('repos', username, repository, 'issues')
 
-            params = repo_issue_params(milestone, state, assignee, mentioned,
-                                       labels, sort, direction, since)
+            params = repo.repo_issue_params(
+                milestone, state, assignee, mentioned,
+                labels, sort, direction, since,
+            )
             return self._iter(int(number), url, ShortIssue, params=params,
                               etag=etag)
         return iter([])
@@ -1119,7 +1121,7 @@ def repositories(self, type=None, sort=None, direction=None, number=-1,
             Default: -1 returns all repositories
         :param str etag: (optional), ETag from a previous request to the same
             endpoint
-        :returns: generator of :class:`Repository <github3.repos.Repository>`
+        :returns: generator of :class:`~github3.repos.ShortRepository`
             objects
         """
         url = self._build_url('user', 'repos')
@@ -1132,7 +1134,8 @@ def repositories(self, type=None, sort=None, direction=None, number=-1,
         if direction in ('asc', 'desc'):
             params.update(direction=direction)
 
-        return self._iter(int(number), url, Repository, params, etag)
+        return self._iter(int(number), url, repo.ShortRepository, params,
+                          etag)
 
     def repositories_by(self, username, type=None, sort=None, direction=None,
                         number=-1, etag=None):
@@ -1154,7 +1157,7 @@ def repositories_by(self, username, type=None, sort=None, direction=None,
             Default: -1 returns all repositories
         :param str etag: (optional), ETag from a previous request to the same
             endpoint
-        :returns: generator of :class:`Repository <github3.repos.Repository>`
+        :returns: generator of :class:`~github3.repos.ShortRepository`
             objects
         """
         url = self._build_url('users', username, 'repos')
@@ -1167,7 +1170,8 @@ def repositories_by(self, username, type=None, sort=None, direction=None,
         if direction in ('asc', 'desc'):
             params.update(direction=direction)
 
-        return self._iter(int(number), url, Repository, params, etag)
+        return self._iter(int(number), url, repo.ShortRepository, params,
+                          etag)
 
     def repository(self, owner, repository):
         """Returns a Repository object for the specified combination of
@@ -1182,7 +1186,7 @@ def repository(self, owner, repository):
             url = self._build_url('repos', owner, repository)
             json = self._json(self._get(url, headers=License.CUSTOM_HEADERS),
                               200)
-        return self._instance_or_null(Repository, json)
+        return self._instance_or_null(repo.Repository, json)
 
     def repository_with_id(self, number):
         """Returns the Repository with id ``number``.
@@ -1195,7 +1199,7 @@ def repository_with_id(self, number):
         if number > 0:
             url = self._build_url('repositories', str(number))
             json = self._json(self._get(url), 200)
-        return self._instance_or_null(Repository, json)
+        return self._instance_or_null(repo.Repository, json)
 
     @requires_app_credentials
     def revoke_authorization(self, access_token):
@@ -1524,12 +1528,13 @@ def starred(self, sort=None, direction=None, number=-1, etag=None):
             Default: -1 returns all repositories
         :param str etag: (optional), ETag from a previous request to the same
             endpoint
-        :returns: generator of :class:`Repository <github3.repos.Repository>`
+        :returns: generator of :class:`~github3.repos.ShortRepository>`
         """
         params = {'sort': sort, 'direction': direction}
         self._remove_none(params)
         url = self._build_url('user', 'starred')
-        return self._iter(int(number), url, Repository, params, etag)
+        return self._iter(int(number), url, repo.ShortRepository, params,
+                          etag)
 
     def starred_by(self, username, sort=None, direction=None, number=-1,
                    etag=None):
@@ -1549,12 +1554,13 @@ def starred_by(self, username, sort=None, direction=None, number=-1,
             Default: -1 returns all repositories
         :param str etag: (optional), ETag from a previous request to the same
             endpoint
-        :returns: generator of :class:`Repository <github3.repos.Repository>`
+        :returns: generator of :class:`~github3.repos.ShortRepository`
         """
         params = {'sort': sort, 'direction': direction}
         self._remove_none(params)
         url = self._build_url('users', str(username), 'starred')
-        return self._iter(int(number), url, Repository, params, etag)
+        return self._iter(int(number), url, repo.ShortRepository, params,
+                          etag)
 
     @requires_auth
     def subscriptions(self, number=-1, etag=None):
@@ -1564,10 +1570,10 @@ def subscriptions(self, number=-1, etag=None):
             Default: -1 returns all repositories
         :param str etag: (optional), ETag from a previous request to the same
             endpoint
-        :returns: generator of :class:`Repository <github3.repos.Repository>`
+        :returns: generator of :class:`~github3.repos.ShortRepository`
         """
         url = self._build_url('user', 'subscriptions')
-        return self._iter(int(number), url, Repository, etag=etag)
+        return self._iter(int(number), url, repo.ShortRepository, etag=etag)
 
     def subscriptions_for(self, username, number=-1, etag=None):
         """Iterate over repositories subscribed to by ``username``.
@@ -1578,10 +1584,10 @@ def subscriptions_for(self, username, number=-1, etag=None):
             Default: -1 returns all repositories
         :param str etag: (optional), ETag from a previous request to the same
             endpoint
-        :returns: generator of :class:`Repository <github3.repos.Repository>`
+        :returns: generator of :class:`~github3.repos.ShortRepository`
         """
         url = self._build_url('users', str(username), 'subscriptions')
-        return self._iter(int(number), url, Repository, etag=etag)
+        return self._iter(int(number), url, repo.ShortRepository, etag=etag)
 
     @requires_auth
     def unfollow(self, username):

diff --git a/github3/notifications.py b/github3/notifications.py
@@ -40,10 +40,10 @@ def _update_attributes(self, notif):
         #: Thread information
         self.thread = self._get_attribute(notif, 'thread', {})
 
-        from .repos import Repository
+        from . import repos
         #: Repository the comment was made on
         self.repository = self._class_attribute(
-            notif, 'repository', Repository, self
+            notif, 'repository', repos.ShortRepository, self
         )
 
         #: When the thread was last updated

diff --git a/github3/pulls.py b/github3/pulls.py
@@ -26,7 +26,7 @@ class PullDestination(models.GitHubCore):
 
     def __init__(self, dest, direction):
         super(PullDestination, self).__init__(dest)
-        from .repos.repo import Repository
+        from .repos.repo import ShortRepository
         #: Direction of the merge with respect to this destination
         self.direction = direction
         #: Full reference string of the object
@@ -44,7 +44,7 @@ def __init__(self, dest, direction):
         if dest.get('repo'):
             self._repo_name = dest['repo'].get('name')
             self._repo_owner = dest['repo']['owner'].get('login')
-            self.repository = Repository(dest.get('repo'), self)
+            self.repository = ShortRepository(dest.get('repo'), self)
         self.repo = (self._repo_owner, self._repo_name)
 
     def _repr(self):
@@ -367,15 +367,26 @@ def reviews(self, number=-1, etag=None):
         return self._iter(int(number), url, PullReview, etag=etag)
 
     @requires_auth
-    def update(self, title=None, body=None, state=None):
+    def update(self, title=None, body=None, state=None, base=None,
+               maintainer_can_modify=None):
         """Update this pull request.
 
         :param str title: (optional), title of the pull
         :param str body: (optional), body of the pull request
         :param str state: (optional), ('open', 'closed')
+        :param str base: (optional), Name of the branch on the current
+            repository that the changes should be pulled into.
+        :param bool maintainer_can_modify: (optional), Indicates whether
+            a maintainer is allowed to modify the pull request or not.
         :returns: bool
         """
-        data = {'title': title, 'body': body, 'state': state}
+        data = {
+            'title': title,
+            'body': body,
+            'state': state,
+            'base': base,
+            'maintainer_can_modify': maintainer_can_modify,
+        }
         json = None
         self._remove_none(data)
 
@@ -552,7 +563,7 @@ def reply(self, body):
         """
         url = self._build_url('comments', base_url=self.pull_request_url)
         index = self._api.rfind('/') + 1
-        in_reply_to = self._api[index:]
+        in_reply_to = int(self._api[index:])
         json = self._json(self._post(url, data={
             'body': body, 'in_reply_to': in_reply_to
         }), 201)

diff --git a/github3/repos/__init__.py b/github3/repos/__init__.py
@@ -8,6 +8,11 @@
 """
 
 from .repo import Repository
+from .repo import ShortRepository
 from .repo import StarredRepository
 
-__all__ = ('Repository', 'StarredRepository')
+__all__ = (
+    'Repository',
+    'ShortRepository',
+    'StarredRepository',
+)
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,5 @@ build/ @@
     *.egg
     .env
     .ipynb_checkpoints
-    .cache/
+    .cache/
+    tests/id_rsa