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

String method cleanup.

Browse source
This commit is contained in:
Eric S. Raymond 2001-02-10 00:22:33 +00:00
parent c8c6aa201f
commit 6e025bcde8
5 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/mhlib.py
View file

@ -76,7 +76,6 @@ import os
import sys import sys
from stat import ST_NLINK from stat import ST_NLINK
import re import re
import string
import mimetools import mimetools
import multifile import multifile
import shutil import shutil
@ -685,7 +684,7 @@ class Message(mimetools.Message):
headers = [] headers = []
hit = 0 hit = 0
for line in self.headers: for line in self.headers:
if line[0] not in string.whitespace: if not line[0].isspace():
i = line.find(':') i = line.find(':')
if i > 0: if i > 0:
hit = pred(line[:i].lower()) hit = pred(line[:i].lower())
@ -885,7 +884,6 @@ class IntSet:
self.normalize() self.normalize()
def fromstring(self, data): def fromstring(self, data):
import string
new = [] new = []
for part in data.split(self.sep): for part in data.split(self.sep):
list = [] list = []
@ -918,7 +916,7 @@ def pickline(file, key, casefold = 1):
text = line[len(key)+1:] text = line[len(key)+1:]
while 1: while 1:
line = f.readline() line = f.readline()
if not line or line[0] not in string.whitespace: if not line or not line[0].isspace():
break break
text = text + line text = text + line
return text.strip() return text.strip()

2
Lib/mimify.py
View file

@ -110,7 +110,7 @@ def mime_decode_header(line):
break break
match = res.group(1) match = res.group(1)
# convert underscores to spaces (before =XX conversion!) # convert underscores to spaces (before =XX conversion!)
match = ' '.join(string.split(match, '_')) match = ' '.join(match.split('_'))
newline = newline + line[pos:res.start(0)] + mime_decode(match) newline = newline + line[pos:res.start(0)] + mime_decode(match)
pos = res.end(0) pos = res.end(0)
return newline + line[pos:] return newline + line[pos:]

4
Lib/pre.py
View file

@ -85,7 +85,6 @@ This module also defines an exception 'error'.
import sys import sys
import string
from pcre import * from pcre import *
# #
@ -223,10 +222,9 @@ def escape(pattern):
""" """
result = list(pattern) result = list(pattern)
alphanum=string.letters+'_'+string.digits
for i in range(len(pattern)): for i in range(len(pattern)):
char = pattern[i] char = pattern[i]
if char not in alphanum: if not char.isalnum():
if char=='\000': result[i] = '\\000' if char=='\000': result[i] = '\\000'
else: result[i] = '\\'+char else: result[i] = '\\'+char
return ''.join(result) return ''.join(result)

2
Lib/token.py
View file

@ -104,7 +104,7 @@ def main():
match = prog.match(line) match = prog.match(line)
if match: if match:
name, val = match.group(1, 2) name, val = match.group(1, 2)
val = string.atoi(val) val = int(val)
tokens[val] = name # reverse so we can sort them... tokens[val] = name # reverse so we can sort them...
keys = tokens.keys() keys = tokens.keys()
keys.sort() keys.sort()

6
Lib/traceback.py
View file

@ -1,7 +1,6 @@
"""Extract, format and print information about Python stack traces.""" """Extract, format and print information about Python stack traces."""
import linecache import linecache
import string
import sys import sys
import types import types
@ -154,13 +153,12 @@ def format_exception_only(etype, value):
list.append(' File "%s", line %d\n' % list.append(' File "%s", line %d\n' %
(filename, lineno)) (filename, lineno))
i = 0 i = 0
while i < len(line) and \ while i < len(line) and line[i].isspace():
line[i] in string.whitespace:
i = i+1 i = i+1
list.append(' %s\n' % line.strip()) list.append(' %s\n' % line.strip())
s = ' ' s = ' '
for c in line[i:offset-1]: for c in line[i:offset-1]:
if c in string.whitespace: if c.isspace():
s = s + c s = s + c
else: else:
s = s + ' ' s = s + ' '