[Python-checkins] r82745 - in python/branches/py3k: Lib/test/symlink_support.py Lib/test/test_os.py Lib/test/test_platform.py Lib/test/test_sysconfig.py Lib/test/test_tarfile.py Modules/posixmodule.c
brian.curtin
python-checkins at python.org
Fri Jul 9 17:58:59 CEST 2010
Author: brian.curtin
Date: Fri Jul 9 17:58:59 2010
New Revision: 82745
Log:
Re-flow several long lines from #1578269.
Modified:
python/branches/py3k/Lib/test/symlink_support.py
python/branches/py3k/Lib/test/test_os.py
python/branches/py3k/Lib/test/test_platform.py
python/branches/py3k/Lib/test/test_sysconfig.py
python/branches/py3k/Lib/test/test_tarfile.py
python/branches/py3k/Modules/posixmodule.c
Modified: python/branches/py3k/Lib/test/symlink_support.py
==============================================================================
--- python/branches/py3k/Lib/test/symlink_support.py (original)
+++ python/branches/py3k/Lib/test/symlink_support.py Fri Jul 9 17:58:59 2010
@@ -12,7 +12,8 @@
GetCurrentProcess = ctypes.windll.kernel32.GetCurrentProcess
GetCurrentProcess.restype = wintypes.HANDLE
OpenProcessToken = ctypes.windll.advapi32.OpenProcessToken
-OpenProcessToken.argtypes = (wintypes.HANDLE, wintypes.DWORD, ctypes.POINTER(wintypes.HANDLE))
+OpenProcessToken.argtypes = (wintypes.HANDLE, wintypes.DWORD,
+ ctypes.POINTER(wintypes.HANDLE))
OpenProcessToken.restype = wintypes.BOOL
class LUID(ctypes.Structure):
@@ -91,7 +92,8 @@
def get_array(self):
array_type = LUID_AND_ATTRIBUTES*self.count
- privileges = ctypes.cast(self.privileges, ctypes.POINTER(array_type)).contents
+ privileges = ctypes.cast(self.privileges,
+ ctypes.POINTER(array_type)).contents
return privileges
def __iter__(self):
@@ -133,7 +135,8 @@
def get_symlink_luid():
"Get the LUID for the SeCreateSymbolicLinkPrivilege"
symlink_luid = LUID()
- res = LookupPrivilegeValue(None, "SeCreateSymbolicLinkPrivilege", symlink_luid)
+ res = LookupPrivilegeValue(None, "SeCreateSymbolicLinkPrivilege",
+ symlink_luid)
if not res > 0:
raise RuntimeError("Couldn't lookup privilege value")
return symlink_luid
Modified: python/branches/py3k/Lib/test/test_os.py
==============================================================================
--- python/branches/py3k/Lib/test/test_os.py (original)
+++ python/branches/py3k/Lib/test/test_os.py Fri Jul 9 17:58:59 2010
@@ -1034,7 +1034,8 @@
def skipUnlessWindows6(test):
- if hasattr(sys, 'getwindowsversion') and sys.getwindowsversion().major >= 6:
+ if (hasattr(sys, 'getwindowsversion')
+ and sys.getwindowsversion().major >= 6):
return test
return unittest.skip("Requires Windows Vista or later")(test)
Modified: python/branches/py3k/Lib/test/test_platform.py
==============================================================================
--- python/branches/py3k/Lib/test/test_platform.py (original)
+++ python/branches/py3k/Lib/test/test_platform.py Fri Jul 9 17:58:59 2010
@@ -15,8 +15,8 @@
# On Windows, the EXE needs to know where pythonXY.dll is at so we have
# to add the directory to the path.
if sys.platform == "win32":
- os.environ["Path"] = "{};{}".format(os.path.dirname(sys.executable),
- os.environ["Path"])
+ os.environ["Path"] = "{};{}".format(
+ os.path.dirname(sys.executable), os.environ["Path"])
def get(python):
cmd = [python, '-c',
Modified: python/branches/py3k/Lib/test/test_sysconfig.py
==============================================================================
--- python/branches/py3k/Lib/test/test_sysconfig.py (original)
+++ python/branches/py3k/Lib/test/test_sysconfig.py Fri Jul 9 17:58:59 2010
@@ -244,8 +244,8 @@
# On Windows, the EXE needs to know where pythonXY.dll is at so we have
# to add the directory to the path.
if sys.platform == "win32":
- os.environ["Path"] = "{};{}".format(os.path.dirname(sys.executable),
- os.environ["Path"])
+ os.environ["Path"] = "{};{}".format(
+ os.path.dirname(sys.executable), os.environ["Path"])
# Issue 7880
def get(python):
Modified: python/branches/py3k/Lib/test/test_tarfile.py
==============================================================================
--- python/branches/py3k/Lib/test/test_tarfile.py (original)
+++ python/branches/py3k/Lib/test/test_tarfile.py Fri Jul 9 17:58:59 2010
@@ -291,7 +291,8 @@
self.assertTrue(self.tar.getmembers()[-1].name == "misc/eof",
"could not find all members")
- @unittest.skipUnless(hasattr(os, "link"), "Missing hardlink implementation")
+ @unittest.skipUnless(hasattr(os, "link"),
+ "Missing hardlink implementation")
@support.skip_unless_symlink
def test_extract_hardlink(self):
# Test hardlink extraction (e.g. bug #857297).
@@ -1423,11 +1424,13 @@
def test_hardlink_extraction2(self):
self._test_link_extraction("./ustar/linktest2/lnktype")
- @unittest.skipIf(hasattr(os, "symlink"), "Skip emulation if symlink exists")
+ @unittest.skipIf(hasattr(os, "symlink"),
+ "Skip emulation if symlink exists")
def test_symlink_extraction1(self):
self._test_link_extraction("ustar/symtype")
- @unittest.skipIf(hasattr(os, "symlink"), "Skip emulation if symlink exists")
+ @unittest.skipIf(hasattr(os, "symlink"),
+ "Skip emulation if symlink exists")
def test_symlink_extraction2(self):
self._test_link_extraction("./ustar/linktest2/symtype")
Modified: python/branches/py3k/Modules/posixmodule.c
==============================================================================
--- python/branches/py3k/Modules/posixmodule.c (original)
+++ python/branches/py3k/Modules/posixmodule.c Fri Jul 9 17:58:59 2010
@@ -1117,7 +1117,8 @@
"GetFinalPathNameByHandleA");
*(FARPROC*)&Py_GetFinalPathNameByHandleW = GetProcAddress(hKernel32,
"GetFinalPathNameByHandleW");
- has_GetFinalPathNameByHandle = Py_GetFinalPathNameByHandleA && Py_GetFinalPathNameByHandleW;
+ has_GetFinalPathNameByHandle = Py_GetFinalPathNameByHandleA &&
+ Py_GetFinalPathNameByHandleW;
}
return has_GetFinalPathNameByHandle;
}
@@ -1310,9 +1311,12 @@
/* similar to stat() */
result->st_mode = attributes_to_mode(info.dwFileAttributes);
result->st_size = (((__int64)info.nFileSizeHigh)<<32) + info.nFileSizeLow;
- FILE_TIME_to_time_t_nsec(&info.ftCreationTime, &result->st_ctime, &result->st_ctime_nsec);
- FILE_TIME_to_time_t_nsec(&info.ftLastWriteTime, &result->st_mtime, &result->st_mtime_nsec);
- FILE_TIME_to_time_t_nsec(&info.ftLastAccessTime, &result->st_atime, &result->st_atime_nsec);
+ FILE_TIME_to_time_t_nsec(&info.ftCreationTime, &result->st_ctime,
+ &result->st_ctime_nsec);
+ FILE_TIME_to_time_t_nsec(&info.ftLastWriteTime, &result->st_mtime,
+ &result->st_mtime_nsec);
+ FILE_TIME_to_time_t_nsec(&info.ftLastAccessTime, &result->st_atime,
+ &result->st_atime_nsec);
/* specific to fstat() */
result->st_nlink = info.nNumberOfLinks;
result->st_ino = (((__int64)info.nFileIndexHigh)<<32) + info.nFileIndexLow;
@@ -2691,7 +2695,8 @@
if(hFile == INVALID_HANDLE_VALUE) {
return win32_error_unicode("GetFinalPathNamyByHandle", path);
- return PyErr_Format(PyExc_RuntimeError, "Could not get a handle to file.");
+ return PyErr_Format(PyExc_RuntimeError,
+ "Could not get a handle to file.");
}
/* We have a good handle to the target, use it to determine the
@@ -3005,7 +3010,8 @@
posix_unlink(PyObject *self, PyObject *args)
{
#ifdef MS_WINDOWS
- return win32_1str(args, "remove", "y:remove", DeleteFileA, "U:remove", Py_DeleteFileW);
+ return win32_1str(args, "remove", "y:remove", DeleteFileA,
+ "U:remove", Py_DeleteFileW);
#else
return posix_1str(args, "O&:remove", unlink);
#endif
@@ -4959,7 +4965,8 @@
};
} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
-#define REPARSE_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_DATA_BUFFER, GenericReparseBuffer)
+#define REPARSE_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_DATA_BUFFER,\
+ GenericReparseBuffer)
#define MAXIMUM_REPARSE_DATA_BUFFER_SIZE ( 16 * 1024 )
@@ -5023,8 +5030,11 @@
"not a symbolic link");
return NULL;
}
- print_name = rdb->SymbolicLinkReparseBuffer.PathBuffer + rdb->SymbolicLinkReparseBuffer.PrintNameOffset;
- result = PyUnicode_FromWideChar(print_name, rdb->SymbolicLinkReparseBuffer.PrintNameLength/2);
+ print_name = rdb->SymbolicLinkReparseBuffer.PathBuffer +
+ rdb->SymbolicLinkReparseBuffer.PrintNameOffset;
+
+ result = PyUnicode_FromWideChar(print_name,
+ rdb->SymbolicLinkReparseBuffer.PrintNameLength/2);
return result;
}
@@ -5043,7 +5053,8 @@
if (has_CreateSymbolicLinkW)
return has_CreateSymbolicLinkW;
hKernel32 = GetModuleHandle("KERNEL32");
- *(FARPROC*)&Py_CreateSymbolicLinkW = GetProcAddress(hKernel32, "CreateSymbolicLinkW");
+ *(FARPROC*)&Py_CreateSymbolicLinkW = GetProcAddress(hKernel32,
+ "CreateSymbolicLinkW");
if (Py_CreateSymbolicLinkW)
has_CreateSymbolicLinkW = 1;
return has_CreateSymbolicLinkW;
@@ -7586,7 +7597,8 @@
{"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__},
+ {"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__},
More information about the Python-checkins
mailing list