some small fixes, adding issues to the main github object.

mpdaugherty · mpdaugherty · commit bef579a6e315 · 2012-05-17T12:46:21.000+08:00
diff --git a/pygithub3/github.py b/pygithub3/github.py
@@ -18,11 +18,13 @@ def __init__(self, **config):
         from pygithub3.services.repos import Repo
         from pygithub3.services.gists import Gist
         from pygithub3.services.git_data import GitData
+        from pygithub3.services.issues import Issue
         from pygithub3.services.pull_requests import PullRequests
         self._users = User(**config)
         self._repos = Repo(**config)
         self._gists = Gist(**config)
         self._git_data = GitData(**config)
+        self._issues = Issue(**config)
         self._pull_requests = PullRequests(**config)
 
     @property
@@ -59,6 +61,13 @@ def git_data(self):
         """
         return self._git_data
 
+    @property
+    def issues(self):
+        """
+        :ref:`Github Issues service <Issues service>`
+        """
+        return self._issues
+
     @property
     def pull_requests(self):
         """
diff --git a/pygithub3/requests/issues/milestones.py b/pygithub3/requests/issues/milestones.py
@@ -5,11 +5,11 @@
 
 class List(Request):
 
-    uri = 'issues/{user}/{repo}/milestones'
+    uri = 'repos/{user}/{repo}/milestones'
     resource = Milestone
 
 
 class Get(Request):
 
-    uri = 'issues/{user}/{repo}/milestones/{number}'
+    uri = 'repos/{user}/{repo}/milestones/{number}'
     resource = Milestone
diff --git a/pygithub3/resources/issues.py b/pygithub3/resources/issues.py
@@ -3,21 +3,26 @@
 
 from .base import Resource
 from .users import User
+from .pull_requests import PullRequest
 
 
-class Issue(Resource):
-
-    _dates = ('created_at', 'updated_at', )
-    _maps = {'pull_request': ..., 'milestone': Milestone, 'assignee': User, 'user': User}
-    _collection_maps = {'labels': ..., }
-
-    def __str__(self):
-        return '<Issue (%s)>' % getattr(self, 'title', '')
-
 class Milestone(Resource):
 
     _dates = ('created_at', )
     _maps = {'creator': User}
 
     def __str__(self):
         return '<Milestone (%s)>' % getattr(self, 'description', '')
+
+class Label(Resource):
+    def __str__(self):
+        return '<Label (%s)>' % getattr(self, 'name', '')
+
+class Issue(Resource):
+
+    _dates = ('created_at', 'updated_at', )
+    _maps = {'pull_request': PullRequest, 'milestone': Milestone, 'assignee': User, 'user': User}
+    _collection_maps = {'labels': Label, }
+
+    def __str__(self):
+        return '<Issue (%s)>' % getattr(self, 'title', '')
diff --git a/pygithub3/services/issues/milestones.py b/pygithub3/services/issues/milestones.py
@@ -9,15 +9,18 @@ class Milestones(Service):
     <http://developer.github.com/v3/issues/milestones>`_
     """
 
-    def list(self, user=None, repo=None):
+    def list(self, user=None, repo=None, state='open', sort='due_date', direction='desc'):
         """ Get a repository's issues
 
         :param str user: Username
         :param str repo: Repo Name
+        :param str state: Filter out milestones only in a certain state.  Options: open, closed.  Default: open
+        :param str sort: Options: 'due_date', 'completeness'  Default: 'due_date'
+        :param str direction: Options: 'asc', 'desc'  Default: 'desc'
         :returns: A :doc:`result`
         """
         request = self.request_builder('issues.milestones.list', user=user, repo=repo)
-        return self._get_result(request, **self._get_mimetype_as_header())
+        return self._get_result(request)
 
     def get(self, number, user=None, repo=None):
         """ Get a single milestone
diff --git a/pygithub3/tests/services/test_issues.py b/pygithub3/tests/services/test_issues.py
@@ -38,8 +38,10 @@ def test_LIST_with_user_and_repo(self, request_method):
             ('get', _('repos/octocat/Hello-World/milestones')))
 
     def test_LIST_with_state(self, request_method):
-        # Fail for now; I don't know how to do this test yet
-        self.ms.abc()
+        request_method.return_value = mock_response_result()
+        self.ms.list(user='octocat', repo='Hello-World', state='closed').all()
+        self.assertEqual(request_method.call_args[0],
+            ('get', _('repos/octocat/Hello-World/milestones')))
 
     def test_GET(self, request_method):
 
