aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatěj Cepl <mcepl@cepl.eu>2015-01-12 19:36:46 +0100
committerMatěj Cepl <mcepl@cepl.eu>2015-01-12 19:36:46 +0100
commit506281535eebb163780ff34364faa4152c9f5d50 (patch)
tree5e8b5c33738e03ffbc1cea9c78d018cb8a36bb0c
parentdba0b0a5b65c57c71c50ce1681f3286869e231bc (diff)
downloadyamlish-506281535eebb163780ff34364faa4152c9f5d50.tar.gz
Python 2.6 str.decode doesn't have keyword parameters.0.15.1
-rw-r--r--setup.py2
-rw-r--r--yamlish.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 53b072a..1a970b2 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ def read(fname):
setup(
name='yamlish',
- version="0.15",
+ version="0.15.1",
description='Python implementation of YAMLish',
author='Matěj Cepl',
author_email='mcepl@redhat.com',
diff --git a/yamlish.py b/yamlish.py
index a387d35..0c84c3b 100644
--- a/yamlish.py
+++ b/yamlish.py
@@ -190,7 +190,7 @@ def load(source, ignore_wrong_characters=False):
except UnicodeDecodeError:
log.debug('in ignore_wrong_characters = %s', ignore_wrong_characters)
if ignore_wrong_characters:
- inobj += line.decode('utf8', errors='ignore') + '\n'
+ inobj += line.decode('utf8', 'ignore') + '\n'
else:
raise
log.debug('restarting load with inobj as string')