Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5f55aef

Browse files
committed
ParameterValidator -> SchemaValidator
The name makes more sense and is less confusing in my humble opinion.
1 parentf9f318f commit5f55aef

File tree

3 files changed

+18
-19
lines changed

3 files changed

+18
-19
lines changed

‎github3/github.py‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
fromgithub3.usersimportUser,Key
2020
fromgithub3.decoratorsimportrequires_auth,requires_basic_auth
2121
fromgithub3.notificationsimportThread
22-
fromgithub3.validationimport (ParameterValidator,StringValidator,
22+
fromgithub3.validationimport (SchemaValidator,StringValidator,
2323
IntegerValidator,ListValidator)
2424

2525

@@ -111,7 +111,7 @@ def authorize(self, login, password, scopes, note='', note_url='',
111111
'client_id':string_validator,
112112
'client_secret':string_validator,
113113
}
114-
data=ParameterValidator(
114+
data=SchemaValidator(
115115
{'scopes':scopes,'note':note,'note_url':note_url,
116116
'client_id':client_id,'client_secret':client_secret},
117117
schema
@@ -378,7 +378,7 @@ def iter_all_repos(self, number=-1, etag=None, **kwargs):
378378
:param int since: (optional), id of the repository to start with
379379
:returns: generator of :class:`Repository <github3.repos.Repository>`
380380
"""
381-
params=ParameterValidator(
381+
params=SchemaValidator(
382382
kwargs, {'per_page':IntegerValidator(True),
383383
'since':IntegerValidator(True)}
384384
)
@@ -397,7 +397,7 @@ def iter_all_users(self, number=-1, etag=None, **kwargs):
397397
:param int since: (optional), id of the repository to start with
398398
:returns: generator of :class:`User <github3.users.User>`
399399
"""
400-
params=ParameterValidator(
400+
params=SchemaValidator(
401401
kwargs, {'per_page':IntegerValidator(True),
402402
'since':IntegerValidator(True)}
403403
)
@@ -707,11 +707,10 @@ def iter_repos(self, number=-1, etag=None, **kwargs):
707707
"""
708708
url=self._build_url('user','repos')
709709

710-
params=ParameterValidator(kwargs,
711-
{'type':StringValidator(True),
712-
'sort':StringValidator(True),
713-
'direction':StringValidator(True),
714-
})
710+
params=SchemaValidator(
711+
kwargs,
712+
{'type':StringValidator(True),'sort':StringValidator(True),
713+
'direction':StringValidator(True)})
715714
t=params.get('type')
716715
s=params.get('sort')
717716
d=params.get('direction')

‎github3/validation.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
importre
44

55

6-
classParameterValidator(dict):
6+
classSchemaValidator(dict):
77
"""This class is used to validate parameters sent to methods.
88
99
It will use a slightly strict validation method and be capable of being
@@ -45,7 +45,7 @@ def validate(self):
4545
self[key]=validator.convert(value)
4646

4747
defupdate(self,**kwargs):
48-
super(ParameterValidator,self).update(**kwargs)
48+
super(SchemaValidator,self).update(**kwargs)
4949
self.validate()
5050

5151

‎tests/test_validation.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ def test_is_valid_raises_exception(self):
214214
self.assertRaises(NotImplementedError,self.v.is_valid,None)
215215

216216

217-
classTestParameterValidator(TestCase):
217+
classTestSchemaValidator(TestCase):
218218
defsetUp(self):
219219
self.schema= {
220220
'author':validation.StringValidator(required=True),
@@ -224,35 +224,35 @@ def setUp(self):
224224
}
225225

226226
deftest_validate_is_called_upon_initialization(self):
227-
withpatch.object(validation.ParameterValidator,'validate')asv:
228-
validation.ParameterValidator({'author':'Ian'},self.schema)
227+
withpatch.object(validation.SchemaValidator,'validate')asv:
228+
validation.SchemaValidator({'author':'Ian'},self.schema)
229229
v.assert_called()
230230

231231
deftest_removes_extra_keys(self):
232232
data= {'author':'Ian','irrelevant':'spam'}
233-
v=validation.ParameterValidator(data,self.schema)
233+
v=validation.SchemaValidator(data,self.schema)
234234
self.assertTrue('irrelevant'notinv)
235235

236236
deftest_raises_ValueError_for_required_parameter(self):
237237
data= {'committer':'Ian'}
238-
self.assertRaises(ValueError,validation.ParameterValidator,data,
238+
self.assertRaises(ValueError,validation.SchemaValidator,data,
239239
self.schema)
240240

241241
deftest_skips_keys_that_are_not_present(self):
242242
data= {'author':'Ian'}
243-
v=validation.ParameterValidator(data,self.schema)
243+
v=validation.SchemaValidator(data,self.schema)
244244
self.assertTrue('author'inv)
245245
self.assertTrue('committer'notinv)
246246
self.assertTrue('date'notinv)
247247
self.assertTrue('since'notinv)
248248

249249
deftest_raises_ValueError_with_invalid_required_parameter(self):
250250
data= {'author':None}
251-
self.assertRaises(ValueError,validation.ParameterValidator,data,
251+
self.assertRaises(ValueError,validation.SchemaValidator,data,
252252
self.schema)
253253

254254
deftest_deletes_key_when_invalid_but_not_required(self):
255255
data= {'author':'Ian','committer':None}
256-
v=validation.ParameterValidator(data,self.schema)
256+
v=validation.SchemaValidator(data,self.schema)
257257
self.assertTrue('author'inv)
258258
self.assertTrue('committer'notinv)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp