[Python-checkins] r73159 - in python/branches/tk_and_idle_maintenance: Lib/distutils/spawn.py Lib/distutils/tests/test_spawn.py Lib/ipaddr.py Lib/socket.py Lib/test/test_ipaddr.py Lib/test/test_unittest.py Lib/unittest.py
guilherme.polo
python-checkins at python.org
Wed Jun 3 00:23:02 CEST 2009
Author: guilherme.polo
Date: Wed Jun 3 00:22:54 2009
New Revision: 73159
Log:
Merged revisions 73135,73138,73145,73147,73151 via svnmerge from
svn+ssh://pythondev/python/trunk
........
r73135 | gregory.p.smith | 2009-06-02 02:25:34 -0300 (Tue, 02 Jun 2009) | 3 lines
Fixes issue6169: it was possible for two ipaddr network addresses to compare
as both < and > than eachother.
........
r73138 | mark.dickinson | 2009-06-02 04:39:26 -0300 (Tue, 02 Jun 2009) | 1 line
Typo in socket.py. Thanks Pablo Torres Navarrete.
........
r73145 | kristjan.jonsson | 2009-06-02 10:14:08 -0300 (Tue, 02 Jun 2009) | 2 lines
http://bugs.python.org/issue6117
Fix O(n**2) performance problem in socket._fileobject
........
r73147 | tarek.ziade | 2009-06-02 12:58:43 -0300 (Tue, 02 Jun 2009) | 1 line
improved distutils.spawn test coverage + cleaned it up
........
r73151 | michael.foord | 2009-06-02 15:08:27 -0300 (Tue, 02 Jun 2009) | 1 line
Restore default testRunner argument in unittest.main to None. Issue 6177
........
Modified:
python/branches/tk_and_idle_maintenance/ (props changed)
python/branches/tk_and_idle_maintenance/Lib/distutils/spawn.py
python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_spawn.py
python/branches/tk_and_idle_maintenance/Lib/ipaddr.py
python/branches/tk_and_idle_maintenance/Lib/socket.py
python/branches/tk_and_idle_maintenance/Lib/test/test_ipaddr.py
python/branches/tk_and_idle_maintenance/Lib/test/test_unittest.py
python/branches/tk_and_idle_maintenance/Lib/unittest.py
Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/spawn.py
==============================================================================
--- python/branches/tk_and_idle_maintenance/Lib/distutils/spawn.py (original)
+++ python/branches/tk_and_idle_maintenance/Lib/distutils/spawn.py Wed Jun 3 00:22:54 2009
@@ -8,17 +8,16 @@
__revision__ = "$Id$"
-import sys, os, string
-from distutils.errors import *
+import sys
+import os
+
+from distutils.errors import DistutilsPlatformError, DistutilsExecError
from distutils import log
-def spawn (cmd,
- search_path=1,
- verbose=0,
- dry_run=0):
+def spawn(cmd, search_path=1, verbose=0, dry_run=0):
+ """Run another program, specified as a command list 'cmd', in a new process.
- """Run another program, specified as a command list 'cmd', in a new
- process. 'cmd' is just the argument list for the new process, ie.
+ 'cmd' is just the argument list for the new process, ie.
cmd[0] is the program to run and cmd[1:] are the rest of its arguments.
There is no way to run a program with a name different from that of its
executable.
@@ -41,37 +40,29 @@
raise DistutilsPlatformError, \
"don't know how to spawn programs on platform '%s'" % os.name
-# spawn ()
-
+def _nt_quote_args(args):
+ """Quote command-line arguments for DOS/Windows conventions.
-def _nt_quote_args (args):
- """Quote command-line arguments for DOS/Windows conventions: just
- wraps every argument which contains blanks in double quotes, and
+ Just wraps every argument which contains blanks in double quotes, and
returns a new argument list.
"""
-
# XXX this doesn't seem very robust to me -- but if the Windows guys
# say it'll work, I guess I'll have to accept it. (What if an arg
# contains quotes? What other magic characters, other than spaces,
# have to be escaped? Is there an escaping mechanism other than
# quoting?)
-
- for i in range(len(args)):
- if string.find(args[i], ' ') != -1:
- args[i] = '"%s"' % args[i]
+ for i, arg in enumerate(args):
+ if ' ' in arg:
+ args[i] = '"%s"' % arg
return args
-def _spawn_nt (cmd,
- search_path=1,
- verbose=0,
- dry_run=0):
-
+def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
executable = cmd[0]
cmd = _nt_quote_args(cmd)
if search_path:
# either we find one or it stays the same
executable = find_executable(executable) or executable
- log.info(string.join([executable] + cmd[1:], ' '))
+ log.info(' '.join([executable] + cmd[1:]))
if not dry_run:
# spawn for NT requires a full path to the .exe
try:
@@ -85,18 +76,12 @@
raise DistutilsExecError, \
"command '%s' failed with exit status %d" % (cmd[0], rc)
-
-def _spawn_os2 (cmd,
- search_path=1,
- verbose=0,
- dry_run=0):
-
+def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
executable = cmd[0]
- #cmd = _nt_quote_args(cmd)
if search_path:
# either we find one or it stays the same
executable = find_executable(executable) or executable
- log.info(string.join([executable] + cmd[1:], ' '))
+ log.info(' '.join([executable] + cmd[1:]))
if not dry_run:
# spawnv for OS/2 EMX requires a full path to the .exe
try:
@@ -107,27 +92,20 @@
"command '%s' failed: %s" % (cmd[0], exc[-1])
if rc != 0:
# and this reflects the command running but failing
- print "command '%s' failed with exit status %d" % (cmd[0], rc)
+ log.debug("command '%s' failed with exit status %d" % (cmd[0], rc))
raise DistutilsExecError, \
"command '%s' failed with exit status %d" % (cmd[0], rc)
-def _spawn_posix (cmd,
- search_path=1,
- verbose=0,
- dry_run=0):
-
- log.info(string.join(cmd, ' '))
+def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
+ log.info(' '.join(cmd))
if dry_run:
return
exec_fn = search_path and os.execvp or os.execv
-
pid = os.fork()
- if pid == 0: # in the child
+ if pid == 0: # in the child
try:
- #print "cmd[0] =", cmd[0]
- #print "cmd =", cmd
exec_fn(cmd[0], cmd)
except OSError, e:
sys.stderr.write("unable to execute %s: %s\n" %
@@ -136,14 +114,12 @@
sys.stderr.write("unable to execute %s for unknown reasons" % cmd[0])
os._exit(1)
-
-
- else: # in the parent
+ else: # in the parent
# Loop until the child either exits or is terminated by a signal
# (ie. keep waiting if it's merely stopped)
while 1:
try:
- (pid, status) = os.waitpid(pid, 0)
+ pid, status = os.waitpid(pid, 0)
except OSError, exc:
import errno
if exc.errno == errno.EINTR:
@@ -158,7 +134,7 @@
elif os.WIFEXITED(status):
exit_status = os.WEXITSTATUS(status)
if exit_status == 0:
- return # hey, it succeeded!
+ return # hey, it succeeded!
else:
raise DistutilsExecError, \
"command '%s' failed with exit status %d" % \
@@ -171,21 +147,21 @@
raise DistutilsExecError, \
"unknown error executing '%s': termination status %d" % \
(cmd[0], status)
-# _spawn_posix ()
-
def find_executable(executable, path=None):
- """Try to find 'executable' in the directories listed in 'path' (a
- string listing directories separated by 'os.pathsep'; defaults to
- os.environ['PATH']). Returns the complete filename or None if not
- found.
+ """Tries to find 'executable' in the directories listed in 'path'.
+
+ A string listing directories separated by 'os.pathsep'; defaults to
+ os.environ['PATH']. Returns the complete filename or None if not found.
"""
if path is None:
path = os.environ['PATH']
- paths = string.split(path, os.pathsep)
- (base, ext) = os.path.splitext(executable)
+ paths = path.split(os.pathsep)
+ base, ext = os.path.splitext(executable)
+
if (sys.platform == 'win32' or os.name == 'os2') and (ext != '.exe'):
executable = executable + '.exe'
+
if not os.path.isfile(executable):
for p in paths:
f = os.path.join(p, executable)
@@ -195,5 +171,3 @@
return None
else:
return executable
-
-# find_executable()
Modified: python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_spawn.py
==============================================================================
--- python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_spawn.py (original)
+++ python/branches/tk_and_idle_maintenance/Lib/distutils/tests/test_spawn.py Wed Jun 3 00:22:54 2009
@@ -1,8 +1,17 @@
"""Tests for distutils.spawn."""
import unittest
+import os
+import time
+from test.test_support import captured_stdout
+
from distutils.spawn import _nt_quote_args
+from distutils.spawn import spawn, find_executable
+from distutils.errors import DistutilsExecError
+from distutils.tests import support
-class SpawnTestCase(unittest.TestCase):
+class SpawnTestCase(support.TempdirManager,
+ support.LoggingSilencer,
+ unittest.TestCase):
def test_nt_quote_args(self):
@@ -13,6 +22,37 @@
res = _nt_quote_args(args)
self.assertEquals(res, wanted)
+
+ @unittest.skipUnless(os.name in ('nt', 'posix'),
+ 'Runs only under posix or nt')
+ def test_spawn(self):
+ tmpdir = self.mkdtemp()
+
+ # creating something executable
+ # through the shell that returns 1
+ if os.name == 'posix':
+ exe = os.path.join(tmpdir, 'foo.sh')
+ self.write_file(exe, '#!/bin/sh\nexit 1')
+ os.chmod(exe, 0777)
+ else:
+ exe = os.path.join(tmpdir, 'foo.bat')
+ self.write_file(exe, 'exit 1')
+
+ os.chmod(exe, 0777)
+ self.assertRaises(DistutilsExecError, spawn, [exe])
+
+ # now something that works
+ if os.name == 'posix':
+ exe = os.path.join(tmpdir, 'foo.sh')
+ self.write_file(exe, '#!/bin/sh\nexit 0')
+ os.chmod(exe, 0777)
+ else:
+ exe = os.path.join(tmpdir, 'foo.bat')
+ self.write_file(exe, 'exit 0')
+
+ os.chmod(exe, 0777)
+ spawn([exe]) # should work without any error
+
def test_suite():
return unittest.makeSuite(SpawnTestCase)
Modified: python/branches/tk_and_idle_maintenance/Lib/ipaddr.py
==============================================================================
--- python/branches/tk_and_idle_maintenance/Lib/ipaddr.py (original)
+++ python/branches/tk_and_idle_maintenance/Lib/ipaddr.py Wed Jun 3 00:22:54 2009
@@ -10,7 +10,7 @@
"""
-__version__ = '1.1.0'
+__version__ = '1.1.1'
import struct
@@ -204,17 +204,25 @@
def __lt__(self, other):
try:
- return (self.version < other.version
- or self.ip < other.ip
- or self.netmask < other.netmask)
+ if self.version != other.version:
+ return self.version < other.version
+ if self.ip != other.ip:
+ return self.ip < other.ip
+ if self.netmask != other.netmask:
+ return self.netmask < other.netmask
+ return False
except AttributeError:
return NotImplemented
def __gt__(self, other):
try:
- return (self.version > other.version
- or self.ip > other.ip
- or self.netmask > other.netmask)
+ if self.version != other.version:
+ return self.version > other.version
+ if self.ip != other.ip:
+ return self.ip > other.ip
+ if self.netmask != other.netmask:
+ return self.netmask > other.netmask
+ return False
except AttributeError:
return NotImplemented
Modified: python/branches/tk_and_idle_maintenance/Lib/socket.py
==============================================================================
--- python/branches/tk_and_idle_maintenance/Lib/socket.py (original)
+++ python/branches/tk_and_idle_maintenance/Lib/socket.py Wed Jun 3 00:22:54 2009
@@ -16,7 +16,7 @@
gethostbyname() -- map a hostname to its IP number
gethostbyaddr() -- map an IP number or hostname to DNS info
getservbyname() -- map a service name and a protocol name to a port number
-getprotobyname() -- mape a protocol name (e.g. 'tcp') to a number
+getprotobyname() -- map a protocol name (e.g. 'tcp') to a number
ntohs(), ntohl() -- convert 16, 32 bit int from network to host byte order
htons(), htonl() -- convert 16, 32 bit int from host to network byte order
inet_aton() -- convert IP addr string (123.45.67.89) to 32-bit packed format
@@ -235,7 +235,7 @@
__slots__ = ["mode", "bufsize", "softspace",
# "closed" is a property, see below
- "_sock", "_rbufsize", "_wbufsize", "_rbuf", "_wbuf",
+ "_sock", "_rbufsize", "_wbufsize", "_rbuf", "_wbuf", "_wbuf_len",
"_close"]
def __init__(self, sock, mode='rb', bufsize=-1, close=False):
@@ -261,6 +261,7 @@
# realloc()ed down much smaller than their original allocation.
self._rbuf = StringIO()
self._wbuf = [] # A list of strings
+ self._wbuf_len = 0
self._close = close
def _getclosed(self):
@@ -287,6 +288,7 @@
if self._wbuf:
buffer = "".join(self._wbuf)
self._wbuf = []
+ self._wbuf_len = 0
self._sock.sendall(buffer)
def fileno(self):
@@ -297,25 +299,22 @@
if not data:
return
self._wbuf.append(data)
+ self._wbuf_len += len(data)
if (self._wbufsize == 0 or
self._wbufsize == 1 and '\n' in data or
- self._get_wbuf_len() >= self._wbufsize):
+ self._wbuf_len >= self._wbufsize):
self.flush()
def writelines(self, list):
# XXX We could do better here for very long lists
# XXX Should really reject non-string non-buffers
- self._wbuf.extend(filter(None, map(str, list)))
+ lines = filter(None, map(str, list))
+ self._wbuf_len += sum(map(len, lines))
+ self._wbuf.extend(lines)
if (self._wbufsize <= 1 or
- self._get_wbuf_len() >= self._wbufsize):
+ self._wbuf_len >= self._wbufsize):
self.flush()
- def _get_wbuf_len(self):
- buf_len = 0
- for x in self._wbuf:
- buf_len += len(x)
- return buf_len
-
def read(self, size=-1):
# Use max, disallow tiny reads in a loop as they are very inefficient.
# We never leave read() with any leftover data from a new recv() call
Modified: python/branches/tk_and_idle_maintenance/Lib/test/test_ipaddr.py
==============================================================================
--- python/branches/tk_and_idle_maintenance/Lib/test/test_ipaddr.py (original)
+++ python/branches/tk_and_idle_maintenance/Lib/test/test_ipaddr.py Wed Jun 3 00:22:54 2009
@@ -1,18 +1,6 @@
# Copyright 2007 Google Inc.
# Licensed to PSF under a Contributor Agreement.
#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
# See also: http://code.google.com/p/ipaddr-py/
"""Unittest for ipaddr module."""
@@ -373,6 +361,21 @@
self.assertTrue(ipv6 > ipv4)
self.assertTrue(ipv4 < ipv6)
+ # Regression test for issue6169 (ipaddr-py issue 19)
+ ip1 = ipaddr.IP('10.1.2.128/25')
+ self.assertFalse(ip1 < ip1)
+ self.assertFalse(ip1 > ip1)
+ ip2 = ipaddr.IP('10.1.3.0/24')
+ self.assertTrue(ip1 < ip2)
+ self.assertFalse(ip2 < ip1)
+ self.assertFalse(ip1 > ip2)
+ self.assertTrue(ip2 > ip1)
+ ip3 = ipaddr.IP('10.1.3.0/25')
+ self.assertTrue(ip2 < ip3)
+ self.assertFalse(ip3 < ip2)
+ self.assertFalse(ip2 > ip3)
+ self.assertTrue(ip3 > ip2)
+
def test_embedded_ipv4(self):
ipv4_string = '192.168.0.1'
ipv4 = ipaddr.IPv4(ipv4_string)
Modified: python/branches/tk_and_idle_maintenance/Lib/test/test_unittest.py
==============================================================================
--- python/branches/tk_and_idle_maintenance/Lib/test/test_unittest.py (original)
+++ python/branches/tk_and_idle_maintenance/Lib/test/test_unittest.py Wed Jun 3 00:22:54 2009
@@ -3325,6 +3325,14 @@
self.assertEqual(program.verbosity, 2)
+ def testTestProgram_testRunnerArgument(self):
+ program = object.__new__(TestProgram)
+ program.parseArgs = lambda _: None
+ program.runTests = lambda: None
+ program.__init__(testRunner=None)
+ self.assertEqual(program.testRunner, unittest.TextTestRunner)
+
+
class FooBar(unittest.TestCase):
def testPass(self):
assert True
Modified: python/branches/tk_and_idle_maintenance/Lib/unittest.py
==============================================================================
--- python/branches/tk_and_idle_maintenance/Lib/unittest.py (original)
+++ python/branches/tk_and_idle_maintenance/Lib/unittest.py Wed Jun 3 00:22:54 2009
@@ -1640,9 +1640,11 @@
"""
USAGE = USAGE
def __init__(self, module='__main__', defaultTest=None,
- argv=None, testRunner=TextTestRunner,
+ argv=None, testRunner=None,
testLoader=defaultTestLoader, exit=True,
verbosity=1):
+ if testRunner is None:
+ testRunner = TextTestRunner
if isinstance(module, basestring):
self.module = __import__(module)
for part in module.split('.')[1:]:
More information about the Python-checkins
mailing list