From 38b34db56e929d8a815fd0fa34643666799b8a24 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Sun, 26 Apr 2020 12:02:34 +1000
Subject: [PATCH] AuthenticatedUser.get_organization_membership() should be str
 (#1473)

---
 github/AuthenticatedUser.py                          |  4 ++--
 tests/GitMembership.py                               |  6 +-----
 tests/ReplayData/GitMembership.setUp.txt             | 10 ----------
 tests/ReplayData/GitMembership.testGetMembership.txt |  2 +-
 4 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 tests/ReplayData/GitMembership.setUp.txt

diff --git a/github/AuthenticatedUser.py b/github/AuthenticatedUser.py
index 733ced57..dacbd664 100644
--- a/github/AuthenticatedUser.py
+++ b/github/AuthenticatedUser.py
@@ -1307,9 +1307,9 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject):
         :calls: `GET /user/memberships/orgs/:org <https://developer.github.com/v3/orgs/members/#get-your-organization-membership>`_
         :rtype: :class:`github.Membership.Membership`
         """
-        assert isinstance(org, int)
+        assert isinstance(org, str)
         headers, data = self._requester.requestJsonAndCheck(
-            "GET", "/user/memberships/orgs/" + str(org)
+            "GET", "/user/memberships/orgs/" + org
         )
         return github.Membership.Membership(
             self._requester, headers, data, completed=True
diff --git a/tests/GitMembership.py b/tests/GitMembership.py
index 4577fbbf..1dafae3b 100644
--- a/tests/GitMembership.py
+++ b/tests/GitMembership.py
@@ -44,14 +44,10 @@ from . import Framework
 
 
 class GitMembership(Framework.TestCase):
-    def setUp(self):
-        super().setUp()
-        self.org = self.g.get_organization("github")
-
     def testGetMembership(self):
         octocat = self.g.get_user()
         self.assertEqual(octocat.login, "octocat")
-        membership_data = octocat.get_organization_membership(self.org.id)
+        membership_data = octocat.get_organization_membership("github")
         self.assertEqual(membership_data.user.login, "octocat")
         self.assertEqual(membership_data.role, "admin")
         self.assertEqual(membership_data.organization.login, "github")
diff --git a/tests/ReplayData/GitMembership.setUp.txt b/tests/ReplayData/GitMembership.setUp.txt
deleted file mode 100644
index dc0c36ec..00000000
--- a/tests/ReplayData/GitMembership.setUp.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-https
-GET
-api.github.com
-None
-/orgs/github
-{'Authorization': 'Basic login_and_password_removed', 'User-Agent': 'PyGithub/Python'}
-None
-200
-[('status', '200 OK'), ('x-ratelimit-remaining', '4969'), ('content-length', '716'), ('server', 'nginx/1.0.13'), ('connection', 'keep-alive'), ('x-ratelimit-limit', '5000'), ('etag', '"d1b89d0f179a7977b3521babf470b71e"'), ('date', 'Sat, 26 May 2012 20:13:58 GMT'), ('content-type', 'application/json; charset=utf-8')]
-{"login":"github","id":1,"node_id":"MDEyOk9yZ2FuaXphdGlvbjE=","url":"https://api.github.com/orgs/github","repos_url":"https://api.github.com/orgs/github/repos","events_url":"https://api.github.com/orgs/github/events","hooks_url":"https://api.github.com/orgs/github/hooks","issues_url":"https://api.github.com/orgs/github/issues","members_url":"https://api.github.com/orgs/github/members{/member}","public_members_url":"https://api.github.com/orgs/github/public_members{/member}","avatar_url":"https://github.com/images/error/octocat_happy.gif","description":"A great organization","name":"github","company":"GitHub","blog":"https://github.com/blog","location":"San Francisco","email":"octocat@github.com","is_verified":true,"has_organization_projects":true,"has_repository_projects":true,"public_repos":2,"public_gists":1,"followers":20,"following":0,"html_url":"https://github.com/octocat","created_at":"2008-01-14T04:33:35Z","type":"Organization","total_private_repos":100,"owned_private_repos":100,"private_gists":81,"disk_usage":10000,"collaborators":8,"billing_email":"support@github.com","plan":{"name":"Medium","space":400,"private_repos":20},"default_repository_settings":"read","members_can_create_repositories":true,"two_factor_requirement_enabled":true,"members_allowed_repository_creation_type":"all"}
diff --git a/tests/ReplayData/GitMembership.testGetMembership.txt b/tests/ReplayData/GitMembership.testGetMembership.txt
index b9fe4ce6..9bca4bcf 100644
--- a/tests/ReplayData/GitMembership.testGetMembership.txt
+++ b/tests/ReplayData/GitMembership.testGetMembership.txt
@@ -13,7 +13,7 @@ https
 GET
 api.github.com
 None
-/user/memberships/orgs/1
+/user/memberships/orgs/github
 {'Authorization': 'Basic login_and_password_removed', 'User-Agent': 'PyGithub/Python'}
 None
 200