mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Make test_sys pass.

Browse source
This commit is contained in:
Guido van Rossum 2007-05-15 22:32:02 +00:00
parent 7f21d306d4
commit af2362a584
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/subprocess.py
View file

@ -287,7 +287,6 @@ import sys
mswindows = (sys.platform == "win32")
import os
import types
import traceback
# Exception classes used by this module.
@ -700,7 +699,7 @@ class Popen(object):
errread, errwrite):
"""Execute program (MS Windows version)"""
if not isinstance(args, types.StringTypes):
if not isinstance(args, basestring):
args = list2cmdline(args)
# Process startup details
@ -917,7 +916,7 @@ class Popen(object):
errread, errwrite):
"""Execute program (POSIX version)"""
if isinstance(args, types.StringTypes):
if isinstance(args, basestring):
args = [args]
else:
args = list(args)
@ -1005,7 +1004,7 @@ class Popen(object):
# Wait for exec to fail or succeed; possibly raising exception
data = os.read(errpipe_read, 1048576) # Exceptions limited to 1 MB
os.close(errpipe_read)
if data != "":
if data:
os.waitpid(self.pid, 0)
child_exception = pickle.loads(data)
raise child_exception

4
Lib/test/test_sys.py
View file

@ -174,7 +174,7 @@ class SysModuleTest(unittest.TestCase):
if test.test_support.have_unicode:
self.assertRaises(TypeError, sys.getdefaultencoding, 42)
# can't check more than the type, as the user might have changed it
self.assert_(isinstance(sys.getdefaultencoding(), str))
self.assert_(isinstance(sys.getdefaultencoding(), basestring))
# testing sys.settrace() is done in test_trace.py
# testing sys.setprofile() is done in test_profile.py
@ -349,7 +349,7 @@ class SysModuleTest(unittest.TestCase):
def test_intern(self):
self.assertRaises(TypeError, sys.intern)
s = "never interned before"
s = str8("never interned before")
self.assert_(sys.intern(s) is s)
s2 = s.swapcase().swapcase()
self.assert_(sys.intern(s2) is s)