Merge branch '0.10.2' of https://github.com/TvrtkoM/ipython into TvrtkoM-0.10.2

IPython/Logger.py

@@ -18,6 +18,7 b" Logger class for IPython's logging facilities."
 import glob
 import os
 import time
+import sys
 
 #****************************************************************************
 # FIXME: This class isn't a mixin anymore, but it still needs attributes from
@@ -241,7 +242,7 b' which already exists. But you must first start the logging process with'
                 if self.timestamp:
                     write(time.strftime('# %a, %d %b %Y %H:%M:%S\n',
                                         time.localtime()))
-                write('%s\n' % data)
+                write('%s\n' % data.encode(sys.stdin.encoding))
             elif kind=='output' and self.log_output:
                 odata = '\n'.join(['#[Out]# %s' % s
                                    for s in data.split('\n')])

IPython/Magic.py

@@ -1164,7 +1164,7 b' Currently the magic system has the following functions:\\n"""'
         if logfname:
             logfname = os.path.expanduser(logfname)
         rc.opts.logfile = logfname
-        loghead = self.shell.loghead_tpl % (rc.opts,rc.args)
+        loghead = self.shell.loghead_tpl % (sys.stdin.encoding, rc.opts, rc.args)
         try:
             started  = logger.logstart(logfname,loghead,logmode,
                                        log_output,timestamp,log_raw_input)

IPython/iplib.py

@@ -670,7 +670,7 b' class InteractiveShell(object,Magic):'
         # logstart method.
         self.loghead_tpl = \
 """#log# Automatic Logger file. *** THIS MUST BE THE FIRST LINE ***
-#log# DO NOT CHANGE THIS LINE OR THE TWO BELOW
+#log# DO NOT CHANGE THIS LINE OR THE TWO BELOW -* coding: %s *-
 #log# opts = %s
 #log# args = %s
 #log# It is safe to make manual edits below here.