Merge dev and the away branch.

2016-06-07 08:45:26 +02:00
parent 6b9f96ce13 0b31614025
commit 23ff395754
5 changed files with 17 additions and 3 deletions
@@ -135,7 +135,7 @@ def source_to_unicode(source, encoding=None):
            return possible_encoding.group(1)
        else:
            # the default if nothing else has been set -> PEP 263
-            return encoding if encoding is not None else 'iso-8859-1'
+            return encoding if encoding is not None else 'utf-8'

    if isinstance(source, unicode):
        # only cast str/bytes