remove TextIOWrapper, use strig mode for load options

ipython · May 23, 2012 · 195949e · 195949e
1 parent f9f2400
commit 195949e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
@@ -2774,10 +2774,7 @@ def find_user_code(self, target, raw=True, py_only=False):
         except UnicodeDecodeError:
             if not py_only :
                 response = urllib.urlopen(target)
-                buffer = BytesIO(response.read())
-                text = TextIOWrapper(buffer, 'latin1', errors='replace', line_buffering=True)
-                text.mode = 'r'
-                return text.read()
+                return response.read().decode('latin1')
             raise ValueError(("'%s' seem to be unreadable.") % utarget)
 
         potential_target = [target]

diff --git a/IPython/core/magic.py b/IPython/core/magic.py
@@ -2293,8 +2293,7 @@ def magic_load(self, arg_s):
         %load myMacro
         %load http://www.example.com/myscript.py
         """
-        opts,args = self.parse_options(arg_s,'y',mode='list')
-        args = " ".join(args)
+        opts,args = self.parse_options(arg_s,'y')
 
         contents = self.shell.find_user_code(args)
         l = len(contents)