diff options
| author | Mark Florisson <markflorisson88@gmail.com> | 2012-01-25 11:37:38 +0000 |
|---|---|---|
| committer | Mark Florisson <markflorisson88@gmail.com> | 2012-01-29 12:07:20 +0000 |
| commit | d88146d0f46f911b599b8e164ea56576479125ba (patch) | |
| tree | 5e2c03f1aa3de0a78828f0f592adf5817bff4e2c /Cython/Compiler/MemoryView.py | |
| parent | 23d7640efd81939e5b7d4cfb2c0b18bb44b096c1 (diff) | |
| download | cython-d88146d0f46f911b599b8e164ea56576479125ba.tar.gz | |
Merge cython array utility with memoryview utility
Diffstat (limited to 'Cython/Compiler/MemoryView.py')
| -rw-r--r-- | Cython/Compiler/MemoryView.py | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/Cython/Compiler/MemoryView.py b/Cython/Compiler/MemoryView.py index 25e37e56b..31f049b4f 100644 --- a/Cython/Compiler/MemoryView.py +++ b/Cython/Compiler/MemoryView.py @@ -853,6 +853,10 @@ def _resolve_AttributeNode(env, node): return entry +# +### Utility loading +# + def load_memview_cy_utility(util_code_name, context=None, **kwargs): return CythonUtilityCode.load(util_code_name, "MemoryView.pyx", context=context, **kwargs) @@ -865,9 +869,9 @@ def load_memview_c_utility(util_code_name, context=None, **kwargs): context=context, **kwargs) def use_cython_array_utility_code(env): - scope = env.global_scope().context.cython_scope - scope.lookup('array_cwrapper').used = True - env.use_utility_code(cython_array_utility_code) + cython_scope = env.global_scope().context.cython_scope + cython_scope.load_cythonscope() + cython_scope.viewscope.lookup('array_cwrapper').used = True context = { 'memview_struct_name': memview_objstruct_cname, @@ -916,15 +920,4 @@ view_utility_code = load_memview_cy_utility( copy_contents_new_utility], ) -cython_array_utility_code = load_memview_cy_utility( - "CythonArray", - context=context, - requires=[view_utility_code]) - -copy_contents_new_utility.requires.append(cython_array_utility_code) - -# memview_fromslice_utility_code = load_memview_cy_utility( - # "MemviewFromSlice", - # context=context, - # requires=[view_utility_code], -# ) +copy_contents_new_utility.requires.append(view_utility_code)
\ No newline at end of file |