#17961: shorten file names

sagemath · Mar 22, 2015 · d7b5d24 · d7b5d24
1 parent 41df0ec
commit d7b5d24
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/module_list.py b/src/module_list.py
@@ -2097,10 +2097,10 @@ def uname_specific(name, value, alternative):
 UNAME = os.uname()
 if UNAME[0] == "Darwin" and not UNAME[2].startswith('8.'):
     ext_modules.append(
-        Extension('sage.platforms.darwin.darwin_utilities',
-            sources = ['sage/platforms/darwin/darwin_memory_usage.c',
-                       'sage/platforms/darwin/darwin_utilities.pyx'],
-            depends = ['sage/platforms/darwin/darwin_memory_usage.h'])
+        Extension('sage.platforms.darwin.utilities',
+            sources = ['sage/platforms/darwin/memory_usage.c',
+                       'sage/platforms/darwin/utilities.pyx'],
+            depends = ['sage/platforms/darwin/memory_usage.h'])
         )
 
 

diff --git a/src/sage/misc/getusage.py b/src/sage/misc/getusage.py
@@ -115,10 +115,10 @@ def get_memory_usage(t=None):
         m = linux_memory_usage()
     elif U == 'darwin':
         try:
-            from sage.platforms.darwin.darwin_utilities import darwin_memory_usage
+            from sage.platforms.darwin.utilities import darwin_memory_usage
             m = float(darwin_memory_usage()) / (1024 * 1024)
         except ImportError:
-            # darwin_utilities is not supported on some versions of OS X.
+            # darwin.utilities is not supported on some versions of OS X.
             m = float(top().split()[-1].strip('M+'))
     elif U == 'sunos':
         # Sun's 'prstat' command appends K, M or G depending on whether

diff --git a/...ge/platforms/darwin/darwin_memory_usage.c → src/sage/platforms/darwin/memory_usage.c b/...ge/platforms/darwin/darwin_memory_usage.c → src/sage/platforms/darwin/memory_usage.c
diff --git a/...ge/platforms/darwin/darwin_memory_usage.h → src/sage/platforms/darwin/memory_usage.h b/...ge/platforms/darwin/darwin_memory_usage.h → src/sage/platforms/darwin/memory_usage.h
diff --git a/...age/platforms/darwin/darwin_utilities.pyx → src/sage/platforms/darwin/utilities.pyx b/...age/platforms/darwin/darwin_utilities.pyx → src/sage/platforms/darwin/utilities.pyx
@@ -1,6 +1,6 @@
-# darwin_utilities extension module built only on OS_X >= 10.5 (see end of module_list.py)
+# darwin.utilities extension module built only on OS_X >= 10.5 (see end of module_list.py)
 
-cdef extern from "darwin_memory_usage.h":
+cdef extern from "memory_usage.h":
     cdef unsigned long long darwin_virtual_size()
 
 def darwin_memory_usage():
@@ -12,14 +12,14 @@ def darwin_memory_usage():
     EXAMPLES
         sage: uname = os.uname()
         sage: if uname[0] == 'Darwin' and not uname[2].startswith('8.'):
-        ...       from sage.platforms.darwin.darwin_utilities import darwin_memory_usage
+        ...       from sage.platforms.darwin.utilities import darwin_memory_usage
         ...       memory_usage = darwin_memory_usage()
 
 
         sage: uname = os.uname()
         sage: if uname[0] == 'Darwin' and uname[2].startswith('8.'):
         ...       try:
-        ...           from sage.platforms.darwin.darwin_utilities import darwin_memory_usage
+        ...           from sage.platforms.darwin.utilities import darwin_memory_usage
         ...           memory_usage = darwin_memory_usage()
         ...           print "doctest failure!"
         ...           print "darwin_memory_usage() not implemented on platform Darwin 8 (i.e. OS X 10.4)"
@@ -30,7 +30,7 @@ def darwin_memory_usage():
         sage: uname = os.uname()
         sage: if uname[0] != 'Darwin':
         ...       try:
-        ...           from sage.platforms.darwin.darwin_utilities import darwin_memory_usage
+        ...           from sage.platforms.darwin.utilities import darwin_memory_usage
         ...           memory_usage = darwin_memory_usage()
         ...           print "doctest failure!"
         ...           print "darwin_memory_usage() not implemented on platform %s"%uname[0]