[Python-checkins] r65586 - in python/trunk: Lib/subprocess.py Misc/NEWS

[Brett Cannon]

On Thu, Aug 7, 2008 at 9:20 PM, Guido van Rossum <guido at python.org> wrote:
> You know, you can really just delete those lines, commenting them out
> makes no sense given that this source is only meant for 3.0 anyway...
>

Well, the reason I did it is that since it is in the 2.x tree and some
of these modules I have fixed are supposed to be backwards-compatible.
I figured a compromise on the backwards-compatibility is to leave the
code in, just commented out in case someone decides they want the 2.6
copy of subprocess or something but run it in 2.2.

-Brett


> On Thu, Aug 7, 2008 at 9:19 PM, brett.cannon <python-checkins at python.org> wrote:
>> Author: brett.cannon
>> Date: Fri Aug  8 06:19:32 2008
>> New Revision: 65586
>>
>> Log:
>> Remove warnings generated for the suprocess module when run under -3. Required
>> commenting out True/False compatbility stuff, remove a use of apply(), and
>> remove a use of buffer() (just pulled the solution used in 3.0 which is direct
>> slicing).
>>
>>
>> Modified:
>>   python/trunk/Lib/subprocess.py
>>   python/trunk/Misc/NEWS
>>
>> Modified: python/trunk/Lib/subprocess.py
>> ==============================================================================
>> --- python/trunk/Lib/subprocess.py      (original)
>> +++ python/trunk/Lib/subprocess.py      Fri Aug  8 06:19:32 2008
>> @@ -411,11 +411,11 @@
>>     MAXFD = 256
>>
>>  # True/False does not exist on 2.2.0
>> -try:
>> -    False
>> -except NameError:
>> -    False = 0
>> -    True = 1
>> +#try:
>> +#    False
>> +#except NameError:
>> +#    False = 0
>> +#    True = 1
>>
>>  _active = []
>>
>> @@ -1066,7 +1066,7 @@
>>                         os.chdir(cwd)
>>
>>                     if preexec_fn:
>> -                        apply(preexec_fn)
>> +                        preexec_fn()
>>
>>                     if env is None:
>>                         os.execvp(executable, args)
>> @@ -1173,7 +1173,8 @@
>>                     # When select has indicated that the file is writable,
>>                     # we can write up to PIPE_BUF bytes without risk
>>                     # blocking.  POSIX defines PIPE_BUF >= 512
>> -                    bytes_written = os.write(self.stdin.fileno(), buffer(input, input_offset, 512))
>> +                    chunk = input[input_offset : input_offset + 512]
>> +                    bytes_written = os.write(self.stdin.fileno(), chunk)
>>                     input_offset += bytes_written
>>                     if input_offset >= len(input):
>>                         self.stdin.close()
>>
>> Modified: python/trunk/Misc/NEWS
>> ==============================================================================
>> --- python/trunk/Misc/NEWS      (original)
>> +++ python/trunk/Misc/NEWS      Fri Aug  8 06:19:32 2008
>> @@ -48,8 +48,9 @@
>>   while running under the ``-3`` flag: aifc, asyncore, bdb, bsddb,
>>   ConfigParser, cookielib, DocXMLRPCServer, email, filecmp, fileinput, inspect,
>>   logging, modulefinder, pdb, pickle, profile, pstats, pydoc, re, rlcompleter,
>> -  SimpleXMLRPCServer, shelve, sqlite3, tarfile, Tkinter, test.test_support,
>> -  textwrap, threading, tokenize, traceback, urlparse, wsgiref, xml, xmlrpclib.
>> +  SimpleXMLRPCServer, shelve, subprocess, sqlite3, tarfile, Tkinter,
>> +  test.test_support, textwrap, threading, tokenize, traceback, urlparse,
>> +  wsgiref, xml, xmlrpclib.
>>
>>  - Issue #3039: Fix tarfile.TarFileCompat.writestr() which always
>>   raised an AttributeError.
>> _______________________________________________
>> Python-checkins mailing list
>> Python-checkins at python.org
>> http://mail.python.org/mailman/listinfo/python-checkins
>>
>
>
>
> --
> --Guido van Rossum (home page: http://www.python.org/~guido/)
> _______________________________________________
> Python-checkins mailing list
> Python-checkins at python.org
> http://mail.python.org/mailman/listinfo/python-checkins
>