summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/configobj/__init__.py12
-rw-r--r--src/tests/test_configobj.py2
2 files changed, 7 insertions, 7 deletions
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