Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/trunk-bytearray

........
  r61750 | christian.heimes | 2008-03-22 20:47:44 +0100 (Sat, 22 Mar 2008) | 1 line

  Copied files from py3k w/o modifications
........
  r61752 | christian.heimes | 2008-03-22 20:53:20 +0100 (Sat, 22 Mar 2008) | 7 lines

  Take One
  * Added initialization code, warnings, flags etc. to the appropriate places
  * Added new buffer interface to string type
  * Modified tests
  * Modified Makefile.pre.in to compile the new files
  * Added bytesobject.c to Python.h
........
  r61754 | christian.heimes | 2008-03-22 21:22:19 +0100 (Sat, 22 Mar 2008) | 2 lines

  Disabled bytearray.extend for now since it causes an infinite recursion
  Fixed serveral unit tests
........
  r61756 | christian.heimes | 2008-03-22 21:43:38 +0100 (Sat, 22 Mar 2008) | 5 lines

  Added PyBytes support to several places:
  str + bytearray
  ord(bytearray)
  bytearray(str, encoding)
........
  r61760 | christian.heimes | 2008-03-22 21:56:32 +0100 (Sat, 22 Mar 2008) | 1 line

  Fixed more unit tests related to type('') is not unicode
........
  r61763 | christian.heimes | 2008-03-22 22:20:28 +0100 (Sat, 22 Mar 2008) | 2 lines

  Fixed more unit tests
  Fixed bytearray.extend
........
  r61768 | christian.heimes | 2008-03-22 22:40:50 +0100 (Sat, 22 Mar 2008) | 1 line

  Implemented old buffer interface for bytearray
........
  r61772 | christian.heimes | 2008-03-22 23:24:52 +0100 (Sat, 22 Mar 2008) | 1 line

  Added backport of the io module
........
  r61775 | christian.heimes | 2008-03-23 03:50:49 +0100 (Sun, 23 Mar 2008) | 1 line

  Fix str assignement to bytearray. Assignment of a str of size 1 is interpreted as a single byte
........
  r61805 | christian.heimes | 2008-03-23 19:33:48 +0100 (Sun, 23 Mar 2008) | 3 lines

  Fixed more tests
  Fixed bytearray() comparsion with unicode()
  Fixed iterator assignment of bytearray
........
  r61809 | christian.heimes | 2008-03-23 21:02:21 +0100 (Sun, 23 Mar 2008) | 2 lines

  str(bytesarray()) now returns the bytes and not the representation of the bytearray object
  Enabled and fixed more unit tests
........
  r61812 | christian.heimes | 2008-03-23 21:53:08 +0100 (Sun, 23 Mar 2008) | 3 lines

  Clear error PyNumber_AsSsize_t() fails
  Use CHARMASK for ob_svall access
  disabled a test with memoryview again
........
  r61819 | christian.heimes | 2008-03-23 23:05:57 +0100 (Sun, 23 Mar 2008) | 1 line

  Untested updates to the PCBuild directory
........
  r61917 | christian.heimes | 2008-03-26 00:57:06 +0100 (Wed, 26 Mar 2008) | 1 line

  The type system of Python 2.6 has subtle differences to 3.0's. I've removed the Py_TPFLAGS_BASETYPE flags from bytearray for now. bytearray can't be subclasses until the issues with bytearray subclasses are fixed.
........
  r61920 | christian.heimes | 2008-03-26 01:44:08 +0100 (Wed, 26 Mar 2008) | 2 lines

  Disabled last failing test
  I don't understand what the test is testing and how it suppose to work. Ka-Ping, please check it out.
........
  r61930 | christian.heimes | 2008-03-26 12:46:18 +0100 (Wed, 26 Mar 2008) | 1 line

  Re-enabled bytes warning code
........
  r61933 | christian.heimes | 2008-03-26 13:20:46 +0100 (Wed, 26 Mar 2008) | 1 line

  Fixed a bug in the new buffer protocol. The buffer slots weren't copied into a subclass.
........
  r61934 | christian.heimes | 2008-03-26 13:25:09 +0100 (Wed, 26 Mar 2008) | 1 line

  Re-enabled bytearray subclassing - all tests are passing.
........

1 files changed, 206 insertions, 0 deletions

