[Python-checkins] r60086 - in python/trunk: Doc/library/mmap.rst Lib/test/test_mmap.py Misc/ACKS Misc/NEWS Modules/mmapmodule.c
andrew.kuchling
python-checkins at python.org
Sat Jan 19 19:18:41 CET 2008
Author: andrew.kuchling
Date: Sat Jan 19 19:18:41 2008
New Revision: 60086
Modified:
python/trunk/Doc/library/mmap.rst
python/trunk/Lib/test/test_mmap.py
python/trunk/Misc/ACKS
python/trunk/Misc/NEWS
python/trunk/Modules/mmapmodule.c
Log:
Patch #976880: add mmap .rfind() method, and 'end' paramter to .find().
Contributed by John Lenton.
Modified: python/trunk/Doc/library/mmap.rst
==============================================================================
--- python/trunk/Doc/library/mmap.rst (original)
+++ python/trunk/Doc/library/mmap.rst Sat Jan 19 19:18:41 2008
@@ -139,11 +139,12 @@
an exception being raised.
-.. method:: mmap.find(string[, start])
+.. method:: mmap.find(string[, start[, end]])
- Returns the lowest index in the object where the substring *string* is found.
- Returns ``-1`` on failure. *start* is the index at which the search begins, and
- defaults to zero.
+ Returns the lowest index in the object where the substring *string* is found,
+ such that *string* is contained in the range [*start*, *end*]. Optional
+ arguments *start* and *end* are interpreted as in slice notation.
+ Returns ``-1`` on failure.
.. method:: mmap.flush([offset, size])
@@ -188,6 +189,14 @@
:exc:`TypeError` exception.
+.. method:: mmap.rfind(string[, start[, end]])
+
+ Returns the highest index in the object where the substring *string* is
+ found, such that *string* is contained in the range [*start*,
+ *end*]. Optional arguments *start* and *end* are interpreted as in slice
+ notation. Returns ``-1`` on failure.
+
+
.. method:: mmap.seek(pos[, whence])
Set the file's current position. *whence* argument is optional and defaults to
Modified: python/trunk/Lib/test/test_mmap.py
==============================================================================
--- python/trunk/Lib/test/test_mmap.py (original)
+++ python/trunk/Lib/test/test_mmap.py Sat Jan 19 19:18:41 2008
@@ -255,6 +255,42 @@
self.assertEqual(m.find(slice + 'x'), -1)
m.close()
+ def test_find_end(self):
+ # test the new 'end' parameter works as expected
+ f = open(TESTFN, 'w+')
+ data = 'one two ones'
+ n = len(data)
+ f.write(data)
+ f.flush()
+ m = mmap.mmap(f.fileno(), n)
+ f.close()
+
+ self.assertEqual(m.find('one'), 0)
+ self.assertEqual(m.find('ones'), 8)
+ self.assertEqual(m.find('one', 0, -1), 0)
+ self.assertEqual(m.find('one', 1), 8)
+ self.assertEqual(m.find('one', 1, -1), 8)
+ self.assertEqual(m.find('one', 1, -2), -1)
+
+
+ def test_rfind(self):
+ # test the new 'end' parameter works as expected
+ f = open(TESTFN, 'w+')
+ data = 'one two ones'
+ n = len(data)
+ f.write(data)
+ f.flush()
+ m = mmap.mmap(f.fileno(), n)
+ f.close()
+
+ self.assertEqual(m.rfind('one'), 8)
+ self.assertEqual(m.rfind('one '), 0)
+ self.assertEqual(m.rfind('one', 0, -1), 8)
+ self.assertEqual(m.rfind('one', 0, -2), 0)
+ self.assertEqual(m.rfind('one', 1, -1), 8)
+ self.assertEqual(m.rfind('one', 1, -2), -1)
+
+
def test_double_close(self):
# make sure a double close doesn't crash on Solaris (Bug# 665913)
f = open(TESTFN, 'w+')
Modified: python/trunk/Misc/ACKS
==============================================================================
--- python/trunk/Misc/ACKS (original)
+++ python/trunk/Misc/ACKS Sat Jan 19 19:18:41 2008
@@ -395,6 +395,7 @@
Joerg Lehmann
Luke Kenneth Casson Leighton
Marc-Andre Lemburg
+John Lenton
Mark Levinson
William Lewis
Robert van Liere
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Sat Jan 19 19:18:41 2008
@@ -1011,6 +1011,10 @@
Extension Modules
-----------------
+- Patch 976880: ``mmap`` objects now have an ``rfind`` method that
+ works as expected. ``mmap.find`` also takes an optional ``end``
+ parameter.
+
- _winreg's HKEY object has gained __enter__ and __exit__ methods to support
the context manager protocol. The _winreg module also gained a new function
``ExpandEnvironmentStrings`` to expand REG_EXPAND_SZ keys.
Modified: python/trunk/Modules/mmapmodule.c
==============================================================================
--- python/trunk/Modules/mmapmodule.c (original)
+++ python/trunk/Modules/mmapmodule.c Sat Jan 19 19:18:41 2008
@@ -248,19 +248,22 @@
}
static PyObject *
-mmap_find_method(mmap_object *self,
- PyObject *args)
+mmap_gfind(mmap_object *self,
+ PyObject *args,
+ int reverse)
{
Py_ssize_t start = self->pos;
+ Py_ssize_t end = self->size;
char *needle;
Py_ssize_t len;
CHECK_VALID(NULL);
- if (!PyArg_ParseTuple(args, "s#|n:find", &needle, &len, &start)) {
+ if (!PyArg_ParseTuple(args, reverse ? "s#|nn:rfind" : "s#|nn:find",
+ &needle, &len, &start, &end)) {
return NULL;
} else {
char *p;
- char *e = self->data + self->size;
+ char sign = reverse ? -1 : 1;
if (start < 0)
start += self->size;
@@ -269,7 +272,18 @@
else if ((size_t)start > self->size)
start = self->size;
- for (p = self->data + start; p + len <= e; ++p) {
+ if (end < 0)
+ end += self->size;
+ if (end < 0)
+ end = 0;
+ else if ((size_t)end > self->size)
+ end = self->size;
+
+ start += (Py_ssize_t)self->data;
+ end += (Py_ssize_t)self->data;
+
+ for (p = (char *)(reverse ? end - len : start);
+ p >= (char *)start && p + len <= (char *)end; p+=sign) {
Py_ssize_t i;
for (i = 0; i < len && needle[i] == p[i]; ++i)
/* nothing */;
@@ -281,6 +295,20 @@
}
}
+static PyObject *
+mmap_find_method(mmap_object *self,
+ PyObject *args)
+{
+ return mmap_gfind(self, args, 0);
+}
+
+static PyObject *
+mmap_rfind_method(mmap_object *self,
+ PyObject *args)
+{
+ return mmap_gfind(self, args, 1);
+}
+
static int
is_writeable(mmap_object *self)
{
@@ -593,6 +621,7 @@
static struct PyMethodDef mmap_object_methods[] = {
{"close", (PyCFunction) mmap_close_method, METH_NOARGS},
{"find", (PyCFunction) mmap_find_method, METH_VARARGS},
+ {"rfind", (PyCFunction) mmap_rfind_method, METH_VARARGS},
{"flush", (PyCFunction) mmap_flush_method, METH_VARARGS},
{"move", (PyCFunction) mmap_move_method, METH_VARARGS},
{"read", (PyCFunction) mmap_read_method, METH_VARARGS},
More information about the Python-checkins
mailing list