Update to support Organization#all_events

sigmavirus24 · sigmavirus24 · commit ab3486b54254 · 2016-12-19T19:30:48.000-06:00
Instead of munging a urlparse.ParseResult object, let's just create our
new URL for the all_events method using _build_url. Further, let's
appropriately use a signature that mirrors the docstring - making
username *required*.
diff --git a/github3/orgs.py b/github3/orgs.py
@@ -267,11 +267,6 @@ class Organization(BaseAccount):
     # Roles available to members in an organization.
     members_roles = frozenset(['all', 'admin', 'member'])
 
-    def _all_events_url(self, username):
-        url_parts = list(self._uri)
-        url_parts[2] = 'users/{}/events{}'.format(username, url_parts[2])
-        return self._uri.__class__(*url_parts).geturl()
-
     def _update_attributes(self, org):
         super(Organization, self)._update_attributes(org)
         self.type = self.type or 'Organization'
@@ -470,18 +465,18 @@ def is_public_member(self, username):
         url = self._build_url('public_members', username, base_url=self._api)
         return self._boolean(self._get(url), 204, 404)
 
-    def all_events(self, number=-1, etag=None, username=None):
+    def all_events(self, username, number=-1, etag=None):
         r"""Iterate over all org events visible to the authenticated user.
 
+        :param str username: (required), the username of the currently
+            authenticated user.
         :param int number: (optional), number of events to return. Default: -1
             iterates over all events available.
         :param str etag: (optional), ETag from a previous request to the same
             endpoint
-        :param str username: (required), the username of the currently
-            authenticated user.
         :returns: generator of :class:`Event <github3.events.Event>`\ s
         """
-        url = self._all_events_url(username)
+        url = self._build_url('users', username, 'events', 'orgs', self.login)
         return self._iter(int(number), url, Event, etag=etag)
 
     def events(self, number=-1, etag=None):
diff --git a/tests/unit/test_orgs.py b/tests/unit/test_orgs.py
@@ -213,7 +213,8 @@ class TestOrganizationIterator(helper.UnitIteratorHelper):
     described_class = Organization
 
     example_data = {
-        'url': url_for()
+        'url': url_for(),
+        'login': 'github',
     }
 
     def test_all_events(self):

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,8 @@ class TestOrganizationIterator(helper.UnitIteratorHelper):`
`213`	`213`	`described_class = Organization`
`214`	`214`
`215`	`215`	`example_data = {`
`216`		`- 'url': url_for()`
	`216`	`+ 'url': url_for(),`
	`217`	`+ 'login': 'github',`
`217`	`218`	`}`
`218`	`219`
`219`	`220`	`def test_all_events(self):`