Index: Lib/string.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/string.py,v
retrieving revision 1.67
diff -c -r1.67 string.py
*** Lib/string.py	14 Nov 2002 03:31:32 -0000	1.67
--- Lib/string.py	30 Mar 2003 19:38:14 -0000
***************
*** 79,108 ****
  
      Return a copy of the string s with leading and trailing
      whitespace removed.
!     If chars is given and not None, remove characters in sep instead.
      If chars is unicode, S will be converted to unicode before stripping.
  
      """
      return s.strip(chars)
  
  # Strip leading tabs and spaces
! def lstrip(s):
!     """lstrip(s) -> string
  
      Return a copy of the string s with leading whitespace removed.
  
      """
!     return s.lstrip()
  
  # Strip trailing tabs and spaces
! def rstrip(s):
!     """rstrip(s) -> string
  
!     Return a copy of the string s with trailing whitespace
!     removed.
  
      """
!     return s.rstrip()
  
  
  # Split a string into a list of space/tab-separated words
--- 79,109 ----
  
      Return a copy of the string s with leading and trailing
      whitespace removed.
!     If chars is given and not None, remove characters in chars instead.
      If chars is unicode, S will be converted to unicode before stripping.
  
      """
      return s.strip(chars)
  
  # Strip leading tabs and spaces
! def lstrip(s, chars=None):
!     """lstrip(s [,chars]) -> string
  
      Return a copy of the string s with leading whitespace removed.
+     If chars is given and not None, remove characters in chars instead.
  
      """
!     return s.lstrip(chars)
  
  # Strip trailing tabs and spaces
! def rstrip(s, chars=None):
!     """rstrip(s [,chars]) -> string
  
!     Return a copy of the string s with trailing whitespace removed.
!     If chars is given and not None, remove characters in chars instead.
  
      """
!     return s.rstrip(chars)
  
  
  # Split a string into a list of space/tab-separated words
Index: Lib/test/string_tests.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/string_tests.py,v
retrieving revision 1.29
diff -c -r1.29 string_tests.py
*** Lib/test/string_tests.py	26 Mar 2003 14:31:25 -0000	1.29
--- Lib/test/string_tests.py	30 Mar 2003 19:38:15 -0000
***************
*** 195,200 ****
--- 195,227 ----
          self.checkequal('   hello', '   hello   ', 'rstrip')
          self.checkequal('hello', 'hello', 'strip')
  
+         # strip/lstrip/rstrip with None arg
+         self.checkequal('hello', '   hello   ', 'strip', None)
+         self.checkequal('hello   ', '   hello   ', 'lstrip', None)
+         self.checkequal('   hello', '   hello   ', 'rstrip', None)
+         self.checkequal('hello', 'hello', 'strip', None)
+ 
+         # strip/lstrip/rstrip with str arg
+         self.checkequal('hello', 'xyzzyhelloxyzzy', 'strip', 'xyz')
+         self.checkequal('helloxyzzy', 'xyzzyhelloxyzzy', 'lstrip', 'xyz')
+         self.checkequal('xyzzyhello', 'xyzzyhelloxyzzy', 'rstrip', 'xyz')
+         self.checkequal('hello', 'hello', 'strip', 'xyz')
+ 
+         # strip/lstrip/rstrip with unicode arg
+         if test_support.have_unicode:
+             self.checkequal(unicode('hello', 'ascii'), 'xyzzyhelloxyzzy',
+                  'strip', unicode('xyz', 'ascii'))
+             self.checkequal(unicode('helloxyzzy', 'ascii'), 'xyzzyhelloxyzzy',
+                  'lstrip', unicode('xyz', 'ascii'))
+             self.checkequal(unicode('xyzzyhello', 'ascii'), 'xyzzyhelloxyzzy',
+                  'rstrip', unicode('xyz', 'ascii'))
+             self.checkequal(unicode('hello', 'ascii'), 'hello',
+                  'strip', unicode('xyz', 'ascii'))
+ 
+         self.checkraises(TypeError, 'hello', 'strip', 42, 42)
+         self.checkraises(TypeError, 'hello', 'lstrip', 42, 42)
+         self.checkraises(TypeError, 'hello', 'rstrip', 42, 42)
+ 
      def test_ljust(self):
          self.checkequal('abc       ', 'abc', 'ljust', 10)
          self.checkequal('abc   ', 'abc', 'ljust', 6)
