From af2362a584c01dec32d7f1a23d3e6f653f11dde4 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 15 May 2007 22:32:02 +0000 Subject: [PATCH] Make test_sys pass. --- Lib/subprocess.py | 7 +++---- Lib/test/test_sys.py | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 30c2a243a8..22de0ced4a 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -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 diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 36cca2cd39..af4c2a7cb3 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -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) -- 2.40.0