diff options
| -rw-r--r-- | docs/configobj.html | 2 | ||||
| -rw-r--r-- | docs/configobj.rst | 2 | ||||
| -rw-r--r-- | pylint.cfg | 2 | ||||
| -rw-r--r-- | src/configobj/__init__.py | 12 | ||||
| -rw-r--r-- | src/tests/test_configobj.py | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/docs/configobj.html b/docs/configobj.html index 0398cb8..20402ad 100644 --- a/docs/configobj.html +++ b/docs/configobj.html @@ -2320,7 +2320,7 @@ attribute is not set then a <tt class="docutils literal">ReloadError</tt> (a new <tt class="docutils literal">IOError</tt>) is raised.</p> <p>BUGFIX: Files are read in with 'rb' mode, so that native/non-native line endings work!</p> <p>Minor efficiency improvement in <tt class="docutils literal">unrepr</tt> mode.</p> -<p>Added missing docstrings for some overidden dictionary methods.</p> +<p>Added missing docstrings for some overridden dictionary methods.</p> <p>Added the <tt class="docutils literal">reset</tt> method. This restores a ConfigObj to a freshly created state.</p> <p>Removed old CHANGELOG file.</p> </div> diff --git a/docs/configobj.rst b/docs/configobj.rst index e183b98..99c0bc7 100644 --- a/docs/configobj.rst +++ b/docs/configobj.rst @@ -1604,7 +1604,7 @@ message will be raised. Unless you want to format the error message differently from the default, you should use ``str(ex)`` or better yet, use the exception in a format where the conversion is implicit. This uses the exception's ``__str__()`` method which in all -likelyhood will output all the information you want to know. +likelihood will output all the information you want to know. .. note:: @@ -46,7 +46,7 @@ confidence= # can either give multiple identifiers separated by comma (,) or put this # option multiple times (only on the command line, not in the configuration # file where it should appear only once).You can also use "--disable=all" to -# disable everything first and then reenable specific checks. For example, if +# disable everything first and then re-enable specific checks. For example, if # you want to run only the similarities checker, you can use "--disable=all # --enable=similarities". If you want to run only the classes checker, but have # no Warning level messages displayed, use"--disable=all --enable=classes diff --git a/src/configobj/__init__.py b/src/configobj/__init__.py index 928c208..0580b65 100644 --- a/src/configobj/__init__.py +++ b/src/configobj/__init__.py @@ -201,7 +201,7 @@ class DuplicateError(ConfigObjError): class ConfigspecError(ConfigObjError): """ - An error occured whilst parsing a configspec. + An error occurred whilst parsing a configspec. """ @@ -807,11 +807,11 @@ class Section(dict): Return a dictionary of the return values - If the function raises an exception, raise the errror + If the function raises an exception, raise the error unless ``raise_errors=False``, in which case set the return value to ``False``. - Any unrecognised keyword arguments you pass to walk, will be pased on + Any unrecognised keyword arguments you pass to walk, will be passed on to the function you pass in. Note: if ``call_on_sections`` is ``True`` then - on encountering a @@ -1509,7 +1509,7 @@ class ConfigObj(Section): into strings. """ if not isinstance(value, six.string_types): - # intentially 'str' because it's just whatever the "normal" + # intentionally 'str' because it's just whatever the "normal" # string type is for the python version we're dealing with return str(value) else: @@ -1706,7 +1706,7 @@ class ConfigObj(Section): Handle an error according to the error settings. Either raise the error or store it. - The error will have occured at ``cur_index`` + The error will have occurred at ``cur_index`` """ line = infile[cur_index] cur_index += 1 @@ -1763,7 +1763,7 @@ class ConfigObj(Section): for val in value]) if not isinstance(value, six.string_types): if self.stringify: - # intentially 'str' because it's just whatever the "normal" + # intentionally 'str' because it's just whatever the "normal" # string type is for the python version we're dealing with value = str(value) else: diff --git a/src/tests/test_configobj.py b/src/tests/test_configobj.py index c72e364..b1f2d01 100644 --- a/src/tests/test_configobj.py +++ b/src/tests/test_configobj.py @@ -493,7 +493,7 @@ def test_flatten_errors(val, cfg_contents): def test_unicode_handling(): u_base = ''' # initial comment - # inital comment 2 + # initial comment 2 test1 = some value # comment test2 = another value # inline comment |