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

String method conversion.

Browse source
This commit is contained in:
Eric S. Raymond 2001-02-09 09:10:35 +00:00
parent 6b71e747b1
commit ee5e61d3bc
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/gzip.py
View file

@ -5,7 +5,7 @@ but random access is not allowed."""
# based on Andrew Kuchling's minigzip.py distributed with the zlib module # based on Andrew Kuchling's minigzip.py distributed with the zlib module
import string, struct, sys, time import struct, sys, time
import zlib import zlib
import __builtin__ import __builtin__
@ -138,7 +138,7 @@ class GzipFile:
self.fileobj.write( self.compress.compress(data) ) self.fileobj.write( self.compress.compress(data) )
def writelines(self,lines): def writelines(self,lines):
self.write(string.join(lines)) self.write(" ".join(lines))
def read(self, size=-1): def read(self, size=-1):
if self.extrasize <= 0 and self.fileobj is None: if self.extrasize <= 0 and self.fileobj is None:
@ -281,10 +281,10 @@ class GzipFile:
readsize = min(100, size) # Read from the file in small chunks readsize = min(100, size) # Read from the file in small chunks
while 1: while 1:
if size == 0: if size == 0:
return string.join(bufs, '') # Return resulting line return "".join(bufs) # Return resulting line
c = self.read(readsize) c = self.read(readsize)
i = string.find(c, '\n') i = c.find('\n')
if size is not None: if size is not None:
# We set i=size to break out of the loop under two # We set i=size to break out of the loop under two
# conditions: 1) there's no newline, and the chunk is # conditions: 1) there's no newline, and the chunk is
@ -296,7 +296,7 @@ class GzipFile:
if i >= 0 or c == '': if i >= 0 or c == '':
bufs.append(c[:i+1]) # Add portion of last chunk bufs.append(c[:i+1]) # Add portion of last chunk
self._unread(c[i+1:]) # Push back rest of chunk self._unread(c[i+1:]) # Push back rest of chunk
return string.join(bufs, '') # Return resulting line return ''.join(bufs) # Return resulting line
# Append chunk to list, decrease 'size', # Append chunk to list, decrease 'size',
bufs.append(c) bufs.append(c)

6
Lib/keyword.py
View file

@ -52,7 +52,7 @@ for keyword in kwlist:
iskeyword = kwdict.has_key iskeyword = kwdict.has_key
def main(): def main():
import sys, re, string import sys, re
args = sys.argv[1:] args = sys.argv[1:]
iptfile = args and args[0] or "Python/graminit.c" iptfile = args and args[0] or "Python/graminit.c"
@ -66,7 +66,7 @@ def main():
while 1: while 1:
line = fp.readline() line = fp.readline()
if not line: break if not line: break
if string.find(line, '{1, "') > -1: if line.find('{1, "') > -1:
match = strprog.search(line) match = strprog.search(line)
if match: if match:
lines.append(" '" + match.group(1) + "',\n") lines.append(" '" + match.group(1) + "',\n")
@ -89,7 +89,7 @@ def main():
# write the output file # write the output file
fp = open(optfile, 'w') fp = open(optfile, 'w')
fp.write(string.join(format, '')) fp.write(''.join(format))
fp.close() fp.close()
if __name__ == "__main__": if __name__ == "__main__":