[Zodb-checkins] SVN: ZODB/trunk/s Removed the no-longer needed winlock module.

Jim Fulton jim at zope.com
Fri May 18 14:01:58 EDT 2007


Log message for revision 75837:
  Removed the no-longer needed winlock module.
  

Changed:
  U   ZODB/trunk/setup.py
  D   ZODB/trunk/src/ZODB/winlock.c

-=-
Modified: ZODB/trunk/setup.py
===================================================================
--- ZODB/trunk/setup.py	2007-05-18 18:01:54 UTC (rev 75836)
+++ ZODB/trunk/setup.py	2007-05-18 18:01:57 UTC (rev 75837)
@@ -162,15 +162,10 @@
                       sources= ['src/persistent/TimeStamp.c']
                       )
 
-winlock = Extension(name = 'ZODB.winlock',
-                    include_dirs = include,
-                    sources = ['src/ZODB/winlock.c']
-                    )
 
 exts += [cPersistence,
          cPickleCache,
          TimeStamp,
-         winlock,
         ]
 
 # The ZODB.zodb4 code is not being packaged, because it is only

Deleted: ZODB/trunk/src/ZODB/winlock.c
===================================================================
--- ZODB/trunk/src/ZODB/winlock.c	2007-05-18 18:01:54 UTC (rev 75836)
+++ ZODB/trunk/src/ZODB/winlock.c	2007-05-18 18:01:57 UTC (rev 75837)
@@ -1,105 +0,0 @@
-/*****************************************************************************
-
-  Copyright (c) 2001, 2002 Zope Corporation and Contributors.
-  All Rights Reserved.
-
-  This software is subject to the provisions of the Zope Public License,
-  Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-  WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-  FOR A PARTICULAR PURPOSE
-
- ****************************************************************************/
-static char winlock_doc_string[] =
-"Lock files on Windows."
-"\n"
-"$Id$\n";
-
-#include "Python.h"
-
-static PyObject *Error;
-
-#ifdef MS_WIN32
-
-#include <windows.h>
-#include <io.h>
-
-/* LOCK_FUNC is the shared type of Win32 LockFile and UnlockFile. */
-typedef WINBASEAPI BOOL WINAPI LOCK_FUNC(HANDLE, DWORD, DWORD, DWORD, DWORD);
-
-static PyObject *
-common(LOCK_FUNC func, PyObject *args)
-{
-	int fileno;
-	long h, ofslo, ofshi, lenlo, lenhi;
-
-	if (! PyArg_ParseTuple(args, "illll", &fileno,
-			       &ofslo, &ofshi,
-			       &lenlo, &lenhi))
-		return NULL;
-
-	h = _get_osfhandle(fileno);
-	if (h == -1) {
-		PyErr_SetString(Error, "_get_osfhandle failed");
-		return NULL;
-	}
-	if (func((HANDLE)h, ofslo, ofshi, lenlo, lenhi)) {
-		Py_INCREF(Py_None);
-		return Py_None;
-	}
-	PyErr_SetObject(Error, PyInt_FromLong(GetLastError()));
-	return NULL;
-}
-
-static PyObject *
-winlock(PyObject *ignored, PyObject *args)
-{
-	return common(LockFile, args);
-}
-
-static PyObject *
-winunlock(PyObject *ignored, PyObject *args)
-{
-	return common(UnlockFile, args);
-}
-
-static struct PyMethodDef methods[] = {
-    {"LockFile",	(PyCFunction)winlock,	METH_VARARGS,
-     "LockFile(fileno, offsetLow, offsetHigh, lengthLow, lengthHigh) -- "
-     "Lock the file associated with fileno"},
-
-    {"UnlockFile",	(PyCFunction)winunlock,	METH_VARARGS,
-     "UnlockFile(fileno, offsetLow, offsetHigh, lengthLow, lengthHigh) -- "
-     "Unlock the file associated with fileno"},
-
-    {NULL,		NULL}		/* sentinel */
-};
-#else
-
-static struct PyMethodDef methods[] = {
-  {NULL,		NULL}		/* sentinel */
-};
-
-#endif
-
-/* Initialization function for the module (*must* be called initwinlock) */
-
-#ifndef DL_EXPORT	/* declarations for DLL import/export */
-#define DL_EXPORT(RTYPE) RTYPE
-#endif
-DL_EXPORT(void)
-initwinlock(void)
-{
-	PyObject *m, *d;
-
-	if (!(Error=PyString_FromString("winlock.error")))
-		return;
-
-	/* Create the module and add the functions */
-	m = Py_InitModule4("winlock", methods, winlock_doc_string,
-			   (PyObject*)NULL, PYTHON_API_VERSION);
-
-	d = PyModule_GetDict(m);
-	PyDict_SetItemString(d, "error", Error);
-}



More information about the Zodb-checkins mailing list