From a6972c03c346bfc00cf3bb4ff3849be5e634ce62 Mon Sep 17 00:00:00 2001 From: Vincent Jacques Date: Tue, 20 Nov 2012 19:34:55 +0100 Subject: [PATCH] Fix assertion failure on big integers (issue #116) --- ReadMe.md | 5 +++++ doc/ChangeLog.md | 5 +++++ github/AuthenticatedUser.py | 24 ++++++++++++------------ github/Authorization.py | 2 +- github/Commit.py | 4 ++-- github/CommitComment.py | 6 +++--- github/CommitStats.py | 6 +++--- github/CommitStatus.py | 2 +- github/Comparison.py | 6 +++--- github/ContentFile.py | 2 +- github/Download.py | 6 +++--- github/File.py | 6 +++--- github/Gist.py | 4 ++-- github/GistComment.py | 2 +- github/GistFile.py | 2 +- github/GitBlob.py | 2 +- github/GitTreeElement.py | 2 +- github/Hook.py | 2 +- github/HookResponse.py | 2 +- github/Issue.py | 8 ++++---- github/IssueComment.py | 2 +- github/IssueEvent.py | 2 +- github/Legacy.py | 2 +- github/Milestone.py | 8 ++++---- github/NamedUser.py | 22 +++++++++++----------- github/Organization.py | 22 +++++++++++----------- github/PaginatedList.py | 2 +- github/Plan.py | 6 +++--- github/PullRequest.py | 22 +++++++++++----------- github/PullRequestComment.py | 6 +++--- github/Repository.py | 28 ++++++++++++++-------------- github/RepositoryKey.py | 2 +- github/Team.py | 6 +++--- github/UserKey.py | 2 +- 34 files changed, 120 insertions(+), 110 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index a2d23d3c..effb87e7 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -13,6 +13,11 @@ What's new? [![Build Status](https://secure.travis-ci.org/jacquev6/PyGithub.png)](http://travis-ci.org/jacquev6/PyGithub) +[Version 1.9.1](https://github.com/jacquev6/PyGithub/issues?milestone=16&state=closed) (November 20th, 2012) +------------------------------------------------------------------------------------------------------------ + +* Fix an assertion failure when integers returned by Github do not fit in a Python `int` + [Version 1.9.0](https://github.com/jacquev6/PyGithub/issues?milestone=14&state=closed) (November 19th, 2012) ------------------------------------------------------------------------------------------------------------ diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md index f8ab7d11..c8742c6b 100644 --- a/doc/ChangeLog.md +++ b/doc/ChangeLog.md @@ -1,3 +1,8 @@ +[Version 1.9.1](https://github.com/jacquev6/PyGithub/issues?milestone=16&state=closed) (November 20th, 2012) +------------------------------------------------------------------------------------------------------------ + +* Fix an assertion failure when integers returned by Github do not fit in a Python `int` + [Version 1.9.0](https://github.com/jacquev6/PyGithub/issues?milestone=14&state=closed) (November 19th, 2012) ------------------------------------------------------------------------------------------------------------ diff --git a/github/AuthenticatedUser.py b/github/AuthenticatedUser.py index f131d625..e450d5bc 100644 --- a/github/AuthenticatedUser.py +++ b/github/AuthenticatedUser.py @@ -331,7 +331,7 @@ class AuthenticatedUser(GithubObject.GithubObject): self._useAttributes(data) def get_authorization(self, id): - assert isinstance(id, int), id + assert isinstance(id, (int, long)), id headers, data = self._requester.requestAndCheck( "GET", "/authorizations/" + str(id), @@ -398,7 +398,7 @@ class AuthenticatedUser(GithubObject.GithubObject): ) def get_key(self, id): - assert isinstance(id, int), id + assert isinstance(id, (int, long)), id headers, data = self._requester.requestAndCheck( "GET", "/user/keys/" + str(id), @@ -616,7 +616,7 @@ class AuthenticatedUser(GithubObject.GithubObject): assert attributes["blog"] is None or isinstance(attributes["blog"], (str, unicode)), attributes["blog"] self._blog = attributes["blog"] if "collaborators" in attributes: # pragma no branch - assert attributes["collaborators"] is None or isinstance(attributes["collaborators"], int), attributes["collaborators"] + assert attributes["collaborators"] is None or isinstance(attributes["collaborators"], (int, long)), attributes["collaborators"] self._collaborators = attributes["collaborators"] if "company" in attributes: # pragma no branch assert attributes["company"] is None or isinstance(attributes["company"], (str, unicode)), attributes["company"] @@ -625,16 +625,16 @@ class AuthenticatedUser(GithubObject.GithubObject): assert attributes["created_at"] is None or isinstance(attributes["created_at"], (str, unicode)), attributes["created_at"] self._created_at = self._parseDatetime(attributes["created_at"]) if "disk_usage" in attributes: # pragma no branch - assert attributes["disk_usage"] is None or isinstance(attributes["disk_usage"], int), attributes["disk_usage"] + assert attributes["disk_usage"] is None or isinstance(attributes["disk_usage"], (int, long)), attributes["disk_usage"] self._disk_usage = attributes["disk_usage"] if "email" in attributes: # pragma no branch assert attributes["email"] is None or isinstance(attributes["email"], (str, unicode)), attributes["email"] self._email = attributes["email"] if "followers" in attributes: # pragma no branch - assert attributes["followers"] is None or isinstance(attributes["followers"], int), attributes["followers"] + assert attributes["followers"] is None or isinstance(attributes["followers"], (int, long)), attributes["followers"] self._followers = attributes["followers"] if "following" in attributes: # pragma no branch - assert attributes["following"] is None or isinstance(attributes["following"], int), attributes["following"] + assert attributes["following"] is None or isinstance(attributes["following"], (int, long)), attributes["following"] self._following = attributes["following"] if "gravatar_id" in attributes: # pragma no branch assert attributes["gravatar_id"] is None or isinstance(attributes["gravatar_id"], (str, unicode)), attributes["gravatar_id"] @@ -646,7 +646,7 @@ class AuthenticatedUser(GithubObject.GithubObject): assert attributes["html_url"] is None or isinstance(attributes["html_url"], (str, unicode)), attributes["html_url"] self._html_url = attributes["html_url"] if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "location" in attributes: # pragma no branch assert attributes["location"] is None or isinstance(attributes["location"], (str, unicode)), attributes["location"] @@ -658,22 +658,22 @@ class AuthenticatedUser(GithubObject.GithubObject): assert attributes["name"] is None or isinstance(attributes["name"], (str, unicode)), attributes["name"] self._name = attributes["name"] if "owned_private_repos" in attributes: # pragma no branch - assert attributes["owned_private_repos"] is None or isinstance(attributes["owned_private_repos"], int), attributes["owned_private_repos"] + assert attributes["owned_private_repos"] is None or isinstance(attributes["owned_private_repos"], (int, long)), attributes["owned_private_repos"] self._owned_private_repos = attributes["owned_private_repos"] if "plan" in attributes: # pragma no branch assert attributes["plan"] is None or isinstance(attributes["plan"], dict), attributes["plan"] self._plan = None if attributes["plan"] is None else Plan.Plan(self._requester, attributes["plan"], completed=False) if "private_gists" in attributes: # pragma no branch - assert attributes["private_gists"] is None or isinstance(attributes["private_gists"], int), attributes["private_gists"] + assert attributes["private_gists"] is None or isinstance(attributes["private_gists"], (int, long)), attributes["private_gists"] self._private_gists = attributes["private_gists"] if "public_gists" in attributes: # pragma no branch - assert attributes["public_gists"] is None or isinstance(attributes["public_gists"], int), attributes["public_gists"] + assert attributes["public_gists"] is None or isinstance(attributes["public_gists"], (int, long)), attributes["public_gists"] self._public_gists = attributes["public_gists"] if "public_repos" in attributes: # pragma no branch - assert attributes["public_repos"] is None or isinstance(attributes["public_repos"], int), attributes["public_repos"] + assert attributes["public_repos"] is None or isinstance(attributes["public_repos"], (int, long)), attributes["public_repos"] self._public_repos = attributes["public_repos"] if "total_private_repos" in attributes: # pragma no branch - assert attributes["total_private_repos"] is None or isinstance(attributes["total_private_repos"], int), attributes["total_private_repos"] + assert attributes["total_private_repos"] is None or isinstance(attributes["total_private_repos"], (int, long)), attributes["total_private_repos"] self._total_private_repos = attributes["total_private_repos"] if "type" in attributes: # pragma no branch assert attributes["type"] is None or isinstance(attributes["type"], (str, unicode)), attributes["type"] diff --git a/github/Authorization.py b/github/Authorization.py index 91805330..4ee1a008 100644 --- a/github/Authorization.py +++ b/github/Authorization.py @@ -116,7 +116,7 @@ class Authorization(GithubObject.GithubObject): assert attributes["created_at"] is None or isinstance(attributes["created_at"], (str, unicode)), attributes["created_at"] self._created_at = self._parseDatetime(attributes["created_at"]) if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "note" in attributes: # pragma no branch assert attributes["note"] is None or isinstance(attributes["note"], (str, unicode)), attributes["note"] diff --git a/github/Commit.py b/github/Commit.py index 2849285b..88610b1a 100644 --- a/github/Commit.py +++ b/github/Commit.py @@ -68,9 +68,9 @@ class Commit(GithubObject.GithubObject): def create_comment(self, body, line=GithubObject.NotSet, path=GithubObject.NotSet, position=GithubObject.NotSet): assert isinstance(body, (str, unicode)), body - assert line is GithubObject.NotSet or isinstance(line, int), line + assert line is GithubObject.NotSet or isinstance(line, (int, long)), line assert path is GithubObject.NotSet or isinstance(path, (str, unicode)), path - assert position is GithubObject.NotSet or isinstance(position, int), position + assert position is GithubObject.NotSet or isinstance(position, (int, long)), position post_parameters = { "body": body, } diff --git a/github/CommitComment.py b/github/CommitComment.py index d3e0e47f..335285de 100644 --- a/github/CommitComment.py +++ b/github/CommitComment.py @@ -122,16 +122,16 @@ class CommitComment(GithubObject.GithubObject): assert attributes["html_url"] is None or isinstance(attributes["html_url"], (str, unicode)), attributes["html_url"] self._html_url = attributes["html_url"] if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "line" in attributes: # pragma no branch - assert attributes["line"] is None or isinstance(attributes["line"], int), attributes["line"] + assert attributes["line"] is None or isinstance(attributes["line"], (int, long)), attributes["line"] self._line = attributes["line"] if "path" in attributes: # pragma no branch assert attributes["path"] is None or isinstance(attributes["path"], (str, unicode)), attributes["path"] self._path = attributes["path"] if "position" in attributes: # pragma no branch - assert attributes["position"] is None or isinstance(attributes["position"], int), attributes["position"] + assert attributes["position"] is None or isinstance(attributes["position"], (int, long)), attributes["position"] self._position = attributes["position"] if "updated_at" in attributes: # pragma no branch assert attributes["updated_at"] is None or isinstance(attributes["updated_at"], (str, unicode)), attributes["updated_at"] diff --git a/github/CommitStats.py b/github/CommitStats.py index 03001a24..0fed5814 100644 --- a/github/CommitStats.py +++ b/github/CommitStats.py @@ -36,11 +36,11 @@ class CommitStats(GithubObject.BasicGithubObject): def _useAttributes(self, attributes): if "additions" in attributes: # pragma no branch - assert attributes["additions"] is None or isinstance(attributes["additions"], int), attributes["additions"] + assert attributes["additions"] is None or isinstance(attributes["additions"], (int, long)), attributes["additions"] self._additions = attributes["additions"] if "deletions" in attributes: # pragma no branch - assert attributes["deletions"] is None or isinstance(attributes["deletions"], int), attributes["deletions"] + assert attributes["deletions"] is None or isinstance(attributes["deletions"], (int, long)), attributes["deletions"] self._deletions = attributes["deletions"] if "total" in attributes: # pragma no branch - assert attributes["total"] is None or isinstance(attributes["total"], int), attributes["total"] + assert attributes["total"] is None or isinstance(attributes["total"], (int, long)), attributes["total"] self._total = attributes["total"] diff --git a/github/CommitStatus.py b/github/CommitStatus.py index 08479073..62e367d4 100644 --- a/github/CommitStatus.py +++ b/github/CommitStatus.py @@ -67,7 +67,7 @@ class CommitStatus(GithubObject.BasicGithubObject): assert attributes["description"] is None or isinstance(attributes["description"], (str, unicode)), attributes["description"] self._description = attributes["description"] if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "state" in attributes: # pragma no branch assert attributes["state"] is None or isinstance(attributes["state"], (str, unicode)), attributes["state"] diff --git a/github/Comparison.py b/github/Comparison.py index 494240ed..c4007f5e 100644 --- a/github/Comparison.py +++ b/github/Comparison.py @@ -96,13 +96,13 @@ class Comparison(GithubObject.GithubObject): def _useAttributes(self, attributes): if "ahead_by" in attributes: # pragma no branch - assert attributes["ahead_by"] is None or isinstance(attributes["ahead_by"], int), attributes["ahead_by"] + assert attributes["ahead_by"] is None or isinstance(attributes["ahead_by"], (int, long)), attributes["ahead_by"] self._ahead_by = attributes["ahead_by"] if "base_commit" in attributes: # pragma no branch assert attributes["base_commit"] is None or isinstance(attributes["base_commit"], dict), attributes["base_commit"] self._base_commit = None if attributes["base_commit"] is None else Commit.Commit(self._requester, attributes["base_commit"], completed=False) if "behind_by" in attributes: # pragma no branch - assert attributes["behind_by"] is None or isinstance(attributes["behind_by"], int), attributes["behind_by"] + assert attributes["behind_by"] is None or isinstance(attributes["behind_by"], (int, long)), attributes["behind_by"] self._behind_by = attributes["behind_by"] if "commits" in attributes: # pragma no branch assert attributes["commits"] is None or all(isinstance(element, dict) for element in attributes["commits"]), attributes["commits"] @@ -132,7 +132,7 @@ class Comparison(GithubObject.GithubObject): assert attributes["status"] is None or isinstance(attributes["status"], (str, unicode)), attributes["status"] self._status = attributes["status"] if "total_commits" in attributes: # pragma no branch - assert attributes["total_commits"] is None or isinstance(attributes["total_commits"], int), attributes["total_commits"] + assert attributes["total_commits"] is None or isinstance(attributes["total_commits"], (int, long)), attributes["total_commits"] self._total_commits = attributes["total_commits"] if "url" in attributes: # pragma no branch assert attributes["url"] is None or isinstance(attributes["url"], (str, unicode)), attributes["url"] diff --git a/github/ContentFile.py b/github/ContentFile.py index 1026e795..9c8ceca7 100644 --- a/github/ContentFile.py +++ b/github/ContentFile.py @@ -71,7 +71,7 @@ class ContentFile(GithubObject.BasicGithubObject): assert attributes["sha"] is None or isinstance(attributes["sha"], (str, unicode)), attributes["sha"] self._sha = attributes["sha"] if "size" in attributes: # pragma no branch - assert attributes["size"] is None or isinstance(attributes["size"], int), attributes["size"] + assert attributes["size"] is None or isinstance(attributes["size"], (int, long)), attributes["size"] self._size = attributes["size"] if "type" in attributes: # pragma no branch assert attributes["type"] is None or isinstance(attributes["type"], (str, unicode)), attributes["type"] diff --git a/github/Download.py b/github/Download.py index e54bbfbe..52ecc86f 100644 --- a/github/Download.py +++ b/github/Download.py @@ -167,7 +167,7 @@ class Download(GithubObject.GithubObject): assert attributes["description"] is None or isinstance(attributes["description"], (str, unicode)), attributes["description"] self._description = attributes["description"] if "download_count" in attributes: # pragma no branch - assert attributes["download_count"] is None or isinstance(attributes["download_count"], int), attributes["download_count"] + assert attributes["download_count"] is None or isinstance(attributes["download_count"], (int, long)), attributes["download_count"] self._download_count = attributes["download_count"] if "expirationdate" in attributes: # pragma no branch assert attributes["expirationdate"] is None or isinstance(attributes["expirationdate"], (str, unicode)), attributes["expirationdate"] @@ -176,7 +176,7 @@ class Download(GithubObject.GithubObject): assert attributes["html_url"] is None or isinstance(attributes["html_url"], (str, unicode)), attributes["html_url"] self._html_url = attributes["html_url"] if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "mime_type" in attributes: # pragma no branch assert attributes["mime_type"] is None or isinstance(attributes["mime_type"], (str, unicode)), attributes["mime_type"] @@ -203,7 +203,7 @@ class Download(GithubObject.GithubObject): assert attributes["signature"] is None or isinstance(attributes["signature"], (str, unicode)), attributes["signature"] self._signature = attributes["signature"] if "size" in attributes: # pragma no branch - assert attributes["size"] is None or isinstance(attributes["size"], int), attributes["size"] + assert attributes["size"] is None or isinstance(attributes["size"], (int, long)), attributes["size"] self._size = attributes["size"] if "url" in attributes: # pragma no branch assert attributes["url"] is None or isinstance(attributes["url"], (str, unicode)), attributes["url"] diff --git a/github/File.py b/github/File.py index 0dedb3cd..9a6a9d16 100644 --- a/github/File.py +++ b/github/File.py @@ -66,16 +66,16 @@ class File(GithubObject.BasicGithubObject): def _useAttributes(self, attributes): if "additions" in attributes: # pragma no branch - assert attributes["additions"] is None or isinstance(attributes["additions"], int), attributes["additions"] + assert attributes["additions"] is None or isinstance(attributes["additions"], (int, long)), attributes["additions"] self._additions = attributes["additions"] if "blob_url" in attributes: # pragma no branch assert attributes["blob_url"] is None or isinstance(attributes["blob_url"], (str, unicode)), attributes["blob_url"] self._blob_url = attributes["blob_url"] if "changes" in attributes: # pragma no branch - assert attributes["changes"] is None or isinstance(attributes["changes"], int), attributes["changes"] + assert attributes["changes"] is None or isinstance(attributes["changes"], (int, long)), attributes["changes"] self._changes = attributes["changes"] if "deletions" in attributes: # pragma no branch - assert attributes["deletions"] is None or isinstance(attributes["deletions"], int), attributes["deletions"] + assert attributes["deletions"] is None or isinstance(attributes["deletions"], (int, long)), attributes["deletions"] self._deletions = attributes["deletions"] if "filename" in attributes: # pragma no branch assert attributes["filename"] is None or isinstance(attributes["filename"], (str, unicode)), attributes["filename"] diff --git a/github/Gist.py b/github/Gist.py index 9f6de4d1..aa5256d5 100644 --- a/github/Gist.py +++ b/github/Gist.py @@ -147,7 +147,7 @@ class Gist(GithubObject.GithubObject): self._useAttributes(data) def get_comment(self, id): - assert isinstance(id, int), id + assert isinstance(id, (int, long)), id headers, data = self._requester.requestAndCheck( "GET", self.url + "/comments/" + str(id), @@ -208,7 +208,7 @@ class Gist(GithubObject.GithubObject): def _useAttributes(self, attributes): if "comments" in attributes: # pragma no branch - assert attributes["comments"] is None or isinstance(attributes["comments"], int), attributes["comments"] + assert attributes["comments"] is None or isinstance(attributes["comments"], (int, long)), attributes["comments"] self._comments = attributes["comments"] if "created_at" in attributes: # pragma no branch assert attributes["created_at"] is None or isinstance(attributes["created_at"], (str, unicode)), attributes["created_at"] diff --git a/github/GistComment.py b/github/GistComment.py index aa8f73cb..6cd36d49 100644 --- a/github/GistComment.py +++ b/github/GistComment.py @@ -86,7 +86,7 @@ class GistComment(GithubObject.GithubObject): assert attributes["created_at"] is None or isinstance(attributes["created_at"], (str, unicode)), attributes["created_at"] self._created_at = self._parseDatetime(attributes["created_at"]) if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "updated_at" in attributes: # pragma no branch assert attributes["updated_at"] is None or isinstance(attributes["updated_at"], (str, unicode)), attributes["updated_at"] diff --git a/github/GistFile.py b/github/GistFile.py index 1b8aba3e..c5011dca 100644 --- a/github/GistFile.py +++ b/github/GistFile.py @@ -58,5 +58,5 @@ class GistFile(GithubObject.BasicGithubObject): assert attributes["raw_url"] is None or isinstance(attributes["raw_url"], (str, unicode)), attributes["raw_url"] self._raw_url = attributes["raw_url"] if "size" in attributes: # pragma no branch - assert attributes["size"] is None or isinstance(attributes["size"], int), attributes["size"] + assert attributes["size"] is None or isinstance(attributes["size"], (int, long)), attributes["size"] self._size = attributes["size"] diff --git a/github/GitBlob.py b/github/GitBlob.py index 19b10589..9ab38b92 100644 --- a/github/GitBlob.py +++ b/github/GitBlob.py @@ -60,7 +60,7 @@ class GitBlob(GithubObject.GithubObject): assert attributes["sha"] is None or isinstance(attributes["sha"], (str, unicode)), attributes["sha"] self._sha = attributes["sha"] if "size" in attributes: # pragma no branch - assert attributes["size"] is None or isinstance(attributes["size"], int), attributes["size"] + assert attributes["size"] is None or isinstance(attributes["size"], (int, long)), attributes["size"] self._size = attributes["size"] if "url" in attributes: # pragma no branch assert attributes["url"] is None or isinstance(attributes["url"], (str, unicode)), attributes["url"] diff --git a/github/GitTreeElement.py b/github/GitTreeElement.py index e2b1a63e..6d0aa9ae 100644 --- a/github/GitTreeElement.py +++ b/github/GitTreeElement.py @@ -60,7 +60,7 @@ class GitTreeElement(GithubObject.BasicGithubObject): assert attributes["sha"] is None or isinstance(attributes["sha"], (str, unicode)), attributes["sha"] self._sha = attributes["sha"] if "size" in attributes: # pragma no branch - assert attributes["size"] is None or isinstance(attributes["size"], int), attributes["size"] + assert attributes["size"] is None or isinstance(attributes["size"], (int, long)), attributes["size"] self._size = attributes["size"] if "type" in attributes: # pragma no branch assert attributes["type"] is None or isinstance(attributes["type"], (str, unicode)), attributes["type"] diff --git a/github/Hook.py b/github/Hook.py index 9a0af68e..86fc0918 100644 --- a/github/Hook.py +++ b/github/Hook.py @@ -132,7 +132,7 @@ class Hook(GithubObject.GithubObject): assert attributes["events"] is None or all(isinstance(element, (str, unicode)) for element in attributes["events"]), attributes["events"] self._events = attributes["events"] if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "last_response" in attributes: # pragma no branch assert attributes["last_response"] is None or isinstance(attributes["last_response"], dict), attributes["last_response"] diff --git a/github/HookResponse.py b/github/HookResponse.py index a5f174cf..a280c785 100644 --- a/github/HookResponse.py +++ b/github/HookResponse.py @@ -36,7 +36,7 @@ class HookResponse(GithubObject.BasicGithubObject): def _useAttributes(self, attributes): if "code" in attributes: # pragma no branch - assert attributes["code"] is None or isinstance(attributes["code"], int), attributes["code"] + assert attributes["code"] is None or isinstance(attributes["code"], (int, long)), attributes["code"] self._code = attributes["code"] if "message" in attributes: # pragma no branch assert attributes["message"] is None or isinstance(attributes["message"], (str, unicode)), attributes["message"] diff --git a/github/Issue.py b/github/Issue.py index 282a6765..fa50729b 100644 --- a/github/Issue.py +++ b/github/Issue.py @@ -176,7 +176,7 @@ class Issue(GithubObject.GithubObject): self._useAttributes(data) def get_comment(self, id): - assert isinstance(id, int), id + assert isinstance(id, (int, long)), id headers, data = self._requester.requestAndCheck( "GET", self._parentUrl(self.url) + "/comments/" + str(id), @@ -266,7 +266,7 @@ class Issue(GithubObject.GithubObject): assert attributes["closed_by"] is None or isinstance(attributes["closed_by"], dict), attributes["closed_by"] self._closed_by = None if attributes["closed_by"] is None else NamedUser.NamedUser(self._requester, attributes["closed_by"], completed=False) if "comments" in attributes: # pragma no branch - assert attributes["comments"] is None or isinstance(attributes["comments"], int), attributes["comments"] + assert attributes["comments"] is None or isinstance(attributes["comments"], (int, long)), attributes["comments"] self._comments = attributes["comments"] if "created_at" in attributes: # pragma no branch assert attributes["created_at"] is None or isinstance(attributes["created_at"], (str, unicode)), attributes["created_at"] @@ -275,7 +275,7 @@ class Issue(GithubObject.GithubObject): assert attributes["html_url"] is None or isinstance(attributes["html_url"], (str, unicode)), attributes["html_url"] self._html_url = attributes["html_url"] if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "labels" in attributes: # pragma no branch assert attributes["labels"] is None or all(isinstance(element, dict) for element in attributes["labels"]), attributes["labels"] @@ -287,7 +287,7 @@ class Issue(GithubObject.GithubObject): assert attributes["milestone"] is None or isinstance(attributes["milestone"], dict), attributes["milestone"] self._milestone = None if attributes["milestone"] is None else Milestone.Milestone(self._requester, attributes["milestone"], completed=False) if "number" in attributes: # pragma no branch - assert attributes["number"] is None or isinstance(attributes["number"], int), attributes["number"] + assert attributes["number"] is None or isinstance(attributes["number"], (int, long)), attributes["number"] self._number = attributes["number"] if "pull_request" in attributes: # pragma no branch assert attributes["pull_request"] is None or isinstance(attributes["pull_request"], dict), attributes["pull_request"] diff --git a/github/IssueComment.py b/github/IssueComment.py index 68d44d14..e8f779c4 100644 --- a/github/IssueComment.py +++ b/github/IssueComment.py @@ -86,7 +86,7 @@ class IssueComment(GithubObject.GithubObject): assert attributes["created_at"] is None or isinstance(attributes["created_at"], (str, unicode)), attributes["created_at"] self._created_at = self._parseDatetime(attributes["created_at"]) if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "updated_at" in attributes: # pragma no branch assert attributes["updated_at"] is None or isinstance(attributes["updated_at"], (str, unicode)), attributes["updated_at"] diff --git a/github/IssueEvent.py b/github/IssueEvent.py index 5839ae8f..7dd49336 100644 --- a/github/IssueEvent.py +++ b/github/IssueEvent.py @@ -78,7 +78,7 @@ class IssueEvent(GithubObject.GithubObject): assert attributes["event"] is None or isinstance(attributes["event"], (str, unicode)), attributes["event"] self._event = attributes["event"] if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "issue" in attributes: # pragma no branch assert attributes["issue"] is None or isinstance(attributes["issue"], dict), attributes["issue"] diff --git a/github/Legacy.py b/github/Legacy.py index e09c79dc..264a0796 100644 --- a/github/Legacy.py +++ b/github/Legacy.py @@ -39,7 +39,7 @@ class PaginatedList(PaginatedListBase): return self.get_page(page) def get_page(self, page): - assert isinstance(page, int), page + assert isinstance(page, (int, long)), page args = dict(self.__args) if page != 0: args["start_page"] = page + 1 diff --git a/github/Milestone.py b/github/Milestone.py index b2528665..18e01865 100644 --- a/github/Milestone.py +++ b/github/Milestone.py @@ -135,7 +135,7 @@ class Milestone(GithubObject.GithubObject): def _useAttributes(self, attributes): if "closed_issues" in attributes: # pragma no branch - assert attributes["closed_issues"] is None or isinstance(attributes["closed_issues"], int), attributes["closed_issues"] + assert attributes["closed_issues"] is None or isinstance(attributes["closed_issues"], (int, long)), attributes["closed_issues"] self._closed_issues = attributes["closed_issues"] if "created_at" in attributes: # pragma no branch assert attributes["created_at"] is None or isinstance(attributes["created_at"], (str, unicode)), attributes["created_at"] @@ -150,13 +150,13 @@ class Milestone(GithubObject.GithubObject): assert attributes["due_on"] is None or isinstance(attributes["due_on"], (str, unicode)), attributes["due_on"] self._due_on = self._parseDatetime(attributes["due_on"]) if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "number" in attributes: # pragma no branch - assert attributes["number"] is None or isinstance(attributes["number"], int), attributes["number"] + assert attributes["number"] is None or isinstance(attributes["number"], (int, long)), attributes["number"] self._number = attributes["number"] if "open_issues" in attributes: # pragma no branch - assert attributes["open_issues"] is None or isinstance(attributes["open_issues"], int), attributes["open_issues"] + assert attributes["open_issues"] is None or isinstance(attributes["open_issues"], (int, long)), attributes["open_issues"] self._open_issues = attributes["open_issues"] if "state" in attributes: # pragma no branch assert attributes["state"] is None or isinstance(attributes["state"], (str, unicode)), attributes["state"] diff --git a/github/NamedUser.py b/github/NamedUser.py index 03c079dd..8269e2a5 100644 --- a/github/NamedUser.py +++ b/github/NamedUser.py @@ -327,28 +327,28 @@ class NamedUser(GithubObject.GithubObject): assert attributes["blog"] is None or isinstance(attributes["blog"], (str, unicode)), attributes["blog"] self._blog = attributes["blog"] if "collaborators" in attributes: # pragma no branch - assert attributes["collaborators"] is None or isinstance(attributes["collaborators"], int), attributes["collaborators"] + assert attributes["collaborators"] is None or isinstance(attributes["collaborators"], (int, long)), attributes["collaborators"] self._collaborators = attributes["collaborators"] if "company" in attributes: # pragma no branch assert attributes["company"] is None or isinstance(attributes["company"], (str, unicode)), attributes["company"] self._company = attributes["company"] if "contributions" in attributes: # pragma no branch - assert attributes["contributions"] is None or isinstance(attributes["contributions"], int), attributes["contributions"] + assert attributes["contributions"] is None or isinstance(attributes["contributions"], (int, long)), attributes["contributions"] self._contributions = attributes["contributions"] if "created_at" in attributes: # pragma no branch assert attributes["created_at"] is None or isinstance(attributes["created_at"], (str, unicode)), attributes["created_at"] self._created_at = self._parseDatetime(attributes["created_at"]) if "disk_usage" in attributes: # pragma no branch - assert attributes["disk_usage"] is None or isinstance(attributes["disk_usage"], int), attributes["disk_usage"] + assert attributes["disk_usage"] is None or isinstance(attributes["disk_usage"], (int, long)), attributes["disk_usage"] self._disk_usage = attributes["disk_usage"] if "email" in attributes: # pragma no branch assert attributes["email"] is None or isinstance(attributes["email"], (str, unicode)), attributes["email"] self._email = attributes["email"] if "followers" in attributes: # pragma no branch - assert attributes["followers"] is None or isinstance(attributes["followers"], int), attributes["followers"] + assert attributes["followers"] is None or isinstance(attributes["followers"], (int, long)), attributes["followers"] self._followers = attributes["followers"] if "following" in attributes: # pragma no branch - assert attributes["following"] is None or isinstance(attributes["following"], int), attributes["following"] + assert attributes["following"] is None or isinstance(attributes["following"], (int, long)), attributes["following"] self._following = attributes["following"] if "gravatar_id" in attributes: # pragma no branch assert attributes["gravatar_id"] is None or isinstance(attributes["gravatar_id"], (str, unicode)), attributes["gravatar_id"] @@ -360,7 +360,7 @@ class NamedUser(GithubObject.GithubObject): assert attributes["html_url"] is None or isinstance(attributes["html_url"], (str, unicode)), attributes["html_url"] self._html_url = attributes["html_url"] if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "location" in attributes: # pragma no branch assert attributes["location"] is None or isinstance(attributes["location"], (str, unicode)), attributes["location"] @@ -372,22 +372,22 @@ class NamedUser(GithubObject.GithubObject): assert attributes["name"] is None or isinstance(attributes["name"], (str, unicode)), attributes["name"] self._name = attributes["name"] if "owned_private_repos" in attributes: # pragma no branch - assert attributes["owned_private_repos"] is None or isinstance(attributes["owned_private_repos"], int), attributes["owned_private_repos"] + assert attributes["owned_private_repos"] is None or isinstance(attributes["owned_private_repos"], (int, long)), attributes["owned_private_repos"] self._owned_private_repos = attributes["owned_private_repos"] if "plan" in attributes: # pragma no branch assert attributes["plan"] is None or isinstance(attributes["plan"], dict), attributes["plan"] self._plan = None if attributes["plan"] is None else Plan.Plan(self._requester, attributes["plan"], completed=False) if "private_gists" in attributes: # pragma no branch - assert attributes["private_gists"] is None or isinstance(attributes["private_gists"], int), attributes["private_gists"] + assert attributes["private_gists"] is None or isinstance(attributes["private_gists"], (int, long)), attributes["private_gists"] self._private_gists = attributes["private_gists"] if "public_gists" in attributes: # pragma no branch - assert attributes["public_gists"] is None or isinstance(attributes["public_gists"], int), attributes["public_gists"] + assert attributes["public_gists"] is None or isinstance(attributes["public_gists"], (int, long)), attributes["public_gists"] self._public_gists = attributes["public_gists"] if "public_repos" in attributes: # pragma no branch - assert attributes["public_repos"] is None or isinstance(attributes["public_repos"], int), attributes["public_repos"] + assert attributes["public_repos"] is None or isinstance(attributes["public_repos"], (int, long)), attributes["public_repos"] self._public_repos = attributes["public_repos"] if "total_private_repos" in attributes: # pragma no branch - assert attributes["total_private_repos"] is None or isinstance(attributes["total_private_repos"], int), attributes["total_private_repos"] + assert attributes["total_private_repos"] is None or isinstance(attributes["total_private_repos"], (int, long)), attributes["total_private_repos"] self._total_private_repos = attributes["total_private_repos"] if "type" in attributes: # pragma no branch assert attributes["type"] is None or isinstance(attributes["type"], (str, unicode)), attributes["type"] diff --git a/github/Organization.py b/github/Organization.py index a64134fc..af39d730 100644 --- a/github/Organization.py +++ b/github/Organization.py @@ -300,7 +300,7 @@ class Organization(GithubObject.GithubObject): ) def get_team(self, id): - assert isinstance(id, int), id + assert isinstance(id, (int, long)), id headers, data = self._requester.requestAndCheck( "GET", "/teams/" + str(id), @@ -392,7 +392,7 @@ class Organization(GithubObject.GithubObject): assert attributes["blog"] is None or isinstance(attributes["blog"], (str, unicode)), attributes["blog"] self._blog = attributes["blog"] if "collaborators" in attributes: # pragma no branch - assert attributes["collaborators"] is None or isinstance(attributes["collaborators"], int), attributes["collaborators"] + assert attributes["collaborators"] is None or isinstance(attributes["collaborators"], (int, long)), attributes["collaborators"] self._collaborators = attributes["collaborators"] if "company" in attributes: # pragma no branch assert attributes["company"] is None or isinstance(attributes["company"], (str, unicode)), attributes["company"] @@ -401,16 +401,16 @@ class Organization(GithubObject.GithubObject): assert attributes["created_at"] is None or isinstance(attributes["created_at"], (str, unicode)), attributes["created_at"] self._created_at = self._parseDatetime(attributes["created_at"]) if "disk_usage" in attributes: # pragma no branch - assert attributes["disk_usage"] is None or isinstance(attributes["disk_usage"], int), attributes["disk_usage"] + assert attributes["disk_usage"] is None or isinstance(attributes["disk_usage"], (int, long)), attributes["disk_usage"] self._disk_usage = attributes["disk_usage"] if "email" in attributes: # pragma no branch assert attributes["email"] is None or isinstance(attributes["email"], (str, unicode)), attributes["email"] self._email = attributes["email"] if "followers" in attributes: # pragma no branch - assert attributes["followers"] is None or isinstance(attributes["followers"], int), attributes["followers"] + assert attributes["followers"] is None or isinstance(attributes["followers"], (int, long)), attributes["followers"] self._followers = attributes["followers"] if "following" in attributes: # pragma no branch - assert attributes["following"] is None or isinstance(attributes["following"], int), attributes["following"] + assert attributes["following"] is None or isinstance(attributes["following"], (int, long)), attributes["following"] self._following = attributes["following"] if "gravatar_id" in attributes: # pragma no branch assert attributes["gravatar_id"] is None or isinstance(attributes["gravatar_id"], (str, unicode)), attributes["gravatar_id"] @@ -419,7 +419,7 @@ class Organization(GithubObject.GithubObject): assert attributes["html_url"] is None or isinstance(attributes["html_url"], (str, unicode)), attributes["html_url"] self._html_url = attributes["html_url"] if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "location" in attributes: # pragma no branch assert attributes["location"] is None or isinstance(attributes["location"], (str, unicode)), attributes["location"] @@ -431,22 +431,22 @@ class Organization(GithubObject.GithubObject): assert attributes["name"] is None or isinstance(attributes["name"], (str, unicode)), attributes["name"] self._name = attributes["name"] if "owned_private_repos" in attributes: # pragma no branch - assert attributes["owned_private_repos"] is None or isinstance(attributes["owned_private_repos"], int), attributes["owned_private_repos"] + assert attributes["owned_private_repos"] is None or isinstance(attributes["owned_private_repos"], (int, long)), attributes["owned_private_repos"] self._owned_private_repos = attributes["owned_private_repos"] if "plan" in attributes: # pragma no branch assert attributes["plan"] is None or isinstance(attributes["plan"], dict), attributes["plan"] self._plan = None if attributes["plan"] is None else Plan.Plan(self._requester, attributes["plan"], completed=False) if "private_gists" in attributes: # pragma no branch - assert attributes["private_gists"] is None or isinstance(attributes["private_gists"], int), attributes["private_gists"] + assert attributes["private_gists"] is None or isinstance(attributes["private_gists"], (int, long)), attributes["private_gists"] self._private_gists = attributes["private_gists"] if "public_gists" in attributes: # pragma no branch - assert attributes["public_gists"] is None or isinstance(attributes["public_gists"], int), attributes["public_gists"] + assert attributes["public_gists"] is None or isinstance(attributes["public_gists"], (int, long)), attributes["public_gists"] self._public_gists = attributes["public_gists"] if "public_repos" in attributes: # pragma no branch - assert attributes["public_repos"] is None or isinstance(attributes["public_repos"], int), attributes["public_repos"] + assert attributes["public_repos"] is None or isinstance(attributes["public_repos"], (int, long)), attributes["public_repos"] self._public_repos = attributes["public_repos"] if "total_private_repos" in attributes: # pragma no branch - assert attributes["total_private_repos"] is None or isinstance(attributes["total_private_repos"], int), attributes["total_private_repos"] + assert attributes["total_private_repos"] is None or isinstance(attributes["total_private_repos"], (int, long)), attributes["total_private_repos"] self._total_private_repos = attributes["total_private_repos"] if "type" in attributes: # pragma no branch assert attributes["type"] is None or isinstance(attributes["type"], (str, unicode)), attributes["type"] diff --git a/github/PaginatedList.py b/github/PaginatedList.py index 80703413..dc876ff2 100644 --- a/github/PaginatedList.py +++ b/github/PaginatedList.py @@ -22,7 +22,7 @@ class PaginatedListBase: def __getitem__(self, index): assert isinstance(index, (int, slice)) - if isinstance(index, int): + if isinstance(index, (int, long)): self.__fetchToIndex(index) return self.__elements[index] else: diff --git a/github/Plan.py b/github/Plan.py index 9c9d6055..a7b23ffe 100644 --- a/github/Plan.py +++ b/github/Plan.py @@ -41,14 +41,14 @@ class Plan(GithubObject.BasicGithubObject): def _useAttributes(self, attributes): if "collaborators" in attributes: # pragma no branch - assert attributes["collaborators"] is None or isinstance(attributes["collaborators"], int), attributes["collaborators"] + assert attributes["collaborators"] is None or isinstance(attributes["collaborators"], (int, long)), attributes["collaborators"] self._collaborators = attributes["collaborators"] if "name" in attributes: # pragma no branch assert attributes["name"] is None or isinstance(attributes["name"], (str, unicode)), attributes["name"] self._name = attributes["name"] if "private_repos" in attributes: # pragma no branch - assert attributes["private_repos"] is None or isinstance(attributes["private_repos"], int), attributes["private_repos"] + assert attributes["private_repos"] is None or isinstance(attributes["private_repos"], (int, long)), attributes["private_repos"] self._private_repos = attributes["private_repos"] if "space" in attributes: # pragma no branch - assert attributes["space"] is None or isinstance(attributes["space"], int), attributes["space"] + assert attributes["space"] is None or isinstance(attributes["space"], (int, long)), attributes["space"] self._space = attributes["space"] diff --git a/github/PullRequest.py b/github/PullRequest.py index eae51cf4..0304fcfc 100644 --- a/github/PullRequest.py +++ b/github/PullRequest.py @@ -168,7 +168,7 @@ class PullRequest(GithubObject.GithubObject): assert isinstance(body, (str, unicode)), body assert isinstance(commit_id, Commit.Commit), commit_id assert isinstance(path, (str, unicode)), path - assert isinstance(position, int), position + assert isinstance(position, (int, long)), position post_parameters = { "body": body, "commit_id": commit_id._identity, @@ -219,7 +219,7 @@ class PullRequest(GithubObject.GithubObject): return self.get_review_comment(id) def get_review_comment(self, id): - assert isinstance(id, int), id + assert isinstance(id, (int, long)), id headers, data = self._requester.requestAndCheck( "GET", self._parentUrl(self.url) + "/comments/" + str(id), @@ -256,7 +256,7 @@ class PullRequest(GithubObject.GithubObject): ) def get_issue_comment(self, id): - assert isinstance(id, int), id + assert isinstance(id, (int, long)), id headers, data = self._requester.requestAndCheck( "GET", self._parentUrl(self._parentUrl(self.url)) + "/issues/comments/" + str(id), @@ -326,7 +326,7 @@ class PullRequest(GithubObject.GithubObject): def _useAttributes(self, attributes): if "additions" in attributes: # pragma no branch - assert attributes["additions"] is None or isinstance(attributes["additions"], int), attributes["additions"] + assert attributes["additions"] is None or isinstance(attributes["additions"], (int, long)), attributes["additions"] self._additions = attributes["additions"] if "assignee" in attributes: # pragma no branch assert attributes["assignee"] is None or isinstance(attributes["assignee"], dict), attributes["assignee"] @@ -338,22 +338,22 @@ class PullRequest(GithubObject.GithubObject): assert attributes["body"] is None or isinstance(attributes["body"], (str, unicode)), attributes["body"] self._body = attributes["body"] if "changed_files" in attributes: # pragma no branch - assert attributes["changed_files"] is None or isinstance(attributes["changed_files"], int), attributes["changed_files"] + assert attributes["changed_files"] is None or isinstance(attributes["changed_files"], (int, long)), attributes["changed_files"] self._changed_files = attributes["changed_files"] if "closed_at" in attributes: # pragma no branch assert attributes["closed_at"] is None or isinstance(attributes["closed_at"], (str, unicode)), attributes["closed_at"] self._closed_at = self._parseDatetime(attributes["closed_at"]) if "comments" in attributes: # pragma no branch - assert attributes["comments"] is None or isinstance(attributes["comments"], int), attributes["comments"] + assert attributes["comments"] is None or isinstance(attributes["comments"], (int, long)), attributes["comments"] self._comments = attributes["comments"] if "commits" in attributes: # pragma no branch - assert attributes["commits"] is None or isinstance(attributes["commits"], int), attributes["commits"] + assert attributes["commits"] is None or isinstance(attributes["commits"], (int, long)), attributes["commits"] self._commits = attributes["commits"] if "created_at" in attributes: # pragma no branch assert attributes["created_at"] is None or isinstance(attributes["created_at"], (str, unicode)), attributes["created_at"] self._created_at = self._parseDatetime(attributes["created_at"]) if "deletions" in attributes: # pragma no branch - assert attributes["deletions"] is None or isinstance(attributes["deletions"], int), attributes["deletions"] + assert attributes["deletions"] is None or isinstance(attributes["deletions"], (int, long)), attributes["deletions"] self._deletions = attributes["deletions"] if "diff_url" in attributes: # pragma no branch assert attributes["diff_url"] is None or isinstance(attributes["diff_url"], (str, unicode)), attributes["diff_url"] @@ -365,7 +365,7 @@ class PullRequest(GithubObject.GithubObject): assert attributes["html_url"] is None or isinstance(attributes["html_url"], (str, unicode)), attributes["html_url"] self._html_url = attributes["html_url"] if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "issue_url" in attributes: # pragma no branch assert attributes["issue_url"] is None or isinstance(attributes["issue_url"], (str, unicode)), attributes["issue_url"] @@ -383,13 +383,13 @@ class PullRequest(GithubObject.GithubObject): assert attributes["merged_by"] is None or isinstance(attributes["merged_by"], dict), attributes["merged_by"] self._merged_by = None if attributes["merged_by"] is None else NamedUser.NamedUser(self._requester, attributes["merged_by"], completed=False) if "number" in attributes: # pragma no branch - assert attributes["number"] is None or isinstance(attributes["number"], int), attributes["number"] + assert attributes["number"] is None or isinstance(attributes["number"], (int, long)), attributes["number"] self._number = attributes["number"] if "patch_url" in attributes: # pragma no branch assert attributes["patch_url"] is None or isinstance(attributes["patch_url"], (str, unicode)), attributes["patch_url"] self._patch_url = attributes["patch_url"] if "review_comments" in attributes: # pragma no branch - assert attributes["review_comments"] is None or isinstance(attributes["review_comments"], int), attributes["review_comments"] + assert attributes["review_comments"] is None or isinstance(attributes["review_comments"], (int, long)), attributes["review_comments"] self._review_comments = attributes["review_comments"] if "state" in attributes: # pragma no branch assert attributes["state"] is None or isinstance(attributes["state"], (str, unicode)), attributes["state"] diff --git a/github/PullRequestComment.py b/github/PullRequestComment.py index 6e6eb2a6..d9768a0d 100644 --- a/github/PullRequestComment.py +++ b/github/PullRequestComment.py @@ -119,19 +119,19 @@ class PullRequestComment(GithubObject.GithubObject): assert attributes["created_at"] is None or isinstance(attributes["created_at"], (str, unicode)), attributes["created_at"] self._created_at = self._parseDatetime(attributes["created_at"]) if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "original_commit_id" in attributes: # pragma no branch assert attributes["original_commit_id"] is None or isinstance(attributes["original_commit_id"], (str, unicode)), attributes["original_commit_id"] self._original_commit_id = attributes["original_commit_id"] if "original_position" in attributes: # pragma no branch - assert attributes["original_position"] is None or isinstance(attributes["original_position"], int), attributes["original_position"] + assert attributes["original_position"] is None or isinstance(attributes["original_position"], (int, long)), attributes["original_position"] self._original_position = attributes["original_position"] if "path" in attributes: # pragma no branch assert attributes["path"] is None or isinstance(attributes["path"], (str, unicode)), attributes["path"] self._path = attributes["path"] if "position" in attributes: # pragma no branch - assert attributes["position"] is None or isinstance(attributes["position"], int), attributes["position"] + assert attributes["position"] is None or isinstance(attributes["position"], (int, long)), attributes["position"] self._position = attributes["position"] if "updated_at" in attributes: # pragma no branch assert attributes["updated_at"] is None or isinstance(attributes["updated_at"], (str, unicode)), attributes["updated_at"] diff --git a/github/Repository.py b/github/Repository.py index b8311270..c4413a79 100644 --- a/github/Repository.py +++ b/github/Repository.py @@ -222,7 +222,7 @@ class Repository(GithubObject.GithubObject): def create_download(self, name, size, description=GithubObject.NotSet, content_type=GithubObject.NotSet): assert isinstance(name, (str, unicode)), name - assert isinstance(size, int), size + assert isinstance(size, (int, long)), size assert description is GithubObject.NotSet or isinstance(description, (str, unicode)), description assert content_type is GithubObject.NotSet or isinstance(content_type, (str, unicode)), content_type post_parameters = { @@ -550,7 +550,7 @@ class Repository(GithubObject.GithubObject): ) def get_comment(self, id): - assert isinstance(id, int), id + assert isinstance(id, (int, long)), id headers, data = self._requester.requestAndCheck( "GET", self.url + "/comments/" + str(id), @@ -611,7 +611,7 @@ class Repository(GithubObject.GithubObject): ) def get_download(self, id): - assert isinstance(id, int), id + assert isinstance(id, (int, long)), id headers, data = self._requester.requestAndCheck( "GET", self.url + "/downloads/" + str(id), @@ -710,7 +710,7 @@ class Repository(GithubObject.GithubObject): return GitTree.GitTree(self._requester, data, completed=True) def get_hook(self, id): - assert isinstance(id, int), id + assert isinstance(id, (int, long)), id headers, data = self._requester.requestAndCheck( "GET", self.url + "/hooks/" + str(id), @@ -728,7 +728,7 @@ class Repository(GithubObject.GithubObject): ) def get_issue(self, number): - assert isinstance(number, int), number + assert isinstance(number, (int, long)), number headers, data = self._requester.requestAndCheck( "GET", self.url + "/issues/" + str(number), @@ -777,7 +777,7 @@ class Repository(GithubObject.GithubObject): ) def get_issues_event(self, id): - assert isinstance(id, int), id + assert isinstance(id, (int, long)), id headers, data = self._requester.requestAndCheck( "GET", self.url + "/issues/events/" + str(id), @@ -795,7 +795,7 @@ class Repository(GithubObject.GithubObject): ) def get_key(self, id): - assert isinstance(id, int), id + assert isinstance(id, (int, long)), id headers, data = self._requester.requestAndCheck( "GET", self.url + "/keys/" + str(id), @@ -840,7 +840,7 @@ class Repository(GithubObject.GithubObject): return data def get_milestone(self, number): - assert isinstance(number, int), number + assert isinstance(number, (int, long)), number headers, data = self._requester.requestAndCheck( "GET", self.url + "/milestones/" + str(number), @@ -876,7 +876,7 @@ class Repository(GithubObject.GithubObject): ) def get_pull(self, number): - assert isinstance(number, int), number + assert isinstance(number, (int, long)), number headers, data = self._requester.requestAndCheck( "GET", self.url + "/pulls/" + str(number), @@ -1060,7 +1060,7 @@ class Repository(GithubObject.GithubObject): assert attributes["fork"] is None or isinstance(attributes["fork"], bool), attributes["fork"] self._fork = attributes["fork"] if "forks" in attributes: # pragma no branch - assert attributes["forks"] is None or isinstance(attributes["forks"], int), attributes["forks"] + assert attributes["forks"] is None or isinstance(attributes["forks"], (int, long)), attributes["forks"] self._forks = attributes["forks"] if "full_name" in attributes: # pragma no branch assert attributes["full_name"] is None or isinstance(attributes["full_name"], (str, unicode)), attributes["full_name"] @@ -1084,7 +1084,7 @@ class Repository(GithubObject.GithubObject): assert attributes["html_url"] is None or isinstance(attributes["html_url"], (str, unicode)), attributes["html_url"] self._html_url = attributes["html_url"] if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "language" in attributes: # pragma no branch assert attributes["language"] is None or isinstance(attributes["language"], (str, unicode)), attributes["language"] @@ -1096,7 +1096,7 @@ class Repository(GithubObject.GithubObject): assert attributes["name"] is None or isinstance(attributes["name"], (str, unicode)), attributes["name"] self._name = attributes["name"] if "open_issues" in attributes: # pragma no branch - assert attributes["open_issues"] is None or isinstance(attributes["open_issues"], int), attributes["open_issues"] + assert attributes["open_issues"] is None or isinstance(attributes["open_issues"], (int, long)), attributes["open_issues"] self._open_issues = attributes["open_issues"] if "organization" in attributes: # pragma no branch assert attributes["organization"] is None or isinstance(attributes["organization"], dict), attributes["organization"] @@ -1117,7 +1117,7 @@ class Repository(GithubObject.GithubObject): assert attributes["pushed_at"] is None or isinstance(attributes["pushed_at"], (str, unicode)), attributes["pushed_at"] self._pushed_at = self._parseDatetime(attributes["pushed_at"]) if "size" in attributes: # pragma no branch - assert attributes["size"] is None or isinstance(attributes["size"], int), attributes["size"] + assert attributes["size"] is None or isinstance(attributes["size"], (int, long)), attributes["size"] self._size = attributes["size"] if "source" in attributes: # pragma no branch assert attributes["source"] is None or isinstance(attributes["source"], dict), attributes["source"] @@ -1135,5 +1135,5 @@ class Repository(GithubObject.GithubObject): assert attributes["url"] is None or isinstance(attributes["url"], (str, unicode)), attributes["url"] self._url = attributes["url"] if "watchers" in attributes: # pragma no branch - assert attributes["watchers"] is None or isinstance(attributes["watchers"], int), attributes["watchers"] + assert attributes["watchers"] is None or isinstance(attributes["watchers"], (int, long)), attributes["watchers"] self._watchers = attributes["watchers"] diff --git a/github/RepositoryKey.py b/github/RepositoryKey.py index ef92ad80..dc759180 100644 --- a/github/RepositoryKey.py +++ b/github/RepositoryKey.py @@ -83,7 +83,7 @@ class RepositoryKey(GithubObject.GithubObject): def _useAttributes(self, attributes): if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "key" in attributes: # pragma no branch assert attributes["key"] is None or isinstance(attributes["key"], (str, unicode)), attributes["key"] diff --git a/github/Team.py b/github/Team.py index b89a5ba8..9dea6f09 100644 --- a/github/Team.py +++ b/github/Team.py @@ -161,10 +161,10 @@ class Team(GithubObject.GithubObject): def _useAttributes(self, attributes): if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "members_count" in attributes: # pragma no branch - assert attributes["members_count"] is None or isinstance(attributes["members_count"], int), attributes["members_count"] + assert attributes["members_count"] is None or isinstance(attributes["members_count"], (int, long)), attributes["members_count"] self._members_count = attributes["members_count"] if "name" in attributes: # pragma no branch assert attributes["name"] is None or isinstance(attributes["name"], (str, unicode)), attributes["name"] @@ -173,7 +173,7 @@ class Team(GithubObject.GithubObject): assert attributes["permission"] is None or isinstance(attributes["permission"], (str, unicode)), attributes["permission"] self._permission = attributes["permission"] if "repos_count" in attributes: # pragma no branch - assert attributes["repos_count"] is None or isinstance(attributes["repos_count"], int), attributes["repos_count"] + assert attributes["repos_count"] is None or isinstance(attributes["repos_count"], (int, long)), attributes["repos_count"] self._repos_count = attributes["repos_count"] if "url" in attributes: # pragma no branch assert attributes["url"] is None or isinstance(attributes["url"], (str, unicode)), attributes["url"] diff --git a/github/UserKey.py b/github/UserKey.py index ed2691af..53ca3841 100644 --- a/github/UserKey.py +++ b/github/UserKey.py @@ -75,7 +75,7 @@ class UserKey(GithubObject.GithubObject): def _useAttributes(self, attributes): if "id" in attributes: # pragma no branch - assert attributes["id"] is None or isinstance(attributes["id"], int), attributes["id"] + assert attributes["id"] is None or isinstance(attributes["id"], (int, long)), attributes["id"] self._id = attributes["id"] if "key" in attributes: # pragma no branch assert attributes["key"] is None or isinstance(attributes["key"], (str, unicode)), attributes["key"]