Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
#17682: change to loadable_module_extension
Browse files Browse the repository at this point in the history
  • Loading branch information
sgouezel committed Apr 24, 2015
1 parent 8815433 commit ad478d3
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 21 deletions.
10 changes: 5 additions & 5 deletions src/sage/misc/cython.py
Original file line number Diff line number Diff line change
Expand Up @@ -378,13 +378,13 @@ def cython(filename, verbose=False, compile_message=False,
# There is already a module here. Maybe we do not have to rebuild?
# Find the name.
if use_cache:
from sage.misc.sageinspect import shared_lib_extension
prev_so = [F for F in os.listdir(build_dir) if F.endswith(shared_lib_extension())]
from sage.misc.sageinspect import loadable_module_extension
prev_so = [F for F in os.listdir(build_dir) if F.endswith(loadable_module_extension())]
if len(prev_so) > 0:
prev_so = prev_so[0] # should have length 1 because of deletes below
if os.path.getmtime(filename) <= os.path.getmtime('%s/%s'%(build_dir, prev_so)):
# We do not have to rebuild.
return prev_so[:-len(shared_lib_extension())], build_dir
return prev_so[:-len(loadable_module_extension())], build_dir
else:
os.makedirs(build_dir)
for F in os.listdir(build_dir):
Expand Down Expand Up @@ -544,8 +544,8 @@ def cython(filename, verbose=False, compile_message=False,

if create_local_so_file:
# Copy from lib directory into local directory
from sage.misc.sageinspect import shared_lib_extension
cmd = 'cp %s/%s%s %s'%(build_dir, name, shared_lib_extension(), os.path.abspath(os.curdir))
from sage.misc.sageinspect import loadable_module_extension
cmd = 'cp %s/%s%s %s'%(build_dir, name, loadable_module_extension(), os.path.abspath(os.curdir))
if os.system(cmd):
raise RuntimeError("Error making local copy of shared object library for {}".format(filename))

Expand Down
16 changes: 6 additions & 10 deletions src/sage/misc/sageinspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,19 +121,15 @@ def foo(unsigned int x=1, a=')"', b={not (2+1==3):'bar'}, *args, **kwds): return
EMBEDDED_MODE = False
from sage.env import SAGE_SRC

def shared_lib_extension():
def loadable_module_extension():
r"""
Return the filename extension of shared libraries, including the dot.
Return the filename extension of loadable modules, including the dot.
It is '.dll' on cygwin, '.so' otherwise.
EXAMPLES::
sage: from site import getsitepackages
sage: site_packages = getsitepackages()[0]
sage: from sage_setup.find import installed_files_by_module
sage: files_by_module = installed_files_by_module(site_packages)
sage: from sage.misc.sageinspect import shared_lib_extension
sage: files_by_module['sage.structure.sage_object'].pop().endswith(shared_lib_extension())
sage: from sage.misc.sageinspect import loadable_module_extension
sage: sage.structure.sage_object.__file__.endswith(loadable_module_extension())
True
"""
import sys
Expand Down Expand Up @@ -1196,8 +1192,8 @@ def sage_getfile(obj):

# No go? fall back to inspect.
sourcefile = inspect.getabsfile(obj)
if sourcefile.endswith(shared_lib_extension()):
return sourcefile[:-len(shared_lib_extension())]+os.path.extsep+'pyx'
if sourcefile.endswith(loadable_module_extension()):
return sourcefile[:-len(loadable_module_extension())]+os.path.extsep+'pyx'
return sourcefile

def sage_getargspec(obj):
Expand Down
8 changes: 4 additions & 4 deletions src/sage_setup/clean.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ def _find_stale_files(site_packages, python_packages, python_modules, ext_module
extension modules::
sage: stale_iter = _find_stale_files(SAGE_LIB, python_packages, python_modules, [])
sage: from sage.misc.sageinspect import shared_lib_extension
sage: from sage.misc.sageinspect import loadable_module_extension
sage: for f in stale_iter:
....: if f.endswith(shared_lib_extension()): continue
....: if f.endswith(loadable_module_extension()): continue
....: print('Found stale file: ' + f)
"""
PYMOD_EXTS = (os.path.extsep + 'py', os.path.extsep + 'pyc')
from sage.misc.sageinspect import shared_lib_extension
CEXTMOD_EXTS = (shared_lib_extension(),)
from sage.misc.sageinspect import loadable_module_extension
CEXTMOD_EXTS = (loadable_module_extension(),)
INIT_FILES= map(lambda x: '__init__' + x, PYMOD_EXTS)

module_files = installed_files_by_module(site_packages, ['sage', 'sage_setup'])
Expand Down
4 changes: 2 additions & 2 deletions src/sage_setup/find.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ def installed_files_by_module(site_packages, modules=('sage',)):
sage: from site import getsitepackages
sage: site_packages = getsitepackages()[0]
sage: files_by_module = installed_files_by_module(site_packages)
sage: from sage.misc.sageinspect import shared_lib_extension
sage: from sage.misc.sageinspect import loadable_module_extension
sage: files_by_module['sage.structure.sage_object'] == \
....: {'sage/structure/sage_object' + shared_lib_extension()}
....: {'sage/structure/sage_object' + loadable_module_extension()}
True
sage: sorted(files_by_module['sage.structure'])
['sage/structure/__init__.py', 'sage/structure/__init__.pyc']
Expand Down

0 comments on commit ad478d3

Please sign in to comment.