Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5c666bb

Browse files
committed
Fix up User usage in organizations
1 parent361824d commit5c666bb

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

‎github3/events.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class EventUser(GitHubCore):
1818

1919
def_update_attributes(self,user):
2020
self.avatar_url=user['avatar_url']
21-
self.display_login=user['display_login']
21+
self.display_login=user.get('display_login')
2222
self.gravatar_id=user['id']
2323
self.id=user['id']
2424
self.login=user['login']

‎github3/orgs.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313

1414
fromuritemplateimportURITemplate
1515

16+
from .importusers
17+
1618
from .decoratorsimportrequires_auth
1719
from .eventsimportEvent
1820
from .modelsimportBaseAccount,GitHubCore
1921
from .reposimportRepository
20-
from .usersimportUser
2122

2223

2324
classTeam(GitHubCore):
@@ -176,8 +177,8 @@ def members(self, role=None, number=-1, etag=None):
176177
params['role']=role
177178
headers['Accept']='application/vnd.github.ironman-preview+json'
178179
url=self._build_url('members',base_url=self._api)
179-
returnself._iter(int(number),url,User,params=params,etag=etag,
180-
headers=headers)
180+
returnself._iter(int(number),url,users.ShortUser,params=params,
181+
etag=etag,headers=headers)
181182

182183
@requires_auth
183184
defrepositories(self,number=-1,etag=None):
@@ -532,8 +533,8 @@ def members(self, filter=None, role=None, number=-1, etag=None):
532533
params['role']=role
533534
headers['Accept']='application/vnd.github.ironman-preview+json'
534535
url=self._build_url('members',base_url=self._api)
535-
returnself._iter(int(number),url,User,params=params,etag=etag,
536-
headers=headers)
536+
returnself._iter(int(number),url,users.ShortUser,params=params,
537+
etag=etag,headers=headers)
537538

538539
defpublic_members(self,number=-1,etag=None):
539540
r"""Iterate over public members of this organization.
@@ -545,7 +546,7 @@ def public_members(self, number=-1, etag=None):
545546
:returns: generator of :class:`User <github3.users.User>`\ s
546547
"""
547548
url=self._build_url('public_members',base_url=self._api)
548-
returnself._iter(int(number),url,User,etag=etag)
549+
returnself._iter(int(number),url,users.ShortUser,etag=etag)
549550

550551
defrepositories(self,type='',number=-1,etag=None):
551552
r"""Iterate over repos for this organization.

‎tests/integration/test_orgs.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def test_conceal_member(self):
6767

6868
# Get a public member of the organization
6969
public_member=next(o.public_members())
70-
assertisinstance(public_member,github3.users.User)
70+
assertisinstance(public_member,github3.users.ShortUser)
7171

7272
# Conceal their membership
7373
asserto.conceal_member(public_member)isTrue
@@ -149,7 +149,7 @@ def test_members(self):
149149
o=self.get_organization()
150150

151151
formemberino.members():
152-
assertisinstance(member,github3.users.User)
152+
assertisinstance(member,github3.users.ShortUser)
153153

154154
@pytest.mark.xfail(
155155
reason="sigmavirus24 needs to actually write a test for this."
@@ -166,7 +166,7 @@ def test_can_filter_organization_members(self):
166166
o=self.get_organization()
167167

168168
formemberino.members(filter='2fa_disabled'):
169-
assertisinstance(member,github3.users.User)
169+
assertisinstance(member,github3.users.ShortUser)
170170

171171
deftest_can_filter_members_by_role(self):
172172
"""Test the ability to filter an organization's members by role."""
@@ -176,7 +176,7 @@ def test_can_filter_members_by_role(self):
176176
o=self.get_organization()
177177

178178
formemberino.members(role='all'):
179-
assertisinstance(member,github3.users.User)
179+
assertisinstance(member,github3.users.ShortUser)
180180

181181
deftest_public_members(self):
182182
"""Test the ability to retrieve an organization's public members."""
@@ -186,7 +186,7 @@ def test_public_members(self):
186186
o=self.get_organization()
187187

188188
formemberino.public_members():
189-
assertisinstance(member,github3.users.User)
189+
assertisinstance(member,github3.users.ShortUser)
190190

191191
deftest_repositories(self):
192192
"""Test the ability to retrieve an organization's repositories."""

‎tests/integration/test_orgs_team.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def test_members(self):
8686
withself.recorder.use_cassette(cassette_name):
8787
t=self.get_team()
8888
formemberint.members():
89-
assertisinstance(member,github3.users.User)
89+
assertisinstance(member,github3.users.ShortUser)
9090

9191
deftest_can_filter_members_by_role(self):
9292
"""Test the ability to filter an team's members by role."""
@@ -95,7 +95,7 @@ def test_can_filter_members_by_role(self):
9595
withself.recorder.use_cassette(cassette_name):
9696
t=self.get_team()
9797
formemberint.members(role='all'):
98-
assertisinstance(member,github3.users.User)
98+
assertisinstance(member,github3.users.ShortUser)
9999

100100
deftest_repositories(self):
101101
"""Show that a user can retrieve a team's repositories."""

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp