Skip to content

Commit 1b20554

Browse files
committed
Ref Py3 in the docs.
1 parent b3deffd commit 1b20554

File tree

6 files changed

+18
-19
lines changed

6 files changed

+18
-19
lines changed

docs/conf.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@
8888
)
8989

9090
intersphinx_mapping = {
91-
"python": ("https://docs.python.org/2.7", None),
92-
"python3": ("https://docs.python.org/3", None),
91+
"python": ("https://docs.python.org/3", None),
9392
}
9493

9594

docs/validate.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ classes should adhere to.
124124

125125
Lazily yield each of the validation errors in the given instance.
126126

127-
:rtype: an `collections.Iterable` of
127+
:rtype: an `collections.abc.Iterable` of
128128
`jsonschema.exceptions.ValidationError`\s
129129

130130
>>> schema = {

jsonschema/_format.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class FormatChecker(object):
2424
2525
Arguments:
2626
27-
formats (~collections.Iterable):
27+
formats (~collections.abc.Iterable):
2828
2929
The known formats to validate. This argument can be used to
3030
limit which formats will be used during validation.

jsonschema/_types.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def redefine(self, type, fn):
104104
105105
The name of the type to check.
106106
107-
fn (collections.Callable):
107+
fn (collections.abc.Callable):
108108
109109
A function taking exactly two parameters - the type
110110
checker calling the function and the instance to check.
@@ -141,7 +141,7 @@ def remove(self, *types):
141141
142142
Arguments:
143143
144-
types (~collections.Iterable):
144+
types (~collections.abc.Iterable):
145145
146146
the names of the types to remove.
147147

jsonschema/exceptions.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,10 @@ def __getitem__(self, index):
268268
"""
269269
Retrieve the child tree one level down at the given ``index``.
270270
271-
If the index is not in the instance that this tree corresponds to and
272-
is not known by this tree, whatever error would be raised by
273-
``instance.__getitem__`` will be propagated (usually this is some
274-
subclass of `exceptions.LookupError`.
271+
If the index is not in the instance that this tree corresponds
272+
to and is not known by this tree, whatever error would be raised
273+
by ``instance.__getitem__`` will be propagated (usually this is
274+
some subclass of `LookupError`.
275275
"""
276276

277277
if self._instance is not _unset and index not in self:
@@ -349,14 +349,14 @@ def best_match(errors, key=relevance):
349349
not be relevant.
350350
351351
Arguments:
352-
errors (collections.Iterable):
352+
errors (collections.abc.Iterable):
353353
354354
the errors to select from. Do not provide a mixture of
355355
errors from different validation attempts (i.e. from
356356
different instances or schemas), since it won't produce
357357
sensical output.
358358
359-
key (collections.Callable):
359+
key (collections.abc.Callable):
360360
361361
the key to use when sorting errors. See `relevance` and
362362
transitively `by_relevance` for more details (the default is

jsonschema/validators.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def validates(version):
113113
114114
Returns:
115115
116-
collections.Callable:
116+
collections.abc.Callable:
117117
118118
a class decorator to decorate the validator with the version
119119
"""
@@ -165,11 +165,11 @@ def create(
165165
166166
Arguments:
167167
168-
meta_schema (collections.Mapping):
168+
meta_schema (collections.abc.Mapping):
169169
170170
the meta schema for the new validator class
171171
172-
validators (collections.Mapping):
172+
validators (collections.abc.Mapping):
173173
174174
a mapping from names to callables, where each callable will
175175
validate the schema property with the given name.
@@ -197,7 +197,7 @@ def create(
197197
If unprovided, a `jsonschema.TypeChecker` will be created
198198
with a set of default types typical of JSON Schema drafts.
199199
200-
default_types (collections.Mapping):
200+
default_types (collections.abc.Mapping):
201201
202202
.. deprecated:: 3.0.0
203203
@@ -207,7 +207,7 @@ def create(
207207
that will be converted to functions and redefined in this
208208
object's `jsonschema.TypeChecker`.
209209
210-
id_of (collections.Callable):
210+
id_of (collections.abc.Callable):
211211
212212
A function that given a schema, returns its ID.
213213
@@ -374,7 +374,7 @@ def extend(validator, validators=(), version=None, type_checker=None):
374374
375375
an existing validator class
376376
377-
validators (collections.Mapping):
377+
validators (collections.abc.Mapping):
378378
379379
a mapping of new validator callables to extend with, whose
380380
structure is as in `create`.
@@ -938,7 +938,7 @@ def validator_for(schema, default=_LATEST_VERSION):
938938
939939
Arguments:
940940
941-
schema (collections.Mapping or bool):
941+
schema (collections.abc.Mapping or bool):
942942
943943
the schema to look at
944944

0 commit comments

Comments
 (0)