Skip to content

Commit b928c9f

Browse files
copituxcopitux
committed
Fix requests with invalid config precedence
1 parent b9ad335 commit b928c9f

7 files changed

Lines changed: 19 additions & 45 deletions

File tree

‎pygithub3/services/repos/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def list(self, user=None, type='all'):
4242
repo_service.list('copitux', type='owner')
4343
repo_service.list(type='private')
4444
"""
45-
request = self.make_request('repos.list', user=user)
45+
request = self.request_builder('repos.list', user=user)
4646
return self._get_result(request, type=type)
4747

4848
def list_by_org(self, org, type='all'):

‎pygithub3/services/repos/forks.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def create(self, user=None, repo=None, org=None):
4545

4646
forks_service.create(user='octocat', repo='oct_repo')
4747
forks_service.create(user='octocat', repo='oct_repo',
48-
org='myorganization'
48+
org='myorganization')
4949
"""
5050
request = self.make_request('repos.forks.create', user=user, repo=repo)
5151
org = org and {'org': org} or {}

‎pygithub3/services/repos/watchers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def list_repos(self, user=None):
3939
watchers_service.list_repos('copitux')
4040
watchers_service.list_repos()
4141
"""
42-
request = self.make_request('repos.watchers.list_repos', user=user)
42+
request = self.request_builder('repos.watchers.list_repos', user=user)
4343
return self._get_result(request)
4444

4545
def is_watching(self, user=None, repo=None):

‎pygithub3/services/users/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def get(self, user=None):
3232
user_service.get('copitux')
3333
user_service.get()
3434
"""
35-
request = self.make_request('users.get', user=user)
35+
request = self.request_builder('users.get', user=user)
3636
return self._get(request)
3737

3838
def update(self, data):

‎pygithub3/services/users/followers.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def list(self, user=None):
2626
followers_service.list()
2727
followers_service.list('octocat')
2828
"""
29-
request = self.make_request('users.followers.list', user=user)
29+
request = self.request_builder('users.followers.list', user=user)
3030
return self._get_result(request)
3131

3232
def list_following(self, user=None):
@@ -46,15 +46,17 @@ def list_following(self, user=None):
4646
followers_service.list_following()
4747
followers_service.list_following('octocat')
4848
"""
49-
request = self.make_request('users.followers.listfollowing', user=user)
49+
request = self.request_builder('users.followers.listfollowing',
50+
user=user)
5051
return self._get_result(request)
5152

5253
def is_following(self, user):
5354
""" Check if you are following a user
5455

5556
:param str user: Username
5657
"""
57-
request = self.make_request('users.followers.isfollowing', user=user)
58+
request = self.request_builder('users.followers.isfollowing',
59+
user=user)
5860
return self._bool(request)
5961

6062
def follow(self, user):
@@ -65,7 +67,7 @@ def follow(self, user):
6567
.. warning::
6668
You must be authenticated
6769
"""
68-
request = self.make_request('users.followers.follow', user=user)
70+
request = self.request_builder('users.followers.follow', user=user)
6971
self._put(request)
7072

7173
def unfollow(self, user):
@@ -76,5 +78,5 @@ def unfollow(self, user):
7678
.. warning::
7779
You must be authenticated
7880
"""
79-
request = self.make_request('users.followers.unfollow', user=user)
81+
request = self.request_builder('users.followers.unfollow', user=user)
8082
self._delete(request)

‎pygithub3/tests/services/test_repos.py‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,12 @@ def test_LIST_without_user(self, request_method):
3030
self.rs.list().all()
3131
self.assertEqual(request_method.call_args[0], ('get', _('user/repos')))
3232

33-
def test_LIST_with_user_in_args(self, request_method):
33+
def test_LIST_with_user(self, request_method):
3434
request_method.return_value = mock_response_result()
3535
self.rs.list('octoc').all()
3636
self.assertEqual(request_method.call_args[0],
3737
('get', _('users/octoc/repos')))
3838

