upstream/ipython Commit - r7100:5a70c34c

90

if not module_name:

90

if not module_name:

91

raise ValueError('module name must be given')

91

raise ValueError('module name must be given')

92

fname = module_name + '.pyx'

92

fname = module_name + '.pyx'

93

with open(fname, 'w') as f:

93

with io.open(fname, 'w', encoding='utf-8'):

94

f.write(cell)

94

f.write(cell)

95

if 'pyximport' not in sys.modules:

95

if 'pyximport' not in sys.modules:

96

import pyximport

96

import pyximport

113

"""Compile and import everything from a Cython code cell.

113

"""Compile and import everything from a Cython code cell.

114

115

The contents of the cell are written to a `.pyx` file in the

115

The contents of the cell are written to a `.pyx` file in the

116

~~`~/.~~cython~~/magic~~` using a filename with the hash of the code.

116

directory `IPYTHONDIR/cython` using a filename with the hash of the code.

117

This file is then cythonized and compiled. The resulting module

117

This file is then cythonized and compiled. The resulting module

118

is imported and all of its symbols are injected into the user's

118

is imported and all of its symbols are injected into the user's

119

namespace. The usage is similar to that of `%%cython_pyximport` but

119

namespace. The usage is similar to that of `%%cython_pyximport` but

125

"""

125

"""

126

args = parse_argstring(self.cython, line)

126

args = parse_argstring(self.cython, line)

127

code = cell if cell.endswith('\n') else cell+'\n'

127

code = cell if cell.endswith('\n') else cell+'\n'

128

lib_dir=os.path.expanduser('~/.cython/magic')

128

# distutils.Extension cannot handle sources that a unicode

129

lib_dir=str(os.path.join(self.shell.ipython_dir,'cython'))

129

cython_include_dirs=['.']

130

cython_include_dirs=['.']

130

force=args.force

131

force=args.force

131

quiet=True

132

quiet=True

145

import numpy

146

import numpy

146

c_include_dirs.append(numpy.get_include())

147

c_include_dirs.append(numpy.get_include())

147

pyx_file = os.path.join(lib_dir, module_name + '.pyx')

148

pyx_file = os.path.join(lib_dir, module_name + '.pyx')

148

with open(pyx_file, 'w') as f:

149

with io.open(pyx_file, 'w', encoding='utf-8'):

149

f.write(code)

150

f.write(code)

151

print [pyx_file]

150

extension = Extension(

152

extension = Extension(

151

name = module_name,

153

name = module_name,

152

sources = [pyx_file],

154

sources = [pyx_file],

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

                     if not module_name:
                         raise ValueError('module name must be given')
                     fname = module_name + '.pyx'
-                    with open(fname, 'w') as f:
+                    with io.open(fname, 'w', encoding='utf-8'):
                         f.write(cell)
                     if 'pyximport' not in sys.modules:
                         import pyximport
                     """Compile and import everything from a Cython code cell.
                     The contents of the cell are written to a `.pyx` file in the
-                    `~/.cython/magic` using a filename with the hash of the code.
+                    directory `IPYTHONDIR/cython` using a filename with the hash of the code.
                     This file is then cythonized and compiled. The resulting module
                     is imported and all of its symbols are injected into the user's
                     namespace. The usage is similar to that of `%%cython_pyximport` but
                     """
                     args = parse_argstring(self.cython, line)
                     code = cell if cell.endswith('\n') else cell+'\n'
-                    lib_dir=os.path.expanduser('~/.cython/magic')
+                    # distutils.Extension cannot handle sources that a unicode
+                    lib_dir=str(os.path.join(self.shell.ipython_dir,'cython'))
                     cython_include_dirs=['.']
                     force=args.force
                     quiet=True
                             import numpy
                             c_include_dirs.append(numpy.get_include())
                         pyx_file = os.path.join(lib_dir, module_name + '.pyx')
-                        with open(pyx_file, 'w') as f:
+                        with io.open(pyx_file, 'w', encoding='utf-8'):
                             f.write(code)
+                        print [pyx_file]
                         extension = Extension(
                             name = module_name,
                             sources = [pyx_file],