***************
*** 431,464 ****
  
          self.checkraises(TypeError, 'hello', 'endswith')
          self.checkraises(TypeError, 'hello', 'endswith', 42)
- 
-     def test_strip_args(self):
-         # strip/lstrip/rstrip with None arg
-         self.checkequal('hello', '   hello   ', 'strip', None)
-         self.checkequal('hello   ', '   hello   ', 'lstrip', None)
-         self.checkequal('   hello', '   hello   ', 'rstrip', None)
-         self.checkequal('hello', 'hello', 'strip', None)
- 
-         # strip/lstrip/rstrip with str arg
-         self.checkequal('hello', 'xyzzyhelloxyzzy', 'strip', 'xyz')
-         self.checkequal('helloxyzzy', 'xyzzyhelloxyzzy', 'lstrip', 'xyz')
-         self.checkequal('xyzzyhello', 'xyzzyhelloxyzzy', 'rstrip', 'xyz')
-         self.checkequal('hello', 'hello', 'strip', 'xyz')
- 
-         # strip/lstrip/rstrip with unicode arg
-         if test_support.have_unicode:
-             self.checkequal(unicode('hello', 'ascii'), 'xyzzyhelloxyzzy',
-                  'strip', unicode('xyz', 'ascii'))
-             self.checkequal(unicode('helloxyzzy', 'ascii'), 'xyzzyhelloxyzzy',
-                  'lstrip', unicode('xyz', 'ascii'))
-             self.checkequal(unicode('xyzzyhello', 'ascii'), 'xyzzyhelloxyzzy',
-                  'rstrip', unicode('xyz', 'ascii'))
-             self.checkequal(unicode('hello', 'ascii'), 'hello',
-                  'strip', unicode('xyz', 'ascii'))
- 
-         self.checkraises(TypeError, 'hello', 'strip', 42, 42)
-         self.checkraises(TypeError, 'hello', 'lstrip', 42, 42)
-         self.checkraises(TypeError, 'hello', 'rstrip', 42, 42)
  
      def test___contains__(self):
          self.checkequal(True, '', '__contains__', '')         # vereq('' in '', True)
--- 458,463 ----
Index: Objects/stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.205
diff -c -r2.205 stringobject.c
*** Objects/stringobject.c	29 Jan 2003 17:58:45 -0000	2.205
--- Objects/stringobject.c	30 Mar 2003 19:38:16 -0000
***************
*** 1770,1781 ****
  
  
  PyDoc_STRVAR(strip__doc__,
! "S.strip([sep]) -> string or unicode\n\
  \n\
  Return a copy of the string S with leading and trailing\n\
  whitespace removed.\n\
! If sep is given and not None, remove characters in sep instead.\n\
! If sep is unicode, S will be converted to unicode before stripping");
  
  static PyObject *
  string_strip(PyStringObject *self, PyObject *args)
--- 1770,1781 ----
  
  
  PyDoc_STRVAR(strip__doc__,
! "S.strip([chars]) -> string or unicode\n\
  \n\
  Return a copy of the string S with leading and trailing\n\
  whitespace removed.\n\
! If chars is given and not None, remove characters in chars instead.\n\
! If chars is unicode, S will be converted to unicode before stripping");
  
  static PyObject *
  string_strip(PyStringObject *self, PyObject *args)
***************
*** 1788,1798 ****
  
  
  PyDoc_STRVAR(lstrip__doc__,
! "S.lstrip([sep]) -> string or unicode\n\
  \n\
  Return a copy of the string S with leading whitespace removed.\n\
! If sep is given and not None, remove characters in sep instead.\n\
! If sep is unicode, S will be converted to unicode before stripping");
  
  static PyObject *
  string_lstrip(PyStringObject *self, PyObject *args)
