Merged revisions 68203 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68203 | martin.v.loewis | 2009-01-03 18:19:26 +0100 (Sa, 03 Jan 2009) | 2 lines

  Issue #4817: Remove unused function PyOS_GetLastModificationTime.
........

diff --git a/Doc/c-api/sys.rst b/Doc/c-api/sys.rst
index 2a98c9d0e1256384ebe3d8379a5d50b2ca9d48ef..15f1af4ee200c68cb14f28825ee2922577834ac9 100644 (file)
--- a/Doc/c-api/sys.rst
+++ b/Doc/c-api/sys.rst
@@ -15,13 +15,6 @@ Operating System Utilities
    one of the strings ``'<stdin>'`` or ``'???'``.
 
 
-.. cfunction:: long PyOS_GetLastModificationTime(char *filename)
-
-   Return the time of last modification of the file *filename*. The result is
-   encoded in the same way as the timestamp returned by the standard C library
-   function :cfunc:`time`.
-
-
 .. cfunction:: void PyOS_AfterFork()
 
    Function to update some internal state after a process fork; this should be

diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat
index 73f6c1c8497252c0c1abf943b3fc2e0c780651d0..a0e7e0c96c9fb120a5ee4c8e9eb3dfa89b46fecb 100644 (file)
--- a/Doc/data/refcounts.dat
+++ b/Doc/data/refcounts.dat
@@ -841,9 +841,6 @@ PyNumber_Xor:PyObject*::+1:
 PyNumber_Xor:PyObject*:o1:0:
 PyNumber_Xor:PyObject*:o2:0:
 
-PyOS_GetLastModificationTime:long:::
-PyOS_GetLastModificationTime:char*:filename::
-
 PyObject_AsFileDescriptor:int::: 
 PyObject_AsFileDescriptor:PyObject*:o:0:
 

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 4377afb4d8266f797693e7e75a90fcb7a4fda066..42a061def31faa50751475556db793ba6a6baeda 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -263,7 +263,6 @@ PYTHON_OBJS=        \
                Python/getargs.o \
                Python/getcompiler.o \
                Python/getcopyright.o \
-               Python/getmtime.o \
                Python/getplatform.o \
                Python/getversion.o \
                Python/graminit.o \

diff --git a/Misc/NEWS b/Misc/NEWS
index c3d70744d7ff51f8464eb5624fe8b2cc09268211..7be8b6c05d45c96967ec10f2826ce48a8115f73f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 3.1 alpha 0
 Core and Builtins
 -----------------
 
+- Issue #4817: Remove unused function PyOS_GetLastModificationTime.
+
 - Issue #4580: Fix slicing of memoryviews when the item size is greater than
   one byte. Also fixes the meaning of len() so that it returns the number of
   items, rather than the size in bytes.

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 732201af3a9569999e27d7e5740d012ade8b5cf0..6f6abdbd885f991e072e72a421e898eb7b5b9b44 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -402,10 +402,6 @@ SOURCE=..\..\Python\getcopyright.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Python\getmtime.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Python\getopt.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index 1d977d3af78ed047a5e38a9d8d53aa5f19d6c9ae..a5df0d106203b76b12ea215ae118004d33945c2c 100644 (file)
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -556,9 +556,6 @@
                <File
                        RelativePath="..\..\Python\getcopyright.c">
                </File>
-               <File
-                       RelativePath="..\..\Python\getmtime.c">
-               </File>
                <File
                        RelativePath="..\..\Python\getopt.c">
                </File>

diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index f925c400215b43075c3692f34055ca986c4f0f7e..9139fa1beccc67ed316654b85ad1b00e5597baa0 100644 (file)
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1650,10 +1650,6 @@
                                RelativePath="..\..\Python\getcopyright.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\Python\getmtime.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\Python\getopt.c"
                                >

diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile
index 8b4c404f5616d7a756c38657553982728a151ccb..de42387ae80f99108c70454fa129d59f2ab5d18c 100644 (file)
--- a/PC/os2emx/Makefile
+++ b/PC/os2emx/Makefile
@@ -339,7 +339,6 @@ SRC.PYTHON= $(addprefix $(TOP), \
                Python/getargs.c \
                Python/getcompiler.c \
                Python/getcopyright.c \
-               Python/getmtime.c \
                Python/getplatform.c \
                Python/getversion.c \
                Python/graminit.c \

diff --git a/PC/os2emx/python27.def b/PC/os2emx/python27.def
index 46c548e868855566e284d46fc0e5aa856085cd88..3cd1ad3f0d74c31c6f29bae8202cf367ab4ce95a 100644 (file)
--- a/PC/os2emx/python27.def
+++ b/PC/os2emx/python27.def
@@ -930,9 +930,6 @@ EXPORTS
 ; From python26_s.lib(getcopyright)
   "Py_GetCopyright"
 
-; From python26_s.lib(getmtime)
-  "PyOS_GetLastModificationTime"
-
 ; From python26_s.lib(getplatform)
   "Py_GetPlatform"
 

diff --git a/PC/os2vacpp/makefile b/PC/os2vacpp/makefile
index 5c110fedaef0fb6c410750e410ed5da584cb68de..8aecdea16d2b906121c819037b11a5e70fbfbc14 100644 (file)
--- a/PC/os2vacpp/makefile
+++ b/PC/os2vacpp/makefile
@@ -1377,8 +1377,6 @@ getcopyright.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
         $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \
         $(PY_INCLUDE)\tupleobject.h
 
-getmtime.obj: pyconfig.h
-
 getplatform.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
         $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \
         pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \

diff --git a/PC/os2vacpp/makefile.omk b/PC/os2vacpp/makefile.omk
index 24361d64acee1cf3ed45767f06ee548ebf99c480..448e04f57892838e341ee1fc335cd42964d18b93 100644 (file)
--- a/PC/os2vacpp/makefile.omk
+++ b/PC/os2vacpp/makefile.omk
@@ -939,8 +939,6 @@ getcopyright.obj: abstract.h ceval.h classobject.h cobject.h \
         pystate.h python.h pythonrun.h rangeobject.h sliceobject.h \
         stringobject.h sysmodule.h traceback.h tupleobject.h
 
-getmtime.obj: pyconfig.h
-
 getplatform.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \
         pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \
         import.h intobject.h intrcheck.h listobject.h longobject.h \

diff --git a/PC/os2vacpp/python.def b/PC/os2vacpp/python.def
index 2b2d6e13dd61b89269b096fa76140938245b402c..94e094e8d1a71ea919a21271e9454671eec2deb5 100644 (file)
--- a/PC/os2vacpp/python.def
+++ b/PC/os2vacpp/python.def
@@ -280,7 +280,6 @@ EXPORTS
                PyNumber_Xor
                PyOS_AfterFork
                PyOS_FiniInterrupts
-               PyOS_GetLastModificationTime
                PyOS_InitInterrupts
                PyOS_InterruptOccurred
                PyOS_Readline

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 4cc3f2ee740d55ebaa612f1422dd201766261bec..33fd07b77933651286da7a00c2b54eea742f4a42 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -1650,10 +1650,6 @@
                                RelativePath="..\Python\getcopyright.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\Python\getmtime.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\Python\getopt.c"
                                >

diff --git a/Python/getmtime.c b/Python/getmtime.c
deleted file mode 100644 (file)
index 54edb53..0000000
--- a/Python/getmtime.c
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/* Subroutine to get the last modification time of a file */
-
-/* (A separate file because this may be OS dependent) */
-
-#include "Python.h"
-#include "pyconfig.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-time_t
-PyOS_GetLastModificationTime(char *path, FILE *fp)
-{
-       struct stat st;
-       if (fstat(fileno(fp), &st) != 0)
-               return -1;
-       else
-               return st.st_mtime;
-}
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/Python/import.c b/Python/import.c
index 621284ecb45992435dd7832f28be877ae7f543f7..d7858ef1bf13bccec8f4d5acfed6e33a5cffbc3e 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -27,8 +27,6 @@ extern "C" {
 typedef unsigned short mode_t;
 #endif
 
-extern time_t PyOS_GetLastModificationTime(char *, FILE *);
-                                               /* In getmtime.c */
 
 /* Magic word to reject .pyc files generated by other Python versions.
    It should change for each incompatible change to the bytecode.