Singular. services.events.Events -> Event

copitux · copitux · commit 910c05315acd · 2012-09-20T18:04:06.000+02:00
diff --git a/pygithub3/services/events/__init__.py b/pygithub3/services/events/__init__.py
@@ -5,46 +5,20 @@
 from pygithub3.services.events import networks, orgs, repos, users
 
 
-class Events(Service):
+class Event(Service):
     """ Consume `Events API <http://developer.github.com/v3/events>`_
 
     The events API supports pagination, but with a fixed page size of 30; In
     addition, fetching up to ten pages is supported, for a total of 300 events.
-
     """
 
     def __init__(self, **config):
-        self._issues = issues.events.Events(**config)
-        self._networks = networks.Network(**config)
-        self._orgs = orgs.Org(**config)
-        self._repos = repos.Repo(**config)
-        self._users = users.User(**config)
-        super(Events, self).__init__(**config)
-
-    @property
-    def issues(self):
-        """ Events for Issues """
-        return self._issues
-
-    @property
-    def networks(self):
-        """ Events for a Network of Repositories """
-        return self._networks
-
-    @property
-    def orgs(self):
-        """ Events for an Organization """
-        return self._orgs
-
-    @property
-    def repos(self):
-        """ Events for Repos """
-        return self._repos
-
-    @property
-    def users(self):
-        """ Events for Users """
-        return self._users
+        self.issues = issues.events.Events(**config)
+        self.networks = networks.Network(**config)
+        self.orgs = orgs.Org(**config)
+        self.repos = repos.Repo(**config)
+        self.users = users.User(**config)
+        super(Event, self).__init__(**config)
 
     def list(self):
         """ List all public events.
diff --git a/pygithub3/tests/services/test_events.py b/pygithub3/tests/services/test_events.py
@@ -4,7 +4,7 @@
 from mock import patch
 
 from pygithub3.tests.utils.core import TestCase
-from pygithub3.services.events import Events
+from pygithub3.services.events import Event
 from pygithub3.tests.utils.base import (mock_response_result, dummy_json)
 from pygithub3.tests.utils.services import _
 
@@ -14,7 +14,7 @@
 class TestEventsService(TestCase):
 
     def setUp(self):
-        self.events = Events()
+        self.events = Event()
 
     def test_LIST(self, request_method):
         request_method.return_value = mock_response_result()
@@ -27,7 +27,7 @@ def test_LIST(self, request_method):
 class TestRepoEventsService(TestCase):
 
     def setUp(self):
-        self.events = Events()
+        self.events = Event()
 
     def test_LIST(self, request_method):
         request_method.return_value = mock_response_result()
@@ -41,7 +41,7 @@ def test_LIST(self, request_method):
 class TestNetworkEventsService(TestCase):
 
     def setUp(self):
-        self.events = Events()
+        self.events = Event()
 
     def test_LIST(self, request_method):
         request_method.return_value = mock_response_result()
@@ -55,7 +55,7 @@ def test_LIST(self, request_method):
 class TestOrgsEventsService(TestCase):
 
     def setUp(self):
-        self.events = Events()
+        self.events = Event()
 
     def test_LIST(self, request_method):
         request_method.return_value = mock_response_result()
@@ -69,7 +69,7 @@ def test_LIST(self, request_method):
 class TestUserEventsService(TestCase):
 
     def setUp(self):
-        self.events = Events()
+        self.events = Event()
 
     def test_LIST_received(self, request_method):
         request_method.return_value = mock_response_result()