--- 1788,1798 ----
  
  
  PyDoc_STRVAR(lstrip__doc__,
! "S.lstrip([chars]) -> string or unicode\n\
  \n\
  Return a copy of the string S with leading whitespace removed.\n\
! If chars is given and not None, remove characters in chars instead.\n\
! If chars is unicode, S will be converted to unicode before stripping");
  
  static PyObject *
  string_lstrip(PyStringObject *self, PyObject *args)
***************
*** 1805,1815 ****
  
  
  PyDoc_STRVAR(rstrip__doc__,
! "S.rstrip([sep]) -> string or unicode\n\
  \n\
  Return a copy of the string S with trailing whitespace removed.\n\
! If sep is given and not None, remove characters in sep instead.\n\
! If sep is unicode, S will be converted to unicode before stripping");
  
  static PyObject *
  string_rstrip(PyStringObject *self, PyObject *args)
--- 1805,1815 ----
  
  
  PyDoc_STRVAR(rstrip__doc__,
! "S.rstrip([chars]) -> string or unicode\n\
  \n\
  Return a copy of the string S with trailing whitespace removed.\n\
! If chars is given and not None, remove characters in chars instead.\n\
! If chars is unicode, S will be converted to unicode before stripping");
  
  static PyObject *
  string_rstrip(PyStringObject *self, PyObject *args)
Index: Objects/unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.184
diff -c -r2.184 unicodeobject.c
*** Objects/unicodeobject.c	9 Mar 2003 07:30:43 -0000	2.184
--- Objects/unicodeobject.c	30 Mar 2003 19:38:19 -0000
***************
*** 5247,5258 ****
  
  
  PyDoc_STRVAR(strip__doc__,
! "S.strip([sep]) -> unicode\n\
  \n\
  Return a copy of the string S with leading and trailing\n\
  whitespace removed.\n\
! If sep is given and not None, remove characters in sep instead.\n\
! If sep is a str, it will be converted to unicode before stripping");
  
  static PyObject *
  unicode_strip(PyUnicodeObject *self, PyObject *args)
--- 5247,5258 ----
  
  
  PyDoc_STRVAR(strip__doc__,
! "S.strip([chars]) -> unicode\n\
  \n\
  Return a copy of the string S with leading and trailing\n\
  whitespace removed.\n\
! If chars is given and not None, remove characters in chars instead.\n\
! If chars is a str, it will be converted to unicode before stripping");
  
  static PyObject *
  unicode_strip(PyUnicodeObject *self, PyObject *args)
***************
*** 5265,5275 ****
  
  
  PyDoc_STRVAR(lstrip__doc__,
! "S.lstrip([sep]) -> unicode\n\
  \n\
  Return a copy of the string S with leading whitespace removed.\n\
! If sep is given and not None, remove characters in sep instead.\n\
! If sep is a str, it will be converted to unicode before stripping");
  
  static PyObject *
  unicode_lstrip(PyUnicodeObject *self, PyObject *args)
--- 5265,5275 ----
  
  
  PyDoc_STRVAR(lstrip__doc__,
! "S.lstrip([chars]) -> unicode\n\
  \n\
  Return a copy of the string S with leading whitespace removed.\n\
! If chars is given and not None, remove characters in chars instead.\n\
! If chars is a str, it will be converted to unicode before stripping");
  
  static PyObject *
  unicode_lstrip(PyUnicodeObject *self, PyObject *args)
***************
*** 5282,5292 ****
  
  
  PyDoc_STRVAR(rstrip__doc__,
! "S.rstrip([sep]) -> unicode\n\
  \n\
  Return a copy of the string S with trailing whitespace removed.\n\
! If sep is given and not None, remove characters in sep instead.\n\
! If sep is a str, it will be converted to unicode before stripping");
  
  static PyObject *
  unicode_rstrip(PyUnicodeObject *self, PyObject *args)
--- 5282,5292 ----
  
  
  PyDoc_STRVAR(rstrip__doc__,
! "S.rstrip([chars]) -> unicode\n\
  \n\
  Return a copy of the string S with trailing whitespace removed.\n\
! If chars is given and not None, remove characters in chars instead.\n\
! If chars is a str, it will be converted to unicode before stripping");
  
  static PyObject *
  unicode_rstrip(PyUnicodeObject *self, PyObject *args)