Jason R. Coombs <jar...@jaraco.com> added the comment: Thanks again Martin for the guidance. It proved quite helpful in completing this patch.
This latest version (3) compiles and has been tested under Windows Vista and Windows XP and behaves as expected (with a NotImplemented error under XP). I did find that I had to tweak the behavior of stat.S_ISLNK because my implementation of the st_mode bits for a symlink has different values than that of a posix call. I don't fully understand the implications of my implementation. An alternate implementation would be to have set_symlink_stat[AW] reset all of the st_mode flags except for 0o120000, to be consistent with what is returned by a posix stat call. This approach doesn't seem quite right either. I would appreciate a comment on this by someone more familiar with this type of problem. Other than that issue, what else needs to be addressed to get this patch integrated into the 3.1 or 3.1.1 release? ---------- title: Add os.link() and os.symlink() and os.path.islink() support for Windows -> Add os.link() and os.symlink() and os.path.islink() support for Windows Added file: http://bugs.python.org/file14050/windows symlink draft 3.patch Added file: http://bugs.python.org/file14051/smime.p7s _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue1578269> _______________________________________
Index: Lib/stat.py
===================================================================
--- Lib/stat.py (revision 72889)
+++ Lib/stat.py (working copy)
@@ -53,7 +53,7 @@
return S_IFMT(mode) == S_IFIFO
def S_ISLNK(mode):
- return S_IFMT(mode) == S_IFLNK
+ return bool(S_IFMT(mode) & S_IFLNK)
def S_ISSOCK(mode):
return S_IFMT(mode) == S_IFSOCK
Index: Lib/ntpath.py
===================================================================
--- Lib/ntpath.py (revision 72889)
+++ Lib/ntpath.py (working copy)
@@ -306,13 +306,19 @@
return split(p)[0]
# Is a path a symbolic link?
-# This will always return false on systems where posix.lstat doesn't exist.
+# This will always return false on systems where os.lstat doesn't exist.
def islink(path):
- """Test for symbolic link.
- On WindowsNT/95 and OS/2 always returns false
"""
- return False
+ Test whether a path is a symbolic link.
+ This will always return false for Windows prior to 6.0
+ and for OS/2.
+ """
+ try:
+ st = os.lstat(path)
+ except (os.error, AttributeError):
+ return False
+ return stat.S_ISLNK(st.st_mode)
# alias exists to lexists
lexists = exists
Index: Modules/posixmodule.c
===================================================================
--- Modules/posixmodule.c (revision 72889)
+++ Modules/posixmodule.c (working copy)
@@ -1005,6 +1005,45 @@
return 0;
}
+void set_symlink_statA(
+ const char *path,
+ WIN32_FILE_ATTRIBUTE_DATA *info,
+ struct win32_stat *result)
+{
+ /* Get WIN32_FIND_DATA structure for the path to determine if
+ it is a symlink */
+ WIN32_FIND_DATAA find_data;
+ HANDLE find_data_handle;
+ if(!(info->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) return;
+ find_data_handle = FindFirstFileA(path, &find_data);
+ if(find_data_handle != INVALID_HANDLE_VALUE)
+ {
+ if(find_data.dwReserved0 == IO_REPARSE_TAG_SYMLINK)
+ result->st_mode |= 0120000;
+ FindClose(find_data_handle);
+ }
+}
+
+void set_symlink_statW(
+ const wchar_t *path,
+ WIN32_FILE_ATTRIBUTE_DATA *info,
+ struct win32_stat *result)
+{
+ /* Get WIN32_FIND_DATA structure for the path to determine if
+ it is a symlink */
+ WIN32_FIND_DATAW find_data;
+ HANDLE find_data_handle;
+ if(!(info->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) return;
+ find_data_handle = FindFirstFileW(path, &find_data);
+ if(find_data_handle != INVALID_HANDLE_VALUE)
+ {
+ if(find_data.dwReserved0 == IO_REPARSE_TAG_SYMLINK)
+ result->st_mode |= 0120000;
+ FindClose(find_data_handle);
+ }
+}
+
+
/* Emulate GetFileAttributesEx[AW] on Windows 95 */
static int checked = 0;
static BOOL (CALLBACK *gfaxa)(LPCSTR, GET_FILEEX_INFO_LEVELS, LPVOID);
@@ -1143,6 +1182,9 @@
code = attribute_data_to_stat(&info, result);
if (code != 0)
return code;
+
+ set_symlink_statA(path, &info, result);
+
/* Set S_IFEXEC if it is an .exe, .bat, ... */
dot = strrchr(path, '.');
if (dot) {
@@ -1181,6 +1223,9 @@
code = attribute_data_to_stat(&info, result);
if (code < 0)
return code;
+
+ set_symlink_statW(path, &info, result);
+
/* Set IFEXEC if it is an .exe, .bat, ... */
dot = wcsrchr(path, '.');
if (dot) {
@@ -4736,7 +4781,79 @@
}
#endif /* HAVE_SYMLINK */
+#if !defined(HAVE_SYMLINK) && defined(MS_WINDOWS)
+/* Grab CreateSymbolicLinkW dynamically from kernel32 */
+static int has_CreateSymbolicLinkW = 0;
+static DWORD (CALLBACK *Py_CreateSymbolicLinkW)(LPWSTR, LPWSTR, DWORD);
+static int
+check_CreateSymbolicLinkW()
+{
+ HINSTANCE hKernel32;
+ /* only recheck */
+ if (has_CreateSymbolicLinkW)
+ return has_CreateSymbolicLinkW;
+ hKernel32 = GetModuleHandle("KERNEL32");
+ *(FARPROC*)&Py_CreateSymbolicLinkW = GetProcAddress(hKernel32,
"CreateSymbolicLinkW");
+ if (Py_CreateSymbolicLinkW)
+ has_CreateSymbolicLinkW = 1;
+ return has_CreateSymbolicLinkW;
+}
+
+PyDoc_STRVAR(win_symlink__doc__,
+"symlink(src, dest, target_is_directory=False)\n\n\
+Create a symbolic link pointo to src named dst.\n\n\
+target_is_directory is required if the target is to be interpreted as\n\n\
+a directory.\\\
+This function requires Windows 6.0 or greater, and raises a\n\n\
+NotImplementedError otherwise.");
+
+static PyObject *
+win_symlink(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = {"src", "dest", "target_is_directory", NULL};
+ PyObject *src, *dest;
+ int target_is_directory = 0;
+ DWORD res;
+
+ if (!check_CreateSymbolicLinkW())
+ {
+ /* raise NotImplementedError */
+ return PyErr_Format(PyExc_NotImplementedError,
+ "CreateSymbolicLinkW not found");
+ }
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|i:symlink",
+ kwlist, &src, &dest, &target_is_directory))
+ return NULL;
+ if (!convert_to_unicode(&src)) { return NULL; }
+ if (!convert_to_unicode(&dest)) {
+ Py_DECREF(src);
+ return NULL;
+ }
+ /* TODO: if dest is a directory, ensure target_is_directory==1
+ Something like:
+ target_is_directory ||= ntpath.isdir(dest);
+
+ only ntpath doesn't exist in this context.
+ */
+ Py_BEGIN_ALLOW_THREADS
+ res = Py_CreateSymbolicLinkW(
+ PyUnicode_AsUnicode(src),
+ PyUnicode_AsUnicode(dest),
+ target_is_directory);
+ Py_END_ALLOW_THREADS
+ Py_DECREF(src);
+ Py_DECREF(dest);
+ if (!res)
+ {
+ return win32_error_unicode("symlink", PyUnicode_AsUnicode(src));
+ }
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+#endif /* !defined(HAVE_SYMLINK) && defined(MS_WINDOWS) */
+
#ifdef HAVE_TIMES
#if defined(PYCC_VACPP) && defined(PYOS_OS2)
static long
@@ -7100,6 +7217,9 @@
#ifdef HAVE_SYMLINK
{"symlink", posix_symlink, METH_VARARGS, posix_symlink__doc__},
#endif /* HAVE_SYMLINK */
+#if !defined(HAVE_SYMLINK) && defined(MS_WINDOWS)
+ {"symlink", (PyCFunction)win_symlink, METH_VARARGS | METH_KEYWORDS,
win_symlink__doc__},
+#endif /* !defined(HAVE_SYMLINK) && defined(MS_WINDOWS)
#ifdef HAVE_SYSTEM
{"system", posix_system, METH_VARARGS, posix_system__doc__},
#endif
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