diff --git a/Lib/test/buffer_tests.py b/Lib/test/buffer_tests.py
new file mode 100644
index 0000000..db27759
--- /dev/null
+++ b/Lib/test/buffer_tests.py
@@ -0,0 +1,206 @@
+# Tests that work for both bytes and buffer objects.
+# See PEP 3137.
+
+import struct
+import sys
+
+class MixinBytesBufferCommonTests(object):
+    """Tests that work for both bytes and buffer objects.
+    See PEP 3137.
+    """
+
+    def marshal(self, x):
+        """Convert x into the appropriate type for these tests."""
+        raise RuntimeError('test class must provide a marshal method')
+
+    def test_islower(self):
+        self.assertFalse(self.marshal(b'').islower())
+        self.assert_(self.marshal(b'a').islower())
+        self.assertFalse(self.marshal(b'A').islower())
+        self.assertFalse(self.marshal(b'\n').islower())
+        self.assert_(self.marshal(b'abc').islower())
+        self.assertFalse(self.marshal(b'aBc').islower())
+        self.assert_(self.marshal(b'abc\n').islower())
+        self.assertRaises(TypeError, self.marshal(b'abc').islower, 42)
+
+    def test_isupper(self):
+        self.assertFalse(self.marshal(b'').isupper())
+        self.assertFalse(self.marshal(b'a').isupper())
+        self.assert_(self.marshal(b'A').isupper())
+        self.assertFalse(self.marshal(b'\n').isupper())
+        self.assert_(self.marshal(b'ABC').isupper())
+        self.assertFalse(self.marshal(b'AbC').isupper())
+        self.assert_(self.marshal(b'ABC\n').isupper())
+        self.assertRaises(TypeError, self.marshal(b'abc').isupper, 42)
+
+    def test_istitle(self):
+        self.assertFalse(self.marshal(b'').istitle())
+        self.assertFalse(self.marshal(b'a').istitle())
+        self.assert_(self.marshal(b'A').istitle())
+        self.assertFalse(self.marshal(b'\n').istitle())
+        self.assert_(self.marshal(b'A Titlecased Line').istitle())
+        self.assert_(self.marshal(b'A\nTitlecased Line').istitle())
+        self.assert_(self.marshal(b'A Titlecased, Line').istitle())
+        self.assertFalse(self.marshal(b'Not a capitalized String').istitle())
+        self.assertFalse(self.marshal(b'Not\ta Titlecase String').istitle())
+        self.assertFalse(self.marshal(b'Not--a Titlecase String').istitle())
+        self.assertFalse(self.marshal(b'NOT').istitle())
+        self.assertRaises(TypeError, self.marshal(b'abc').istitle, 42)
+
+    def test_isspace(self):
+        self.assertFalse(self.marshal(b'').isspace())
+        self.assertFalse(self.marshal(b'a').isspace())
+        self.assert_(self.marshal(b' ').isspace())
+        self.assert_(self.marshal(b'\t').isspace())
+        self.assert_(self.marshal(b'\r').isspace())
+        self.assert_(self.marshal(b'\n').isspace())
+        self.assert_(self.marshal(b' \t\r\n').isspace())
+        self.assertFalse(self.marshal(b' \t\r\na').isspace())
+        self.assertRaises(TypeError, self.marshal(b'abc').isspace, 42)
+
+    def test_isalpha(self):
+        self.assertFalse(self.marshal(b'').isalpha())
+        self.assert_(self.marshal(b'a').isalpha())
+        self.assert_(self.marshal(b'A').isalpha())
+        self.assertFalse(self.marshal(b'\n').isalpha())
+        self.assert_(self.marshal(b'abc').isalpha())
+        self.assertFalse(self.marshal(b'aBc123').isalpha())
+        self.assertFalse(self.marshal(b'abc\n').isalpha())
+        self.assertRaises(TypeError, self.marshal(b'abc').isalpha, 42)
+
+    def test_isalnum(self):
+        self.assertFalse(self.marshal(b'').isalnum())
+        self.assert_(self.marshal(b'a').isalnum())
+        self.assert_(self.marshal(b'A').isalnum())
+        self.assertFalse(self.marshal(b'\n').isalnum())
+        self.assert_(self.marshal(b'123abc456').isalnum())
+        self.assert_(self.marshal(b'a1b3c').isalnum())
+        self.assertFalse(self.marshal(b'aBc000 ').isalnum())
+        self.assertFalse(self.marshal(b'abc\n').isalnum())
+        self.assertRaises(TypeError, self.marshal(b'abc').isalnum, 42)
+
+    def test_isdigit(self):
+        self.assertFalse(self.marshal(b'').isdigit())
+        self.assertFalse(self.marshal(b'a').isdigit())
+        self.assert_(self.marshal(b'0').isdigit())
+        self.assert_(self.marshal(b'0123456789').isdigit())
+        self.assertFalse(self.marshal(b'0123456789a').isdigit())
+
+        self.assertRaises(TypeError, self.marshal(b'abc').isdigit, 42)
+
+    def test_lower(self):
+        self.assertEqual(b'hello', self.marshal(b'HeLLo').lower())
+        self.assertEqual(b'hello', self.marshal(b'hello').lower())
+        self.assertRaises(TypeError, self.marshal(b'hello').lower, 42)
+
+    def test_upper(self):
+        self.assertEqual(b'HELLO', self.marshal(b'HeLLo').upper())
+        self.assertEqual(b'HELLO', self.marshal(b'HELLO').upper())
+        self.assertRaises(TypeError, self.marshal(b'hello').upper, 42)
+
+    def test_capitalize(self):
+        self.assertEqual(b' hello ', self.marshal(b' hello ').capitalize())
+        self.assertEqual(b'Hello ', self.marshal(b'Hello ').capitalize())
+        self.assertEqual(b'Hello ', self.marshal(b'hello ').capitalize())
+        self.assertEqual(b'Aaaa', self.marshal(b'aaaa').capitalize())
+        self.assertEqual(b'Aaaa', self.marshal(b'AaAa').capitalize())
+
+        self.assertRaises(TypeError, self.marshal(b'hello').capitalize, 42)
+
+    def test_ljust(self):
+        self.assertEqual(b'abc       ', self.marshal(b'abc').ljust(10))
+        self.assertEqual(b'abc   ', self.marshal(b'abc').ljust(6))
+        self.assertEqual(b'abc', self.marshal(b'abc').ljust(3))
+        self.assertEqual(b'abc', self.marshal(b'abc').ljust(2))
+        self.assertEqual(b'abc*******', self.marshal(b'abc').ljust(10, '*'))
+        self.assertRaises(TypeError, self.marshal(b'abc').ljust)
+
+    def test_rjust(self):
+        self.assertEqual(b'       abc', self.marshal(b'abc').rjust(10))
+        self.assertEqual(b'   abc', self.marshal(b'abc').rjust(6))
+        self.assertEqual(b'abc', self.marshal(b'abc').rjust(3))
+        self.assertEqual(b'abc', self.marshal(b'abc').rjust(2))
+        self.assertEqual(b'*******abc', self.marshal(b'abc').rjust(10, '*'))
+        self.assertRaises(TypeError, self.marshal(b'abc').rjust)
+
+    def test_center(self):
+        self.assertEqual(b'   abc    ', self.marshal(b'abc').center(10))
+        self.assertEqual(b' abc  ', self.marshal(b'abc').center(6))
+        self.assertEqual(b'abc', self.marshal(b'abc').center(3))
+        self.assertEqual(b'abc', self.marshal(b'abc').center(2))
+        self.assertEqual(b'***abc****', self.marshal(b'abc').center(10, '*'))
+        self.assertRaises(TypeError, self.marshal(b'abc').center)
+
+    def test_swapcase(self):
+        self.assertEqual(b'hEllO CoMPuTErS',
+            self.marshal(b'HeLLo cOmpUteRs').swapcase())
+
+        self.assertRaises(TypeError, self.marshal(b'hello').swapcase, 42)
+
+    def test_zfill(self):
+        self.assertEqual(b'123', self.marshal(b'123').zfill(2))
+        self.assertEqual(b'123', self.marshal(b'123').zfill(3))
+        self.assertEqual(b'0123', self.marshal(b'123').zfill(4))
+        self.assertEqual(b'+123', self.marshal(b'+123').zfill(3))
+        self.assertEqual(b'+123', self.marshal(b'+123').zfill(4))
+        self.assertEqual(b'+0123', self.marshal(b'+123').zfill(5))
+        self.assertEqual(b'-123', self.marshal(b'-123').zfill(3))
+        self.assertEqual(b'-123', self.marshal(b'-123').zfill(4))
+        self.assertEqual(b'-0123', self.marshal(b'-123').zfill(5))
+        self.assertEqual(b'000', self.marshal(b'').zfill(3))
+        self.assertEqual(b'34', self.marshal(b'34').zfill(1))
+        self.assertEqual(b'0034', self.marshal(b'34').zfill(4))
+
+        self.assertRaises(TypeError, self.marshal(b'123').zfill)
+
+    def test_expandtabs(self):
+        self.assertEqual(b'abc\rab      def\ng       hi',
+                         self.marshal(b'abc\rab\tdef\ng\thi').expandtabs())
+        self.assertEqual(b'abc\rab      def\ng       hi',
+                         self.marshal(b'abc\rab\tdef\ng\thi').expandtabs(8))
+        self.assertEqual(b'abc\rab  def\ng   hi',
+                         self.marshal(b'abc\rab\tdef\ng\thi').expandtabs(4))
+        self.assertEqual(b'abc\r\nab  def\ng   hi',
+                         self.marshal(b'abc\r\nab\tdef\ng\thi').expandtabs(4))
+        self.assertEqual(b'abc\rab      def\ng       hi',
+                         self.marshal(b'abc\rab\tdef\ng\thi').expandtabs())
+        self.assertEqual(b'abc\rab      def\ng       hi',
+                         self.marshal(b'abc\rab\tdef\ng\thi').expandtabs(8))
+        self.assertEqual(b'abc\r\nab\r\ndef\ng\r\nhi',
+            self.marshal(b'abc\r\nab\r\ndef\ng\r\nhi').expandtabs(4))
+        self.assertEqual(b'  a\n b', self.marshal(b' \ta\n\tb').expandtabs(1))
+
+        self.assertRaises(TypeError, self.marshal(b'hello').expandtabs, 42, 42)
+        # This test is only valid when sizeof(int) == sizeof(void*) == 4.
+        if sys.maxint < (1 << 32) and struct.calcsize('P') == 4:
+            self.assertRaises(OverflowError,
+                              self.marshal(b'\ta\n\tb').expandtabs, sys.maxint)
+
+    def test_title(self):
+        self.assertEqual(b' Hello ', self.marshal(b' hello ').title())
+        self.assertEqual(b'Hello ', self.marshal(b'hello ').title())
+        self.assertEqual(b'Hello ', self.marshal(b'Hello ').title())
+        self.assertEqual(b'Format This As Title String',
+                         self.marshal(b'fOrMaT thIs aS titLe String').title())
+        self.assertEqual(b'Format,This-As*Title;String',
+                         self.marshal(b'fOrMaT,thIs-aS*titLe;String').title())
+        self.assertEqual(b'Getint', self.marshal(b'getInt').title())
+        self.assertRaises(TypeError, self.marshal(b'hello').title, 42)
+
+    def test_splitlines(self):
+        self.assertEqual([b'abc', b'def', b'', b'ghi'],
+                         self.marshal(b'abc\ndef\n\rghi').splitlines())
+        self.assertEqual([b'abc', b'def', b'', b'ghi'],
+                         self.marshal(b'abc\ndef\n\r\nghi').splitlines())
+        self.assertEqual([b'abc', b'def', b'ghi'],
+                         self.marshal(b'abc\ndef\r\nghi').splitlines())
+        self.assertEqual([b'abc', b'def', b'ghi'],
+                         self.marshal(b'abc\ndef\r\nghi\n').splitlines())
+        self.assertEqual([b'abc', b'def', b'ghi', b''],
+                         self.marshal(b'abc\ndef\r\nghi\n\r').splitlines())
+        self.assertEqual([b'', b'abc', b'def', b'ghi', b''],
+                         self.marshal(b'\nabc\ndef\r\nghi\n\r').splitlines())
+        self.assertEqual([b'\n', b'abc\n', b'def\r\n', b'ghi\n', b'\r'],
+                         self.marshal(b'\nabc\ndef\r\nghi\n\r').splitlines(1))
+
+        self.assertRaises(TypeError, self.marshal(b'abc').splitlines, 42, 42)