##// END OF EJS Templates
Merge pull request #1161 from ipython/loadpy-fixes...
Fernando Perez -
r5753:3deb45e8 merge
parent child Browse files
Show More
@@ -96,6 +96,9 b' def needs_local_scope(func):'
96 96 # Used for exception handling in magic_edit
97 97 class MacroToEdit(ValueError): pass
98 98
99 # Taken from PEP 263, this is the official encoding regexp.
100 _encoding_declaration_re = re.compile(r"^#.*coding[:=]\s*([-\w.]+)")
101
99 102 #***************************************************************************
100 103 # Main class implementing Magic functionality
101 104
@@ -2151,16 +2154,33 b' Currently the magic system has the following functions:\\n"""'
2151 2154 %loadpy http://www.example.com/myscript.py
2152 2155 """
2153 2156 arg_s = unquote_filename(arg_s)
2154 if not arg_s.endswith('.py'):
2157 remote_url = arg_s.startswith(('http://', 'https://'))
2158 local_url = not remote_url
2159 if local_url and not arg_s.endswith('.py'):
2160 # Local files must be .py; for remote URLs it's possible that the
2161 # fetch URL doesn't have a .py in it (many servers have an opaque
2162 # URL, such as scipy-central.org).
2155 2163 raise ValueError('%%load only works with .py files: %s' % arg_s)
2156 if arg_s.startswith('http'):
2164 if remote_url:
2157 2165 import urllib2
2158 response = urllib2.urlopen(arg_s)
2159 content = response.read()
2160 else:
2161 with open(arg_s) as f:
2162 content = f.read()
2163 self.set_next_input(content)
2166 fileobj = urllib2.urlopen(arg_s)
2167 # While responses have a .info().getencoding() way of asking for
2168 # their encoding, in *many* cases the return value is bogus. In
2169 # the wild, servers serving utf-8 but declaring latin-1 are
2170 # extremely common, as the old HTTP standards specify latin-1 as
2171 # the default but many modern filesystems use utf-8. So we can NOT
2172 # rely on the headers. Short of building complex encoding-guessing
2173 # logic, going with utf-8 is a simple solution likely to be right
2174 # in most real-world cases.
2175 linesource = fileobj.read().decode('utf-8', 'replace').splitlines()
2176 else:
2177 fileobj = linesource = open(arg_s)
2178
2179 # Strip out encoding declarations
2180 lines = [l for l in linesource if not _encoding_declaration_re.match(l)]
2181 fileobj.close()
2182
2183 self.set_next_input(os.linesep.join(lines))
2164 2184
2165 2185 def _find_edit_target(self, args, opts, last_call):
2166 2186 """Utility method used by magic_edit to find what to edit."""
General Comments 0
You need to be logged in to leave comments. Login now