Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-30 21:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: Remove import of types to get StringTypes, we can just use basestring.

Browse source
This commit is contained in:
Neal Norwitz 2006-06-12 02:07:24 +00:00
parent 047f3c7ffa
commit 418b97eac1
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/UserString.py
View file

@ -5,14 +5,13 @@
Note: string objects have grown methods in Python 1.6 Note: string objects have grown methods in Python 1.6
This module requires Python 1.6 or later. This module requires Python 1.6 or later.
""" """
from types import StringTypes
import sys import sys
__all__ = ["UserString","MutableString"] __all__ = ["UserString","MutableString"]
class UserString: class UserString:
def __init__(self, seq): def __init__(self, seq):
if isinstance(seq, StringTypes): if isinstance(seq, basestring):
self.data = seq self.data = seq
elif isinstance(seq, UserString): elif isinstance(seq, UserString):
self.data = seq.data[:] self.data = seq.data[:]
@ -43,12 +42,12 @@ def __getslice__(self, start, end):
def __add__(self, other): def __add__(self, other):
if isinstance(other, UserString): if isinstance(other, UserString):
return self.__class__(self.data + other.data) return self.__class__(self.data + other.data)
elif isinstance(other, StringTypes): elif isinstance(other, basestring):
return self.__class__(self.data + other) return self.__class__(self.data + other)
else: else:
return self.__class__(self.data + str(other)) return self.__class__(self.data + str(other))
def __radd__(self, other): def __radd__(self, other):
if isinstance(other, StringTypes): if isinstance(other, basestring):
return self.__class__(other + self.data) return self.__class__(other + self.data)
else: else:
return self.__class__(str(other) + self.data) return self.__class__(str(other) + self.data)
@ -163,7 +162,7 @@ def __setslice__(self, start, end, sub):
start = max(start, 0); end = max(end, 0) start = max(start, 0); end = max(end, 0)
if isinstance(sub, UserString): if isinstance(sub, UserString):
self.data = self.data[:start]+sub.data+self.data[end:] self.data = self.data[:start]+sub.data+self.data[end:]
elif isinstance(sub, StringTypes): elif isinstance(sub, basestring):
self.data = self.data[:start]+sub+self.data[end:] self.data = self.data[:start]+sub+self.data[end:]
else: else:
self.data = self.data[:start]+str(sub)+self.data[end:] self.data = self.data[:start]+str(sub)+self.data[end:]
@ -175,7 +174,7 @@ def immutable(self):
def __iadd__(self, other): def __iadd__(self, other):
if isinstance(other, UserString): if isinstance(other, UserString):
self.data += other.data self.data += other.data
elif isinstance(other, StringTypes): elif isinstance(other, basestring):
self.data += other self.data += other
else: else:
self.data += str(other) self.data += str(other)