Merge dev and the away branch.

jedi/api/__init__.py

@@ -3,6 +3,9 @@ The API basically only provides one class. You can create a :class:`Script` and
 use its methods.
 
 Additionally you can add a debug function with :func:`set_debug_function`.
+Alternatively, if you don't need a custom function and are happy with printing
+debug messages to stdout, simply call :func:`set_debug_function` without
+arguments.
 
 .. warning:: Please, note that Jedi is **not thread safe**.
 """
@@ -529,6 +532,8 @@ def set_debug_function(func_cb=debug.print_to_stdout, warnings=True,
     """
     Define a callback debug function to get all the debug messages.
 
+    If you don't specify any arguments, debug messages will be printed to stdout.
+
     :param func_cb: The callback function for debug messages, with n params.
     """
     debug.debug_function = func_cb

jedi/common.py

@@ -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