8000 Merge pull request #125 from tbeadle/primitive · core-api/python-client@0e841ce · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Mar 18, 2019. It is now read-only.

Commit 0e841ce

Browse files
tomchristietomchristie
authored
Merge pull request #125 from tbeadle/primitive
Fix spelling of primitive.
2 parents 7db1aed + 5197840 commit 0e841ce

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎coreapi/codecs/corejson.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,15 @@ def _get_content(item, base_url=None):
128128
Return a dictionary of content, for documents, objects and errors.
129129
"""
130130
return {
131-
_unescape_key(key): _primative_to_document(value, base_url)
131+
_unescape_key(key): _primitive_to_document(value, base_url)
132132
for key, value in item.items()
133133
if key not in ('_type', '_meta')
134134
}
135135

136136

137-
def _document_to_primative(node, base_url=None):
137+
def _document_to_primitive(node, base_url=None):
138138
"""
139-
Take a Core API document and return Python primatives
139+
Take a Core API document and return Python primitives
140140
ready to be rendered into the JSON style encoding.
141141
"""
142142
if isinstance(node, Document):
@@ -156,7 +156,7 @@ def _document_to_primative(node, base_url=None):
156156

157157
# Fill in key-value content.
158158
ret.update([
159-
(_escape_key(key), _document_to_primative(value, base_url=url))
159+
(_escape_key(key), _document_to_primitive(value, base_url=url))
160160
for key, value in node.items()
161161
])
162162
return ret
@@ -170,7 +170,7 @@ def _document_to_primative(node, base_url=None):
170170

171171
# Fill in key-value content.
172172
ret.update([
173-
(_escape_key(key), _document_to_primative(value, base_url=base_url))
173+
(_escape_key(key), _document_to_primitive(value, base_url=base_url))
174174
for key, value in node.items()
175175
])
176176
return ret
@@ -193,7 +193,7 @@ def _document_to_primative(node, base_url=None):
193193
ret['description'] = node.description
194194
if node.fields:
195195
ret['fields'] = [
196-
_document_to_primative(field) for field in node.fields
196+
_document_to_primitive(field) for field in node.fields
197197
]
198198
return ret
199199

@@ -209,19 +209,19 @@ def _document_to_primative(node, base_url=None):
209209

210210
elif isinstance(node, Object):
211211
return OrderedDict([
212-
(_escape_key(key), _document_to_primative(value, base_url=base_url))
212+
(_escape_key(key), _document_to_primitive(value, base_url=base_url))
213213
for key, value in node.items()
214214
])
215215

216216
elif isinstance(node, Array):
217-
return [_document_to_primative(value) for value in node]
217+
return [_document_to_primitive(value) for value in node]
218218

219219
return node
220220

221221

222-
def _primative_to_document(data, base_url=None):
222+
def _primitive_to_document(data, base_url=None):
223223
"""
224-
Take Python primatives as returned from parsing JSON content,
224+
Take Python primitives as returned from parsing JSON content,
225225
and return a Core API document.
226226
"""
227227
if isinstance(data, dict) and data.get('_type') == 'document':
@@ -278,7 +278,7 @@ def _primative_to_document(data, base_url=None):
278278

279279
elif isinstance(data, list):
280280
# Array
281-
content = [_primative_to_document(item, base_url) for item in data]
281+
content = [_primitive_to_document(item, base_url) for item in data]
282282
return Array(content)
283283

284284
# String, Integer, Number, Boolean, null.
@@ -303,7 +303,7 @@ def decode(self, bytestring, **options):
303303
except ValueError as exc:
304304
raise ParseError('Malformed JSON. %s' % exc)
305305

306-
doc = _primative_to_document(data, base_url)
306+
doc = _primitive_to_document(data, base_url)
307307

308308
if isinstance(doc, Object):
309309
doc = Document(content=dict(doc))
@@ -331,5 +331,5 @@ def encode(self, document, **options):
331331
'separators': COMPACT_SEPARATORS
332332
}
333333

334-
data = _document_to_primative(document)
334+
data = _document_to_primitive(document)
335335
return force_bytes(json.dumps(data, **kwargs))

‎coreapi/document.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def _key_sorting(item):
5050
Field.__new__.__defaults__ = (False, '', None, None, None, None)
5151

5252

53-
# The Core API primatives:
53+
# The Core API primitives:
5454

5555
class Document(itypes.Dict):
5656
"""

