revert previous (half-functional) commit

IPython/Magic.py

@@ -2223,9 +2223,6 b' Currently the magic system has the following functions:\\n"""'
 
                 #print '*** args',args,'type',type(args)  # dbg
                 data = eval(args,self.shell.user_ns)
-                # convert string to unicode, "just in case"
-                if isinstance(data,str):
-                    data = data.decode(self.stdin_encoding) 
                 if not type(data) in StringTypes:
                     raise DataIsObject
 

IPython/iplib.py

@@ -2486,11 +2486,10 b' want to merge them back into the new files.""" % locals()'
           immediately, and the file is closed again."""
           
         filename = tempfile.mktemp('.py','ipython_edit_')
-        import codecs
         self.tempfiles.append(filename)
         
         if data:
-            tmp_file = codecs.open(filename,'w', encoding='UTF-8')            
+            tmp_file = open(filename,'w')
             tmp_file.write(data)
             tmp_file.close()
         return filename