8000 Merge pull request #413 from mwielgoszewski/develop · Teino1978-Corp/github3.py@c04637a · GitHub
[go: up one dir, main page]

Skip to content

Commit c04637a

Browse files
committed
Merge pull request sigmavirus24#413 from mwielgoszewski/develop
Update Organization API to allow filtering members with 2fa_disabled
2 parents 9c4b0e7 + 1dea969 commit c04637a

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

AUTHORS.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,5 @@ Contributors
9696
- Paulus Schoutsen (@balloob)
9797

9898
- Nolan Bruabker (@nrb)
99+
100+
- Marcin Wielgoszewski (@mwielgoszewski)

github3/orgs.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -143,24 +143,17 @@ def is_member(self, username):
143143
return self._boolean(self._get(url), 204, 404)
144144

145145
@requires_auth
146-
def members(self, filter=None, number=-1, etag=None):
146+
def members(self, number=-1, etag=None):
147147
r"""Iterate over the members of this team.
148148
149-
:param str filter: (optional), filter members returned by this method.
150-
Can be one of: ``"2fa_disabled"``, ``"all",``. Default: ``"all"``.
151-
Filtering by ``"2fa_disabled"`` is only available for organization
152-
owners with private repositories.
153149
:param int number: (optional), number of users to iterate over.
154150
Default: -1 iterates over all values
155151
:param str etag: (optional), ETag from a previous request to the same
156152
endpoint
157153
:returns: generator of :class:`User <github3.users.User>`\ s
158154
"""
159-
params = {}
160-
if filter in set(["2fa_disabled", "all"]):
161-
params['filter'] = filter
162155
url = self._build_url('members', base_url=self._api)
163-
return self._iter(int(number), url, User, params=params, etag=etag)
156+
return self._iter(int(number), url, User, etag=etag)
164157

165158
@requires_auth
166159
def repositories(self, number=-1, etag=None):
@@ -451,17 +444,24 @@ def events(self, number=-1, etag=None):
451444
url = self._build_url('events', base_url=self._api)
452445
return self._iter(int(number), url, Event, etag=etag)
453446

454-
def members(self, number=-1, etag=None):
447+
def members(self, filter=None, number=-1, etag=None):
455448
r"""Iterate over members of this organization.
456449
450+
:param str filter: (optional), filter members returned by this method.
451+
Can be one of: ``"2fa_disabled"``, ``"all",``. Default: ``"all"``.
452+
Filtering by ``"2fa_disabled"`` is only available for organization
453+
owners with private repositories.
457454
:param int number: (optional), number of members to return. Default:
458455
-1 will return all available.
459456
:param str etag: (optional), ETag from a previous request to the same
460457
endpoint
461458
:returns: generator of :class:`User <github3.users.User>`\ s
462459
"""
460+
params = {}
461+
if filter in set(["2fa_disabled", "all"]):
462+
params['filter'] = filter
463463
url = self._build_url('members', base_url=self._api)
464-
return self._iter(int(number), url, User, etag=etag)
464+
return self._iter(int(number), url, User, params=params, etag=etag)
465465

466466
def public_members(self, number=-1, etag=None):
467467
r"""Iterate over public members of this organization.

0 commit comments

Comments
 (0)
0