‎coreapi/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ def _validate_form_field(value, allow_files=False, allow_list=True):
314314
elif allow_files and is_file(value):
315315
return value
316316

317-
msg = 'Must be a primative type.'
317+
msg = 'Must be a primitive type.'
318318
raise exceptions.ParameterError(msg)
319319

320320

@@ -332,5 +332,5 @@ def _validate_json_data(value):
332332
for item_key, item_val in value.items()
333333
}
334334

335-
msg = 'Must be a JSON primative.'
335+
msg = 'Must be a JSON primitive.'
336336
raise exceptions.ParameterError(msg)

‎tests/test_codecs.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# coding: utf-8
22
from coreapi.codecs import CoreJSONCodec
3-
from coreapi.codecs.corejson import _document_to_primative, _primative_to_document
3+
from coreapi.codecs.corejson import _document_to_primitive, _primitive_to_document
44
from coreapi.document import Document, Link, Error, Field
55
from coreapi.exceptions import ParseError, NoCodecAvailable
66
from coreapi.utils import negotiate_decoder, negotiate_encoder
@@ -27,10 +27,10 @@ def doc():
2727
})
2828

2929

30-
# Documents have a mapping to python primatives in JSON style.
30+
# Documents have a mapping to python primitives in JSON style.
3131

32-
def test_document_to_primative(doc):
33-
data = _document_to_primative(doc)
32+
def test_document_to_primitive(doc):
33+
data = _document_to_primitive(doc)
3434
assert data == {
3535
'_type': 'document',
3636
'_meta': {
@@ -46,7 +46,7 @@ def test_document_to_primative(doc):
4646
}
4747

4848

49-
def test_primative_to_document(doc):
49+
def test_primitive_to_document(doc):
5050
data = {
5151
'_type': 'document',
5252
'_meta': {
@@ -60,27 +60,27 @@ def test_primative_to_document(doc):
6060
'nested': {'child': {'_type': 'link', 'url': 'http://example.org/123'}},
6161
'__type': 'needs escaping'
6262
}
63-
assert _primative_to_document(data) == doc
63+
assert _primitive_to_document(data) == doc
6464

6565

66-
def test_error_to_primative():
66+
def test_error_to_primitive():
6767
error = Error(title='Failure', content={'messages': ['failed']})
6868
data = {
6969
'_type': 'error',
7070
'_meta': {'title': 'Failure'},
7171
'messages': ['failed']
7272
}
73-
assert _document_to_primative(error) == data
73+
assert _document_to_primitive(error) == data
7474

7575

76-
def test_primative_to_error():
76+
def test_primitive_to_error():
7777
error = Error(title='Failure', content={'messages': ['failed']})
7878
data = {
7979
'_type': 'error',
8080
'_meta': {'title': 'Failure'},
8181
'messages': ['failed']
8282
}
83-
assert _primative_to_document(data) == error
83+
assert _primitive_to_document(data) == error
8484

8585

8686
# Codecs can load a document successfully.

‎tests/test_document.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def test_error_does_not_support_property_assignment():
129129
error.integer = 456
130130

131131

132-
# Children in documents are immutable primatives.
132+
# Children in documents are immutable primitives.
133133

134134
def test_document_dictionaries_coerced_to_objects(doc):
135135
assert isinstance(doc['dict'], Object)

0 commit comments

Comments
 (0)
0