mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 67089,67091,67101 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67089 | benjamin.peterson | 2008-11-03 14:43:20 -0600 (Mon, 03 Nov 2008) | 1 line

  clarify by splitting into multiple paragraphs
........
  r67091 | benjamin.peterson | 2008-11-03 16:34:57 -0600 (Mon, 03 Nov 2008) | 1 line

  move a FileIO test to test_fileio
........
  r67101 | georg.brandl | 2008-11-04 14:49:35 -0600 (Tue, 04 Nov 2008) | 2 lines

  #4167: fix markup glitches.
........
This commit is contained in:
Benjamin Peterson 2008-11-05 21:42:45 +00:00
parent bd587059a6
commit 65676e407c
4 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Doc/library/select.rst
View file

@ -355,7 +355,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
Filter specific flags Filter specific flags
*:const:`KQ_FILTER_READ` and :const:`KQ_FILTER_WRITE` filter flags* :const:`KQ_FILTER_READ` and :const:`KQ_FILTER_WRITE` filter flags
+----------------------------+--------------------------------------------+ +----------------------------+--------------------------------------------+
| Constant | Meaning | | Constant | Meaning |
@ -364,7 +364,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
+----------------------------+--------------------------------------------+ +----------------------------+--------------------------------------------+
*:const:`KQ_FILTER_VNODE` filter flags* :const:`KQ_FILTER_VNODE` filter flags
+----------------------------+--------------------------------------------+ +----------------------------+--------------------------------------------+
| Constant | Meaning | | Constant | Meaning |
@ -385,7 +385,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
+----------------------------+--------------------------------------------+ +----------------------------+--------------------------------------------+
*:const:`KQ_FILTER_PROC` filter flags* :const:`KQ_FILTER_PROC` filter flags
+----------------------------+--------------------------------------------+ +----------------------------+--------------------------------------------+
| Constant | Meaning | | Constant | Meaning |
@ -408,7 +408,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
| :const:`KQ_NOTE_TRACKERR` | unable to attach to a child | | :const:`KQ_NOTE_TRACKERR` | unable to attach to a child |
+----------------------------+--------------------------------------------+ +----------------------------+--------------------------------------------+
*:const:`KQ_FILTER_NETDEV` filter flags* [not available on Mac OS X] :const:`KQ_FILTER_NETDEV` filter flags [not available on Mac OS X]
+----------------------------+--------------------------------------------+ +----------------------------+--------------------------------------------+
| Constant | Meaning | | Constant | Meaning |

14
Doc/library/socket.rst
View file

@ -260,11 +260,15 @@ The module :mod:`socket` exports the following constants and functions:
.. function:: gethostname() .. function:: gethostname()
Return a string containing the hostname of the machine where the Python Return a string containing the hostname of the machine where the Python
interpreter is currently executing. If you want to know the current machine's IP interpreter is currently executing.
address, you may want to use ``gethostbyname(gethostname())``. This operation
assumes that there is a valid address-to-host mapping for the host, and the If you want to know the current machine's IP address, you may want to use
assumption does not always hold. Note: :func:`gethostname` doesn't always return ``gethostbyname(gethostname())``. This operation assumes that there is a
the fully qualified domain name; use ``getfqdn()`` (see above). valid address-to-host mapping for the host, and the assumption does not
always hold.
Note: :func:`gethostname` doesn't always return the fully qualified domain
name; use ``getfqdn()`` (see above).
.. function:: gethostbyaddr(ip_address) .. function:: gethostbyaddr(ip_address)

10
Lib/test/test_fileio.py
View file

@ -6,7 +6,7 @@ import unittest
from array import array from array import array
from weakref import proxy from weakref import proxy
from test.support import TESTFN, findfile, run_unittest from test.support import TESTFN, findfile, check_warnings, run_unittest
from collections import UserList from collections import UserList
import _fileio import _fileio
@ -240,6 +240,14 @@ class OtherFileTests(unittest.TestCase):
def testInvalidInit(self): def testInvalidInit(self):
self.assertRaises(TypeError, _fileio._FileIO, "1", 0, 0) self.assertRaises(TypeError, _fileio._FileIO, "1", 0, 0)
def testWarnings(self):
with check_warnings() as w:
self.assertEqual(w.warnings, [])
self.assertRaises(TypeError, _fileio._FileIO, [])
self.assertEqual(w.warnings, [])
self.assertRaises(ValueError, _fileio._FileIO, "/some/invalid/name", "rt")
self.assertEqual(w.warnings, [])
def test_main(): def test_main():
# Historically, these tests have been sloppy about removing TESTFN. # Historically, these tests have been sloppy about removing TESTFN.

1
Lib/test/test_io.py
View file

@ -1260,6 +1260,7 @@ class MiscIOTest(unittest.TestCase):
else: else:
self.assert_(issubclass(obj, io.IOBase)) self.assert_(issubclass(obj, io.IOBase))
def test_main(): def test_main():
support.run_unittest(IOTest, BytesIOTest, StringIOTest, support.run_unittest(IOTest, BytesIOTest, StringIOTest,
BufferedReaderTest, BufferedWriterTest, BufferedReaderTest, BufferedWriterTest,