Skip to content

Commit fce4205

Browse files
committed
Merge branch 'hugovk/fix-typos' into master (#72)
2 parents 6d4e840 + 64fcc15 commit fce4205

File tree

13 files changed

+33
-33
lines changed

13 files changed

+33
-33
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ Changelog
4848
- [docuumentation] add service list example
4949
- [documentation] add expiring service list example
5050
- [documentation] add dedicated server KVM example
51-
- [documentation] explicitely list supported python version
51+
- [documentation] explicitly list supported python version
5252

5353
## 0.3.5 (2015-07-30)
5454

5555
- [enhancement] API call timeouts. Defaults to 180s
5656
- [buildsystem] move to new Travis build system
57-
- [documentation] send complex / python keywork parameters
57+
- [documentation] send complex / python keyword parameters
5858

5959
## 0.3.4 (2015-06-10)
6060

MIGRATION.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
Migrate from legacy wrappers
33
############################
44

5-
This guide specifically targets developers comming from the legacy wrappers
5+
This guide specifically targets developers coming from the legacy wrappers
66
previously distributed on https://api.ovh.com/g934.first_step_with_api. It
7-
highligts the main evolutions between these 2 major version as well as some
7+
highlights the main evolutions between these 2 major version as well as some
88
tips to help with the migration. If you have any further questions, feel free
99
to drop a mail on [email protected] ([email protected] to subscribe).
1010

@@ -50,7 +50,7 @@ New method:
5050
5151
from ovh import Client
5252
53-
Instanciate a new client
53+
Instantiate a new client
5454
------------------------
5555

5656
Legacy method:
@@ -102,7 +102,7 @@ And then simply create a client instance:
102102
103103
With no additional boilerplate!
104104

105-
For more informations on available configuration mechanism, please see
105+
For more information on available configuration mechanism, please see
106106
https://github.com/ovh/python-ovh/blob/master/README.rst#configuration
107107

108108
Use the client

README.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Depending on the API you want to use, you may set the ``endpoint`` to:
118118
See Configuration_ for more information on available configuration mechanisms.
119119

120120
.. note:: When using a versioning system, make sure to add ``ovh.conf`` to ignored
121-
files. It contains confidential/security-sensitive informations!
121+
files. It contains confidential/security-sensitive information!
122122

123123
3. Authorize your application to access a customer account
124124
**********************************************************
@@ -127,7 +127,7 @@ To allow your application to access a customer account using the API on your
127127
behalf, you need a **consumer key (CK)**.
128128

129129
Here is a sample code you can use to allow your application to access a
130-
customer's informations:
130+
customer's information:
131131

132132
.. code:: python
133133
@@ -170,10 +170,10 @@ e-mail redirections may be freely configured on domains and DNS zones hosted by
170170
OVH to an arbitrary destination e-mail using API call
171171
``POST /email/domain/{domain}/redirection``.
172172

173-
For this call, the api specifies that the source adress shall be given under the
173+
For this call, the api specifies that the source address shall be given under the
174174
``from`` keyword. Which is a problem as this is also a reserved Python keyword.
175175
In this case, simply prefix it with a '_', the wrapper will automatically detect
176-
it as being a prefixed reserved keyword and will subsitute it. Such aliasing
176+
it as being a prefixed reserved keyword and will substitute it. Such aliasing
177177
is only supported with reserved keywords.
178178

179179
.. code:: python
@@ -393,7 +393,7 @@ Alternatively it is suggested to use configuration files or environment
393393
variables so that the same code may run seamlessly in multiple environments.
394394
Production and development for instance.
395395

396-
This wrapper will first look for direct instanciation parameters then
396+
This wrapper will first look for direct instantiation parameters then
397397
``OVH_ENDPOINT``, ``OVH_APPLICATION_KEY``, ``OVH_APPLICATION_SECRET`` and
398398
``OVH_CONSUMER_KEY`` environment variables. If either of these parameter is not
399399
provided, it will look for a configuration file of the form:
@@ -490,7 +490,7 @@ case of error.
490490
In some rare scenario, advanced setups, you may need to perform customer
491491
processing on the raw request response. It may be accessed via ``raw_call()``.
492492
This is the lowest level call in ``python-ovh``. See the source for more
493-
informations.
493+
information.
494494

495495
Hacking
496496
=======

docs/api/ovh/client.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ below for a full working example or :py:class:`ConsumerKeyRequest`
2727
for dertailed implementatation.
2828

2929
The basic idea of ``ConsumerKeyRequest`` is to generate appropriate
30-
autorization requests from human readable function calls. In short:
30+
authorization requests from human readable function calls. In short:
3131
use it!
3232

3333
.. automethod:: Client.new_consumer_key_request

docs/index.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Depending on the API you want to use, you may set the ``endpoint`` to:
100100
See Configuration_ for more inforamtions on available configuration mechanisms.
101101

102102
.. note:: When using a versioning system, make sure to add ``ovh.conf`` to ignored
103-
files. It contains confidential/security-sensitive informations!
103+
files. It contains confidential/security-sensitive information!
104104

105105
3. Authorize your application to access a customer account
106106
**********************************************************
@@ -154,10 +154,10 @@ e-mail redirections may be freely configured on domains and DNS zones hosted by
154154
OVH to an arbitrary destination e-mail using API call
155155
``POST /email/domain/{domain}/redirection``.
156156

157-
For this call, the api specifies that the source adress shall be given under the
157+
For this call, the api specifies that the source address shall be given under the
158158
``from`` keyword. Which is a problem as this is also a reserved Python keyword.
159159
In this case, simply prefix it with a '_', the wrapper will automatically detect
160-
it as being a prefixed reserved keyword and will subsitute it. Such aliasing
160+
it as being a prefixed reserved keyword and will substitute it. Such aliasing
161161
is only supported with reserved keywords.
162162

163163
.. code:: python
@@ -299,7 +299,7 @@ Alternatively it is suggested to use configuration files or environment
299299
variables so that the same code may run seamlessly in multiple environments.
300300
Production and development for instance.
301301

302-
This wrapper will first look for direct instanciation parameters then
302+
This wrapper will first look for direct instantiation parameters then
303303
``OVH_ENDPOINT``, ``OVH_APPLICATION_KEY``, ``OVH_APPLICATION_SECRET`` and
304304
``OVH_CONSUMER_KEY`` environment variables. If either of these parameter is not
305305
provided, it will look for a configuration file of the form:
@@ -378,7 +378,7 @@ case of error.
378378
In some rare scenario, advanced setups, you may need to perform customer
379379
processing on the raw request response. It may be accessed via ``raw_call()``.
380380
This is the lowest level call in ``python-ovh``. See the source for more
381-
informations.
381+
information.
382382

383383
Hacking
384384
=======

examples/serviceExpiration/api_get_service_that_expired_soon.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ application_secret=my_application_secret
3434
consumer_key=my_consumer_key
3535
```
3636

37-
Be warned, this token is only valid to get informations of your OVH services. You cannot changes or delete your products with it.
37+
Be warned, this token is only valid to get information of your OVH services. You cannot changes or delete your products with it.
3838
If you need a more generic token, you may adjust the **Rights** fields at your needs.
3939

4040
## Download the script

examples/serviceExpiration/serviceThatWillExpired.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
for service_type in service_types:
6262
service_list = client.get('/%s' % service_type )
6363

64-
# If we found you have this one or more of this product, we get these informations
64+
# If we found you have this one or more of this product, we get these information
6565
for service in service_list:
6666
service_infos = client.get('/%s/%s/serviceInfos' % (service_type, service) )
6767
service_expiration_date = datetime.datetime.strptime(service_infos['expiration'], '%Y-%m-%d')

examples/serviceList/api_get_service_list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ application_secret=my_application_secret
3434
consumer_key=my_consumer_key
3535
```
3636

37-
Be warned, this token is only valid to get informations of your OVH services. You cannot changes or delete your products with it.
37+
Be warned, this token is only valid to get information of your OVH services. You cannot changes or delete your products with it.
3838
If you need a more generic token, you may adjust the **Rights** fields at your needs.
3939

4040
## Download the script

examples/serviceList/serviceList.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
for service_type in service_types:
5757
service_list = client.get('/%s' % service_type )
5858

59-
# If we found you have this one or more of this product, we get these informations
59+
# If we found you have this one or more of this product, we get these information
6060
for service in service_list:
6161
service_infos = client.get('/%s/%s/serviceInfos' % (service_type, service) )
6262
service_expiration_date = datetime.datetime.strptime(service_infos['expiration'], '%Y-%m-%d')

ovh/client.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
from .vendor.requests.exceptions import RequestException
5252

5353
# Disable pyopenssl. It breaks SSL connection pool when SSL connection is
54-
# closed unexpetedly by the server. And we don't need SNI anyway.
54+
# closed unexpectedly by the server. And we don't need SNI anyway.
5555
try:
5656
from .vendor.requests.packages.urllib3.contrib import pyopenssl
5757
pyopenssl.extract_from_urllib3()
@@ -133,7 +133,7 @@ def __init__(self, endpoint=None, application_key=None,
133133
or ``consumer_key`` is not provided, this client will attempt to locate
134134
from them from environment, ~/.ovh.cfg or /etc/ovh.cfg.
135135
136-
See :py:mod:`ovh.config` for more informations on supported
136+
See :py:mod:`ovh.config` for more information on supported
137137
configuration mechanisms.
138138
139139
``timeout`` can either be a float or a tuple. If it is a float it
@@ -161,7 +161,7 @@ def __init__(self, endpoint=None, application_key=None,
161161
try:
162162
self._endpoint = ENDPOINTS[endpoint]
163163
except KeyError:
164-
raise InvalidRegion("Unknow endpoint %s. Valid endpoints: %s",
164+
raise InvalidRegion("Unknown endpoint %s. Valid endpoints: %s",
165165
endpoint, ENDPOINTS.keys())
166166

167167
# load keys
@@ -236,7 +236,7 @@ def request_consumerkey(self, access_rules, redirect_url=None):
236236
will return a ``consumerKey`` and a ``validationUrl``. The end user must
237237
visit the ``validationUrl``, authenticate and validate the requested
238238
``access_rules`` to link his account to the ``consumerKey``. Once this
239-
is done, he may optionaly be redirected to ``redirect_url`` and the
239+
is done, he may optionally be redirected to ``redirect_url`` and the
240240
application can start using the ``consumerKey``.
241241
242242
The new ``consumerKey`` is automatically loaded into
@@ -329,7 +329,7 @@ def get(self, _target, _need_auth=True, **kwargs):
329329
'GET' :py:func:`Client.call` wrapper.
330330
331331
Query string parameters can be set either directly in ``_target`` or as
332-
keywork arguments. If an argument collides with a Python reserved
332+
keyword arguments. If an argument collides with a Python reserved
333333
keyword, prefix it with a '_'. For instance, ``from`` becomes ``_from``.
334334
335335
:param string _target: API method to call
@@ -350,7 +350,7 @@ def put(self, _target, _need_auth=True, **kwargs):
350350
"""
351351
'PUT' :py:func:`Client.call` wrapper
352352
353-
Body parameters can be set either directly in ``_target`` or as keywork
353+
Body parameters can be set either directly in ``_target`` or as keyword
354354
arguments. If an argument collides with a Python reserved keyword,
355355
prefix it with a '_'. For instance, ``from`` becomes ``_from``.
356356
@@ -365,7 +365,7 @@ def post(self, _target, _need_auth=True, **kwargs):
365365
"""
366366
'POST' :py:func:`Client.call` wrapper
367367
368-
Body parameters can be set either directly in ``_target`` or as keywork
368+
Body parameters can be set either directly in ``_target`` or as keyword
369369
arguments. If an argument collides with a Python reserved keyword,
370370
prefix it with a '_'. For instance, ``from`` becomes ``_from``.
371371

ovh/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
variables so that the same code may run seamlessly in multiple environments.
3636
Production and development for instance.
3737
38-
This wrapper will first look for direct instanciation parameters then
38+
This wrapper will first look for direct instantiation parameters then
3939
``OVH_ENDPOINT``, ``OVH_APPLICATION_KEY``, ``OVH_APPLICATION_SECRET`` and
4040
``OVH_CONSUMER_KEY`` environment variables. If either of these parameter is not
4141
provided, it will look for a configuration file of the form:

ovh/consumer_key.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
"""
3131
This module provides a consumer key creation helper. Consumer keys are linked
32-
with permissions defining whicg endpoint they are allowed to call. Just like
32+
with permissions defining which endpoint they are allowed to call. Just like
3333
a physical key can unlock some doors but not others.
3434
3535
OVH API consumer keys authorization is pattern based. This makes it extremely
@@ -65,7 +65,7 @@ def __init__(self, client):
6565
def request(self, redirect_url=None):
6666
'''
6767
Create the consumer key with the configures autorizations. The user will
68-
need to validate it befor it can be used with the API
68+
need to validate it before it can be used with the API
6969
7070
>>> ck.request()
7171
{

tests/test_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def setUp(self):
5353
config.CONFIG_PATH = M_CONFIG_PATH
5454

5555
def tearDown(self):
56-
"""Restore configuraton lookup path"""
56+
"""Restore configuration lookup path"""
5757
config.CONFIG_PATH = self._orig_CONFIG_PATH
5858

5959
def test_real_lookup_path(self):

0 commit comments

Comments
 (0)