39-
def test_LIST_with_user_in_service(self, request_method):
40-
request_method.return_value = mock_response_result()
41-
self.rs.list().all()
42-
self.assertEqual(request_method.call_args[0],
43-
('get', _('users/octocat/repos')))
44-
4539
def test_LIST_filters(self, request_method):
4640
request_method.return_value = mock_response_result()
4741
self.rs.list('octoc', type='public').all()
@@ -340,14 +334,13 @@ def test_LIST_repos(self, request_method):
340334
request_method.return_value = mock_response_result()
341335
self.ws.list_repos().all()
342336
self.assertEqual(request_method.call_args[0],
343-
('get', _('users/oct/watched')))
337+
('get', _('user/watched')))
344338

345-
def test_LIST_repos_without_user(self, request_method):
339+
def test_LIST_repos_with_user(self, request_method):
346340
request_method.return_value = mock_response_result()
347-
self.ws.set_user(None)
348-
self.ws.list_repos().all()
341+
self.ws.list_repos('oct').all()
349342
self.assertEqual(request_method.call_args[0],
350-
('get', _('user/watched')))
343+
('get', _('users/oct/watched')))
351344

352345
def test_IS_watching(self, request_method):
353346
request_method.return_value = mock_response()

‎pygithub3/tests/services/test_users.py‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,12 @@ def test_GET_without_user(self, request_method):
2828
self.us.get()
2929
self.assertEqual(request_method.call_args[0], ('get', _('user')))
3030

31-
def test_GET_with_user_in_arg(self, request_method):
31+
def test_GET_with_user(self, request_method):
3232
request_method.return_value = mock_response()
3333
self.us.get('octocat')
3434
self.assertEqual(request_method.call_args[0],
3535
('get', _('users/octocat')))
3636

37-
def test_GET_with_user_in_service(self, request_method):
38-
request_method.return_value = mock_response()
39-
self.us.set_user('octocat_service')
40-
self.us.get()
41-
self.assertEqual(request_method.call_args[0],
42-
('get', _('users/octocat_service')))
43-
4437
def test_UPDATE_with_valid_data(self, request_method):
4538
request_method.return_value = mock_response('patch')
4639
self.us.update({'name': 'dummy'})
@@ -101,38 +94,24 @@ def test_LIST_without_user(self, request_method):
10194
self.assertEqual(request_method.call_args[0],
10295
('get', _('user/followers')))
10396

104-
def test_LIST_with_user_in_arg(self, request_method):
97+
def test_LIST_with_user(self, request_method):
10598
request_method.return_value = mock_response_result()
10699
self.fs.list('octocat').all()
107100
self.assertEqual(request_method.call_args[0],
108101
('get', _('users/octocat/followers')))
109102

110-
def test_LIST_with_user_in_service(self, request_method):
111-
request_method.return_value = mock_response_result()
112-
self.fs.set_user('octocat_service')
113-
self.fs.list().all()
114-
self.assertEqual(request_method.call_args[0],
115-
('get', _('users/octocat_service/followers')))
116-
117103
def test_LIST_FOLLOWING_without_user(self, request_method):
118104
request_method.return_value = mock_response_result()
119105
self.fs.list_following().all()
120106
self.assertEqual(request_method.call_args[0],
121107
('get', _('user/following')))
122108

123-
def test_LIST_FOLLOWING_with_user_in_arg(self, request_method):
109+
def test_LIST_FOLLOWING_with_user(self, request_method):
124110
request_method.return_value = mock_response_result()
125111
self.fs.list_following('octocat').all()
126112
self.assertEqual(request_method.call_args[0],
127113
('get', _('users/octocat/following')))
128114

129-
def test_LIST_FOLLOWING_with_user_in_service(self, request_method):
130-
request_method.return_value = mock_response_result()
131-
self.fs.set_user('octocat_service')
132-
self.fs.list_following().all()
133-
self.assertEqual(request_method.call_args[0],
134-
('get', _('users/octocat_service/following')))
135-
136115
def test_IS_FOLLOWING(self, request_method):
137116
self.fs.is_following('octocat')
138117
self.assertEqual(request_method.call_args[0],

0 commit comments

Comments
 (0)