Serhiy Storchaka added the comment:
Patch updated. Added tests.
----------
Added file: http://bugs.python.org/file27243/posix_path_converter_2.patch
_______________________________________
Python tracker <rep...@bugs.python.org>
<http://bugs.python.org/issue15972>
_______________________________________
diff -r 24136a775943 Lib/test/test_posix.py
--- a/Lib/test/test_posix.py Thu Sep 20 23:49:33 2012 -0400
+++ b/Lib/test/test_posix.py Fri Sep 21 11:47:25 2012 +0300
@@ -358,12 +358,24 @@
try:
self.assertTrue(posix.fstat(fp.fileno()))
self.assertTrue(posix.stat(fp.fileno()))
+
+ self.assertRaisesRegex(TypeError, 'should be string, bytes or
integer, not',
+ posix.stat, float(fp.fileno()))
finally:
fp.close()
def test_stat(self):
if hasattr(posix, 'stat'):
self.assertTrue(posix.stat(support.TESTFN))
+ self.assertTrue(posix.stat(os.fsencode(support.TESTFN)))
+ self.assertTrue(posix.stat(bytearray(os.fsencode(support.TESTFN))))
+
+ self.assertRaisesRegex(TypeError, 'can\'t specify None for path
argument',
+ posix.stat, None)
+ self.assertRaisesRegex(TypeError, 'should be string, bytes or
integer, not',
+ posix.stat, list(support.TESTFN))
+ self.assertRaisesRegex(TypeError, 'should be string, bytes or
integer, not',
+ posix.stat, list(os.fsencode(support.TESTFN)))
@unittest.skipUnless(hasattr(posix, 'mkfifo'), "don't have mkfifo()")
def test_mkfifo(self):
@@ -721,6 +733,13 @@
s1 = posix.stat(support.TESTFN)
s2 = posix.stat(support.TESTFN, dir_fd=f)
self.assertEqual(s1, s2)
+ s2 = posix.stat(support.TESTFN, dir_fd=None)
+ self.assertEqual(s1, s2)
+ self.assertRaisesRegex(TypeError, 'should be integer, not',
+ posix.stat, support.TESTFN, dir_fd=posix.getcwd())
+ self.assertRaisesRegex(TypeError, 'should be integer, not',
+ posix.stat, support.TESTFN, dir_fd=float(f))
+ self.assertRaises(OverflowError, posix.stat, support.TESTFN,
dir_fd=10**20)
finally:
posix.close(f)
diff -r 24136a775943 Modules/posixmodule.c
--- a/Modules/posixmodule.c Thu Sep 20 23:49:33 2012 -0400
+++ b/Modules/posixmodule.c Fri Sep 21 11:47:25 2012 +0300
@@ -427,26 +427,24 @@
#endif
static int
-_fd_converter(PyObject *o, int *p, int default_value) {
- long long_value;
- if (o == Py_None) {
- *p = default_value;
- return 1;
- }
- if (PyFloat_Check(o)) {
- PyErr_SetString(PyExc_TypeError,
- "integer argument expected, got float" );
+_fd_converter(PyObject *o, int *p, const char *allowed)
+{
+ int overflow;
+ long long_value = PyLong_AsLongAndOverflow(o, &overflow);
+ if (PyFloat_Check(o) ||
+ (long_value == -1 && !overflow && PyErr_Occurred())) {
+ PyErr_Clear();
+ PyErr_Format(PyExc_TypeError,
+ "argument should be %s, not %.200s",
+ allowed, Py_TYPE(o)->tp_name);
return 0;
}
- long_value = PyLong_AsLong(o);
- if (long_value == -1 && PyErr_Occurred())
- return 0;
- if (long_value > INT_MAX) {
+ if (overflow > 0 || long_value > INT_MAX) {
PyErr_SetString(PyExc_OverflowError,
"signed integer is greater than maximum");
return 0;
}
- if (long_value < INT_MIN) {
+ if (overflow < 0 || long_value < INT_MIN) {
PyErr_SetString(PyExc_OverflowError,
"signed integer is less than minimum");
return 0;
@@ -456,8 +454,13 @@
}
static int
-dir_fd_converter(PyObject *o, void *p) {
- return _fd_converter(o, (int *)p, DEFAULT_DIR_FD);
+dir_fd_converter(PyObject *o, void *p)
+{
+ if (o == Py_None) {
+ *(int *)p = DEFAULT_DIR_FD;
+ return 1;
+ }
+ return _fd_converter(o, (int *)p, "integer");
}
@@ -634,17 +637,16 @@
}
else {
PyErr_Clear();
- bytes = PyBytes_FromObject(o);
+ if (PyObject_CheckBuffer(o))
+ bytes = PyBytes_FromObject(o);
+ else
+ bytes = NULL;
if (!bytes) {
PyErr_Clear();
if (path->allow_fd) {
int fd;
- /*
- * note: _fd_converter always permits None.
- * but we've already done our None check.
- * so o cannot be None at this point.
- */
- int result = _fd_converter(o, &fd, -1);
+ int result = _fd_converter(o, &fd,
+ "string, bytes or integer");
if (result) {
path->wide = NULL;
path->narrow = NULL;
@@ -705,15 +707,17 @@
}
static int
-dir_fd_unavailable(PyObject *o, void *p) {
- int *dir_fd = (int *)p;
- int return_value = _fd_converter(o, dir_fd, DEFAULT_DIR_FD);
- if (!return_value)
+dir_fd_unavailable(PyObject *o, void *p)
+{
+ int dir_fd;
+ if (!dir_fd_converter(o, &dir_fd))
return 0;
- if (*dir_fd == DEFAULT_DIR_FD)
- return 1;
- argument_unavailable_error(NULL, "dir_fd");
- return 0;
+ if (dir_fd != DEFAULT_DIR_FD) {
+ argument_unavailable_error(NULL, "dir_fd");
+ return 0;
+ }
+ *(int *)p = dir_fd;
+ return 1;
}
static int
_______________________________________________
Python-bugs-list mailing list
Unsubscribe:
http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com